Merge branch 'dev-lqc' into test

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

@@ -109,20 +109,20 @@ public class FosterwxCashWorkClientController {
             FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
             fosterwxCashBoxClientInfo.setTaskType(fosterwxCashScheduleTaskList.getTaskType());
             if (3 == fosterwxCashScheduleTaskList.getTaskType()) {
-               LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo> fosterwxCashWorkBoxClientInfoLambdaQueryWrapper =  new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>();
-               fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid());
-               switch (fosterwxCashWorkwxTaskList.getBoxType()){
-                   case 8:
-                       // 投放版小程序
-                       fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint,"videoId="+fosterwxCashWorkwxTaskList.getVideoId()+"&");
-                       break;
-                   case 26:
-                       fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint,"materialId="+fosterwxCashWorkwxTaskList.getVideoId()+"&");
-                       fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint,"categoryId="+fosterwxCashWorkwxTaskList.getTagId()+"&");
-                       break;
-                   default:
-                       break;
-               }
+                LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo> fosterwxCashWorkBoxClientInfoLambdaQueryWrapper = new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>();
+                fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid());
+                switch (fosterwxCashWorkwxTaskList.getBoxType()) {
+                    case 8:
+                        // 投放版小程序
+                        fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint, "videoId=" + fosterwxCashWorkwxTaskList.getVideoId() + "&");
+                        break;
+                    case 26:
+                        fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint, "materialId=" + fosterwxCashWorkwxTaskList.getVideoId() + "&");
+                        fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint, "categoryId=" + fosterwxCashWorkwxTaskList.getTagId() + "&");
+                        break;
+                    default:
+                        break;
+                }
                 FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(fosterwxCashWorkBoxClientInfoLambdaQueryWrapper);
 
                 if (null != fosterwxCashWorkBoxClientInfo) {
@@ -131,7 +131,7 @@ public class FosterwxCashWorkClientController {
                     boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
                     boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
                     boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
-                    boxInfo.setEnterpoint(fosterwxCashScheduleTaskList.getBoxUrl());
+                    boxInfo.setEnterpoint(fosterwxCashWorkBoxClientInfo.getEnterpoint());
                     boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());
                     boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
                     boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
@@ -140,8 +140,8 @@ public class FosterwxCashWorkClientController {
                     boxInfo.setApp_type(fosterwxCashWorkBoxClientInfo.getAppType());
                     boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
                     fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
-                }else{
-                    log.info("小程序{}无法根据{}{}获取缓存", fosterwxCashScheduleTaskList.getBoxGhid(),fosterwxCashWorkwxTaskList.getVideoId(),fosterwxCashWorkwxTaskList.getTagId());
+                } else {
+                    log.info("小程序{}无法根据{}{}获取缓存", fosterwxCashScheduleTaskList.getBoxGhid(), fosterwxCashWorkwxTaskList.getVideoId(), fosterwxCashWorkwxTaskList.getTagId());
                 }
             } else {
                 FosterwxCashBoxClientInfo.UrlInfo urlInfo = fosterwxCashBoxClientInfo.new UrlInfo();