傅行帆 4 년 전
부모
커밋
943262c520

+ 14
- 4
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java 파일 보기

@@ -9,15 +9,14 @@ import com.huiju.estateagents.common.CommConstant;
9 9
 import com.huiju.estateagents.common.DateUtils;
10 10
 import com.huiju.estateagents.common.StringUtils;
11 11
 import com.huiju.estateagents.drainage.entity.TaDrainage;
12
-import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
13 12
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
14 13
 import com.huiju.estateagents.entity.ExtendContent;
15 14
 import com.huiju.estateagents.entity.TaPersonBuilding;
16
-import com.huiju.estateagents.mapper.TaMiniappMapper;
17 15
 import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
18 16
 import com.huiju.estateagents.service.IExtendContentService;
19
-import com.huiju.estateagents.service.IMiniAppService;
17
+import com.huiju.estateagents.third.entity.TaMpInfo;
20 18
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
19
+import com.huiju.estateagents.third.service.ITaMpInfoService;
21 20
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
22 21
 import org.slf4j.Logger;
23 22
 import org.slf4j.LoggerFactory;
@@ -53,6 +52,9 @@ public class    TaDrainageController extends BaseController {
53 52
     @Autowired
54 53
     public IExtendContentService iExtendContentService;
55 54
 
55
+    @Autowired
56
+    public ITaMpInfoService iTaMpInfoService;
57
+
56 58
     /**
57 59
      * 分页查询列表
58 60
      *
@@ -311,7 +313,15 @@ public class    TaDrainageController extends BaseController {
311 313
                                       HttpServletRequest request) {
312 314
         ResponseBean responseBean = new ResponseBean();
313 315
         try {
314
-            responseBean.addSuccess(iTaDrainageService.getById(id));
316
+            TaDrainage taDrainage = iTaDrainageService.getById(id);
317
+            QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
318
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
319
+            queryWrapper.eq("org_id", 0);
320
+            List<TaMpInfo> mplist = iTaMpInfoService.list(queryWrapper);
321
+            if (mplist.size() > 0){
322
+                taDrainage.setMpAppid(mplist.get(0).getAppid());
323
+            }
324
+            responseBean.addSuccess(taDrainage);
315 325
         } catch (Exception e) {
316 326
             e.printStackTrace();
317 327
             logger.error("taDrainageDelete -=- {}", e.toString());

+ 3
- 0
src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java 파일 보기

@@ -96,4 +96,7 @@ public class TaDrainage implements Serializable {
96 96
      */
97 97
     private String activityId;
98 98
 
99
+    @TableField(exist = false)
100
+    private String mpAppid;
101
+
99 102
 }

+ 1
- 0
src/main/java/com/huiju/estateagents/third/controller/WxRedpackController.java 파일 보기

@@ -76,6 +76,7 @@ public class WxRedpackController {
76 76
         //从数据库读取公众号信息
77 77
         QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
78 78
         queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
79
+        queryWrapper.eq("org_id", 0);
79 80
         List<TaMpInfo> mplist = iTaMpInfoService.list(queryWrapper);
80 81
 
81 82
         WxMpService service = new WxMpServiceImpl();