bug fix

src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java

@@ -14,8 +14,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.net.ssl.HttpsURLConnection;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -81,7 +83,10 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer orgId = getOrgId(request);
+            Integer userId = getUserId(request);
             taLiveActivity.setOrgId(orgId);
+            taLiveActivity.setCreateUser(userId.toString());
+            taLiveActivity.setUpdateUser(userId.toString());
             responseBean = iTaLiveActivityService.taLiveActivityAdd(taLiveActivity);
         } catch (Exception e) {
             e.printStackTrace();
@@ -101,6 +106,22 @@ public class TaLiveActivityController extends BaseController {
     public ResponseBean taLiveActivityDelete(@RequestBody List<TaLiveActivity> taLiveActivity, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            List<Integer> liveActivityIds = new ArrayList<>();
+            for(TaLiveActivity activity : taLiveActivity){
+                liveActivityIds.add(activity.getLiveActivityId());
+            }
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("content_type",CommConstant.LIVE);
+            queryWrapper.in("target_id",liveActivityIds);
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
+            list.forEach(e -> {
+                e.setStatus(CommConstant.NOT_PUBLISH);
+            });
+            if (list.size() > 0){
+                iExtendContentService.updateBatchById(list);
+            }
+
             responseBean = iTaLiveActivityService.delLiveActivityList(getOrgId(request), taLiveActivity);
         } catch (Exception e) {
             e.printStackTrace();
@@ -119,12 +140,13 @@ public class TaLiveActivityController extends BaseController {
      */
     @RequestMapping(value = "/admin/taLiveActivity/{id}", method = RequestMethod.PUT)
     public ResponseBean taLiveActivityUpdate(@PathVariable Integer id,
-                                             @RequestBody TaLiveActivity taLiveActivity) {
+                                             @RequestBody TaLiveActivity taLiveActivity, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taLiveActivity.setLiveActivityId(id);
+            taLiveActivity.setUpdateUser(getUserId(request).toString());
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",taLiveActivity.getOrgId());
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq("content_type",CommConstant.LIVE);
             queryWrapper.eq("target_id",taLiveActivity.getLiveActivityId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);

src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java

@@ -6,13 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.entity.TaShareContent;
-import com.huiju.estateagents.service.IMiniAppService;
-import com.huiju.estateagents.service.ITaMiniappService;
-import com.huiju.estateagents.service.ITaSalesBatchService;
-import com.huiju.estateagents.service.TaShareContentService;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.service.*;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +17,7 @@ import sun.misc.Request;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -50,6 +46,9 @@ public class TaSalesBatchController extends BaseController {
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
     /**
      * 分页查询列表
      *
@@ -133,6 +132,22 @@ public class TaSalesBatchController extends BaseController {
     public ResponseBean taSalesBatchDel(@RequestBody List<TaSalesBatch> salesBatchs, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            List<Integer> liveActivityIds = new ArrayList<>();
+            for(TaSalesBatch taSalesBatch : salesBatchs){
+                liveActivityIds.add(taSalesBatch.getSalesBatchId());
+            }
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("content_type",CommConstant.HOUSE);
+            queryWrapper.in("target_id",liveActivityIds);
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
+            list.forEach(e -> {
+                e.setStatus(CommConstant.NOT_PUBLISH);
+            });
+            if (list.size() > 0){
+                iExtendContentService.updateBatchById(list);
+            }
+
             responseBean = iTaSalesBatchService.delSalesBatchList(getOrgId(request), salesBatchs);
         } catch (Exception e) {
             e.printStackTrace();
@@ -174,10 +189,29 @@ public class TaSalesBatchController extends BaseController {
      */
     @RequestMapping(value = "/admin/taSalesBatch/{id}", method = RequestMethod.PUT)
     public ResponseBean taSalesBatchUpdate(@PathVariable Integer id,
-                                           @RequestBody TaSalesBatch taSalesBatch) {
+                                           @RequestBody TaSalesBatch taSalesBatch, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taSalesBatch.setSalesBatchId(id);
+
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("content_type",CommConstant.HOUSE);
+            queryWrapper.eq("target_id",taSalesBatch.getSalesBatchId());
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
+            if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())){
+                list.forEach(e -> {
+                    e.setStatus(CommConstant.NOT_PUBLISH);
+                });
+            }else{
+                list.forEach(e -> {
+                    e.setStatus(CommConstant.IS_PUBLISH);
+                });
+            }
+            if (list.size() > 0){
+                iExtendContentService.updateBatchById(list);
+            }
+
             if (iTaSalesBatchService.updateById(taSalesBatch)) {
                 responseBean.addSuccess(taSalesBatch);
             } else {

src/main/java/com/huiju/estateagents/entity/TaLiveActivity.java

@@ -162,4 +162,9 @@ public class TaLiveActivity implements Serializable {
 
     private String liveAppPath;
 
+    @TableField(exist = false)
+    private String createName;
+
+    @TableField(exist = false)
+    private String updateName;
 }

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

@@ -80,18 +80,18 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
             return responseBean;
         }
 
-        // 生成二维码
-        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
-        taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
-        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
-        /**
-         *  TODO 部分信息待修改
-         */
-        ResponseBean taMiniappQrcode = miniAppService.getQrCode
-                (CommConstant.ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
-                        .replace("#1", "live"), taMiniapp.getMiniappId());
-        taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
-        updateById(taLiveActivity);
+//        // 生成二维码
+//        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+//        taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
+//        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
+//        /**
+//         *  TODO 部分信息待修改
+//         */
+//        ResponseBean taMiniappQrcode = miniAppService.getQrCode
+//                (CommConstant.ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
+//                        .replace("#1", "live"), taMiniapp.getMiniappId());
+//        taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+//        updateById(taLiveActivity);
 
         // 设置默认海报数据
         TaShareContent shareContent = new TaShareContent();

src/main/resources/mapper/Activity.xml

@@ -25,7 +25,7 @@
         </if>
         UNION ALL
         SELECT
-        live_activity_id AS id,list_img AS main_img,live_activity_title,live_start_date,live_end_date,0 heavy,0 weight,status activity_status, 	 	'live' AS type
+        live_activity_id AS id,list_img AS main_img,live_activity_title,live_start_date,live_end_date, weight as heavy, 0 weight,status activity_status,          'live' AS type
         FROM
         ta_live_activity
         WHERE org_id = #{orgId} and `status` = #{status}

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -22,9 +22,11 @@
     </update>
 
     <select id="selectLiveListByCondition" resultType="com.huiju.estateagents.entity.TaLiveActivity">
-     select a.building_name,b.name as city_name, t.* From ta_live_activity t
+     select a.building_name,b.name as city_name,c.user_name as createName,d.user_name as updateName, t.* From ta_live_activity t
      left join ta_building a on t.building_id = a.building_id
      LEFT JOIN td_city b on t.city_id = b.id
+     left join ta_user c on t.create_user = c.user_id
+     left join ta_user d on t.update_user = d.user_id
      where t.org_id = #{orgId} and t.status != -1
      <if test="status != null">
          and t.status = #{status}