傅行帆 4 lat temu
rodzic
commit
943262c520

+ 14
- 4
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java Wyświetl plik

9
 import com.huiju.estateagents.common.DateUtils;
9
 import com.huiju.estateagents.common.DateUtils;
10
 import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.drainage.entity.TaDrainage;
11
 import com.huiju.estateagents.drainage.entity.TaDrainage;
12
-import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
13
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
12
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
14
 import com.huiju.estateagents.entity.ExtendContent;
13
 import com.huiju.estateagents.entity.ExtendContent;
15
 import com.huiju.estateagents.entity.TaPersonBuilding;
14
 import com.huiju.estateagents.entity.TaPersonBuilding;
16
-import com.huiju.estateagents.mapper.TaMiniappMapper;
17
 import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
15
 import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
18
 import com.huiju.estateagents.service.IExtendContentService;
16
 import com.huiju.estateagents.service.IExtendContentService;
19
-import com.huiju.estateagents.service.IMiniAppService;
17
+import com.huiju.estateagents.third.entity.TaMpInfo;
20
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
18
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
19
+import com.huiju.estateagents.third.service.ITaMpInfoService;
21
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
20
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
22
 import org.slf4j.Logger;
21
 import org.slf4j.Logger;
23
 import org.slf4j.LoggerFactory;
22
 import org.slf4j.LoggerFactory;
53
     @Autowired
52
     @Autowired
54
     public IExtendContentService iExtendContentService;
53
     public IExtendContentService iExtendContentService;
55
 
54
 
55
+    @Autowired
56
+    public ITaMpInfoService iTaMpInfoService;
57
+
56
     /**
58
     /**
57
      * 分页查询列表
59
      * 分页查询列表
58
      *
60
      *
311
                                       HttpServletRequest request) {
313
                                       HttpServletRequest request) {
312
         ResponseBean responseBean = new ResponseBean();
314
         ResponseBean responseBean = new ResponseBean();
313
         try {
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
         } catch (Exception e) {
325
         } catch (Exception e) {
316
             e.printStackTrace();
326
             e.printStackTrace();
317
             logger.error("taDrainageDelete -=- {}", e.toString());
327
             logger.error("taDrainageDelete -=- {}", e.toString());

+ 3
- 0
src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java Wyświetl plik

96
      */
96
      */
97
     private String activityId;
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 Wyświetl plik

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