Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -134,10 +134,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      */
     private List<TaBuildingImg> getBuildingImg(String buildingId, String imgType) {
         //查询当前图片
-        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", buildingId);
-        BuildingImgQueryWrapper.eq("img_type", imgType);
-        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
+        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
+        buildingImgQueryWrapper.eq("building_id", buildingId);
+        buildingImgQueryWrapper.eq("img_type", imgType);
+        buildingImgQueryWrapper.orderByAsc("order_no");
+        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
         return  buildingImg.size() > 0 ? buildingImg : null;
     }
 
@@ -406,7 +407,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         // 视频封面图
         String videoImage = object.getString("videoImage");
-        List<TaBuildingImg> videoImageList = JSONObject.parseArray(imgStr, TaBuildingImg.class);
+        List<TaBuildingImg> videoImageList = JSONObject.parseArray(videoImage, TaBuildingImg.class);
         if (CollectionUtils.isNotEmpty(videoImageList)) {
             videoImageList = insertImgBatch(videoImageList, building.getBuildingId());
         }
@@ -748,14 +749,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("apartment_id", id);
         TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
 
-        TaBuilding  building= new TaBuilding();
+//        TaBuilding  building= new TaBuilding();
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,buildingApartment.getBuildingId());
-        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
-
-        if (bui.getStatus().equals(1)){
-            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
-        }
+//        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
+//        if (bui.getStatus().equals(1)){
+//            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
+//        }
 
         buildingApartment.setStatus(-1);
        taBuildingApartmentMapper.update(buildingApartment,buildingApartmentQueryWrapper);

src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticDaily.java

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("ta_customer_statistic_daily")
+@TableName("ts_customer_statistic_daily")
 public class TsCustomerStatisticDaily implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticMonthly.java

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("ta_customer_statistic_monthly")
+@TableName("ts_customer_statistic_monthly")
 public class TsCustomerStatisticMonthly implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/resources/application-test.yml

@@ -1,12 +1,12 @@
 server:
-  port: 8566
+  port: 8080
 spring:
   application:
     name: estateagents
   datasource:
     username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_t?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    password: estateagents
+    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
@@ -25,21 +25,21 @@ mybatis-plus:
   mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
-    appid: wxc56decdcbc64d8de
-    secret: 80864fa371a8db79e719c07df52d59d0
+    appid: wxd6f47a9bb3052175
+    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
     token:
     aesKey:
     msgDataFormat: JSON
   tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-      keywords: 6
+  - name: notice
+    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+    keywords: 4
+  - name: newCustomer
+    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+    keywords: 4
+  - name: mainbiz
+    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
+    keywords: 6
 ali:
   accessKeyId: LTAIkc75dpkJw8Lb
   accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
@@ -68,7 +68,7 @@ sms:
     # 验证码长度
     size: 4
     # 短信签名
-    sign: AI智慧案场
+    sign: 营销云
 
   visitor:
     code: "0501"

src/main/resources/mapper/TaBuildingImgMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaBuildingImgMapper">
     <select id="getBuildingImgByApartment" resultType="com.huiju.estateagents.entity.TaBuildingImg" >
       select a.* from ta_building_img a inner join ta_apartment_img b on a.img_id = b.img_id
-      where a.status = 1 and b.status= 1 and b.apartment_id = #{id}
+      where a.status = 1 and b.status= 1 and b.apartment_id = #{id} order by a.order_no asc
     </select>
 
     <delete id="delBuildingImgByApartment" >

src/main/resources/mapper/statistic/TsCustomerGenderStatisticMapper.xml

@@ -46,7 +46,7 @@
                     t.enlist_id,
                     c.*
                 FROM
-                    ts_activity_dynamic_enlist t
+                    ta_activity_dynamic_enlist t
                     LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
                     AND t.building_id = c.building_id
                     AND t.org_id = c.org_id

src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml

@@ -13,7 +13,7 @@
             org_id,
             count( DISTINCT ( customer_id ) ) as customer_num
         FROM
-            ts_customer_follow_up_record
+            ta_customer_follow_up_record
         WHERE
             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
@@ -37,7 +37,7 @@
             count( DISTINCT ( c.customer_id ) ) as customer_num,
             c.org_id
         FROM
-            ts_activity_dynamic_enlist t
+            ta_activity_dynamic_enlist t
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
             AND t.building_id = c.building_id
             AND t.org_id = c.org_id

src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml

@@ -22,7 +22,7 @@
             org_id,
             count( DISTINCT ( customer_id ) ) as customer_num
         FROM
-            ts_customer_follow_up_record
+            ta_customer_follow_up_record
         WHERE
             date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
         GROUP BY
@@ -34,7 +34,7 @@
             count( DISTINCT ( c.customer_id ) ) as customer_num,
             c.org_id
         FROM
-            ts_activity_dynamic_enlist t
+            ta_activity_dynamic_enlist t
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
             AND t.building_id = c.building_id
             AND t.org_id = c.org_id