汇鑫大厦用户扫码自动把用户加入集团

jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java

@@ -10,7 +10,9 @@ import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.file.AliyunOssUploadUtils;
 import com.jsowell.common.util.file.FileUtils;
+import com.jsowell.pile.service.MemberGroupService;
 import com.jsowell.pile.service.PileBasicInfoService;
+import com.jsowell.pile.vo.base.PileInfoVO;
 import com.jsowell.pile.vo.uniapp.GroundLockInfoVO;
 import com.jsowell.pile.vo.uniapp.PileConnectorVO;
 import com.jsowell.service.PileService;
@@ -33,6 +35,9 @@ public class JumpController extends BaseController {
     @Autowired
     private PileBasicInfoService pileBasicInfoService;
 
+    @Autowired
+    private MemberGroupService memberGroupService;
+
     /**
      * 查询充电桩详情
      * http://localhost:8080/app-xcx-h5/pile/pileDetail/{pileSn}
@@ -44,8 +49,9 @@ public class JumpController extends BaseController {
         RestApiResponse<?> response = null;
         try {
             // 进入充电桩详情做一下鉴权
-            getMemberIdByAuthorization(request);
+            String memberId = getMemberIdByAuthorization(request);
             PileConnectorVO vo = pileService.getPileDetailByPileSn(pileSn);
+            addMember2MemberGroup(memberId, vo);
             response = new RestApiResponse<>(vo);
         } catch (BusinessException e) {
             logger.warn("app-xcx-h5查询充电桩详情 warn", e);
@@ -58,6 +64,21 @@ public class JumpController extends BaseController {
         return response;
     }
 
+    private void addMember2MemberGroup(String memberId, PileConnectorVO vo) {
+        if (vo == null || StringUtils.isBlank(memberId)) {
+            return;
+        }
+        PileInfoVO pileInfo = vo.getPileInfo();
+        if (pileInfo == null) {
+            return;
+        }
+        String stationId = pileInfo.getStationId();
+        if (!StringUtils.equals(stationId, "159")) {
+            return;
+        }
+        memberGroupService.addMember2MemberGroup(memberId, pileInfo.getMerchantId());
+    }
+
     /**
      * 查询充电枪口详情
      * http://localhost:8080/app-xcx-h5/pile/connectorDetail/{pileConnectorCode}
@@ -69,8 +90,9 @@ public class JumpController extends BaseController {
         RestApiResponse<?> response = null;
         try {
             // 进入充电桩详情做一下鉴权
-            getMemberIdByAuthorization(request);
+            String memberId = getMemberIdByAuthorization(request);
             PileConnectorVO vo = pileService.getConnectorDetail(pileConnectorCode);
+            addMember2MemberGroup(memberId, vo);
             response = new RestApiResponse<>(vo);
         } catch (BusinessException e) {
             logger.warn("app-xcx-h5查询充电枪口详情 warn param:{}", pileConnectorCode, e);

jsowell-admin/src/main/java/com/jsowell/service/PileService.java

@@ -92,9 +92,6 @@ public class PileService {
 	@Autowired
 	private OrderBasicInfoService orderBasicInfoService;
 
-	@Autowired
-	private YKCPushCommandService ykcPushCommandService;
-
 	@Autowired
 	private PileRemoteService pileRemoteService;