Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/WechatAccountController.java

@@ -230,9 +230,9 @@ public class WechatAccountController {
         }
     }
 
-    //一键生成所有员工的二维码
-    @RequestMapping(value = "oneClickGenerationOld")
-    public HttpRespMsg oneClickGenerationOld(HttpServletRequest request) {
+    //一键生成所有员工的二维码(公众号带参数的)
+    @RequestMapping(value = "oneClickGeneration")
+    public HttpRespMsg oneClickGeneration(HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("Token");
         User user = userService.getById(token);
@@ -295,9 +295,9 @@ public class WechatAccountController {
     }
 
 
-    //一键生成所有员工的二维码
-    @RequestMapping(value = "oneClickGeneration")
-    public HttpRespMsg oneClickGeneration(HttpServletRequest request) {
+    //一键生成所有员工的二维码(小程序的二维码)
+    @RequestMapping(value = "oneClickGenerationOld")
+    public HttpRespMsg oneClickGenerationOld(HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("Token");
         User user = userService.getById(token);

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/WechatCallbackController.java

@@ -1,7 +1,10 @@
 package com.management.platform.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
+import com.management.platform.entity.Custom;
+import com.management.platform.entity.User;
+import com.management.platform.entity.WechatQrcodeScan;
+import com.management.platform.entity.WechatUserFollow;
 import com.management.platform.mapper.WechatQrcodeScanMapper;
 import com.management.platform.mapper.WechatUserFollowMapper;
 import com.management.platform.service.CustomService;
@@ -25,7 +28,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -169,30 +171,30 @@ public class WechatCallbackController {
                 followRecord.setSalesmanId(salesmanId);
                 followMapper.insert(followRecord);
 
-                List<MiniBindUser> miniBindUserList = miniBindUserService.list(new QueryWrapper<MiniBindUser>()
+                /*List<MiniBindUser> miniBindUserList = miniBindUserService.list(new QueryWrapper<MiniBindUser>()
                         .eq("unionid", scanRecord.getUnionid())
                         .orderByDesc("create_time")
-                        .last("limit 1"));
+                        .last("limit 1"));*/
 
-                if (!miniBindUserList.isEmpty()){
-                    int count = customService.count(new QueryWrapper<Custom>().eq("custom_name", openId));
-                    if(count==0) {
-                        Custom custom = new Custom();
-                        custom.setCustomName(openId);//用户的openId
-                        custom.setIsDelete(0);
-                        custom.setInchargerId(miniBindUserList.get(0).getUserId());
-                        custom.setCreateTime(new Date());
-                        if (StringUtils.isNotEmpty(miniBindUserList.get(0).getUserId())) {
-                            User user = userService.getById(miniBindUserList.get(0).getUserId());
-                            custom.setCompanyId(user != null ? user.getCompanyId() : null);
-                            customService.save(custom);
-                            log.info("新增客户成功");
-                        }
-                    }else {
-                        log.info("已存在custom_name为"+openId+"的客户");
+//                if (!miniBindUserList.isEmpty()){
+                int count = customService.count(new QueryWrapper<Custom>().eq("custom_name", openId));
+                if(count==0) {
+                    Custom custom = new Custom();
+                    custom.setCustomName(openId);//用户的openId
+                    custom.setIsDelete(0);
+                    custom.setCreateTime(new Date());
+                    if (StringUtils.isNotEmpty(salesmanId)) {
+                        custom.setInchargerId(salesmanId);
+                        User user = userService.getById(salesmanId);
+                        custom.setCompanyId(user != null ? user.getCompanyId() : null);
+                        customService.save(custom);
+                        log.info("新增客户成功");
                     }
+                }else {
+                    log.info("已存在custom_name为"+openId+"的客户");
                 }
-                log.info("用户新关注成功");
+//                }
+                log.info("用户关注成功");
             } else {
                 followRecord.setIsFollow(true);
                 followRecord.setFollowTime(LocalDateTime.now());

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/WxMiniProgramController.java

@@ -34,20 +34,20 @@ public class WxMiniProgramController {
     @Autowired
     private QRCodeService qrCodeService;
 
-
-    @RequestMapping("generateQRCode")
-    public ResponseEntity<org.springframework.core.io.Resource> generateQRCode(HttpServletRequest request) {
-        String token = request.getHeader("Token");
-        User user = userService.getById(token);
-
-        WechatAccount wechatAccount = wechatAccountService.getOne(new QueryWrapper<WechatAccount>().eq("company_id", user.getCompanyId()));
-        if (wechatAccount==null){
-            throw new RuntimeException("该公司未配置相关参数");
-        }
-        //token
-        String accessToken = wechatAccountService.getAccessToken(user.getCompanyId(), wechatAccount.getAppId());
-        return qrCodeService.generateQRCodeResponse(accessToken);
-    }
+//
+//    @RequestMapping("generateQRCode")
+//    public ResponseEntity<org.springframework.core.io.Resource> generateQRCode(HttpServletRequest request) {
+//        String token = request.getHeader("Token");
+//        User user = userService.getById(token);
+//
+//        WechatAccount wechatAccount = wechatAccountService.getOne(new QueryWrapper<WechatAccount>().eq("company_id", user.getCompanyId()));
+//        if (wechatAccount==null){
+//            throw new RuntimeException("该公司未配置相关参数");
+//        }
+//        //token
+//        String accessToken = wechatAccountService.getAccessToken(user.getCompanyId(), wechatAccount.getAppId());
+//        return qrCodeService.generateQRCodeResponse(accessToken);
+//    }
 
 
     /**