Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -1,11 +1,13 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mokamrp.privates.entity.pangu.FosterwxCashBoxClientInfo;
 import com.mokamrp.privates.entity.pangu.FosterwxWorkServeHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.pojo.*;
 import com.mokamrp.privates.mapper.pojo.Corp;
+import com.mokamrp.privates.service.CoralApiService;
 import com.mokamrp.privates.service.CorpService;
 import com.mokamrp.privates.service.pangu.*;
 import io.swagger.annotations.Api;
@@ -53,7 +55,7 @@ public class FosterwxCashWorkClientController {
     private FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
 
     @Autowired
-    private FosterwxCashOasBoxService fosterwxCashOasBoxService;
+    private CoralApiService coralApiService;
 
 
     @PostMapping(value = "/getTaskInfo", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
@@ -110,7 +112,7 @@ public class FosterwxCashWorkClientController {
             fosterwxCashBoxClientInfo.setTaskType(fosterwxCashScheduleTaskList.getTaskType());
             if (3 == fosterwxCashScheduleTaskList.getTaskType()) {
                 LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo> fosterwxCashWorkBoxClientInfoLambdaQueryWrapper = new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>();
-                fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid());
+                // fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid());
                 switch (fosterwxCashWorkwxTaskList.getBoxType()) {
                     case 8:
                         // 投放版小程序
@@ -123,13 +125,20 @@ public class FosterwxCashWorkClientController {
                     default:
                         break;
                 }
+                fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.last("LIMIT 1");
                 FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(fosterwxCashWorkBoxClientInfoLambdaQueryWrapper);
 
-                if (null != fosterwxCashWorkBoxClientInfo) {
+                Object obj = coralApiService.getBoxInfo(fosterwxCashWorkwxTaskList.getBoxGhId());
+
+                if (null != fosterwxCashWorkBoxClientInfo && null != obj) {
                     FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
-                    boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());
-                    boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
-                    boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
+                    boxInfo.setGhid(fosterwxCashWorkwxTaskList.getBoxGhId());
+                    boxInfo.setWxid(fosterwxCashWorkwxTaskList.getBoxAppid());
+
+                    JSONObject json = JSONObject.parseObject(obj.toString());
+
+                    boxInfo.setName((String) json.get("boxName"));
+
                     boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
                     boxInfo.setEnterpoint(fosterwxCashWorkBoxClientInfo.getEnterpoint());
                     boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());