Merge branch 'cc_20250909_new' into cc_20250903_big_screen

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java

@@ -35,6 +35,11 @@ public class PCFranchiseFeeController {
         return ResponseResult.success(franchiseFeeService.update(request));
     }
 
+    @ApiOperation("缴费阶段跳过")
+    @GetMapping("/stageSkip")
+    public ResponseResult<Boolean> stageSkip(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(franchiseFeeService.stageSkip(shopId));
+    }
 
     @ApiOperation("基本信息查询")
     @GetMapping("/getDetail")

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java

@@ -0,0 +1,34 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.common.PageBasicInfo;
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.response.MiniShopsResponse;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.StoreService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * PC门店 前端控制器
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/9
+ */
+@Api(tags = "PC门店")
+@RestController
+@RequestMapping("/pc/stores")
+@RequiredArgsConstructor
+public class PCStoreController {
+    private final StoreService storeService;
+
+    @ApiOperation("当前用户门店列表")
+    @PostMapping("/userStoreList")
+    public ResponseResult<PageInfo<MiniShopsResponse>> getCurrentUserStoreList(@RequestBody PageBasicInfo request) {
+        return ResponseResult.success(storeService.getStoreListByMobile(CurrentUserHolder.getUser().getMobile(), request.getPageNum(), request.getPageSize(), null, null));
+    }
+}

coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

@@ -239,6 +239,7 @@ public class XxlJobHandler {
             }
             Map<Long, LicenseTransactDO> transactDOMap = licenseTransactDOS.stream().collect(Collectors.toMap(LicenseTransactDO::getShopId, x -> x));
             List<LicenseSyncInfoDTO> pushList = new ArrayList<>();
+            List<LicenseTransactDO> pushBusinessList = new ArrayList<>();
             infoDOS.forEach(x -> {
                 LicenseTransactDO licenseTransactDO = transactDOMap.get(x.getShopId());
                 Integer currentStoreSyncCount = 0;
@@ -248,6 +249,7 @@ public class XxlJobHandler {
                         pushList.add(createLicenseSyncInfoDTO(x.getStoreId(), CommonConstants.ONE,
                                 licenseTransactDO.getCreditUrl(), licenseTransactDO.getIssueTime(), licenseTransactDO.getValidity()));
                         currentStoreSyncCount++;
+                        pushBusinessList.add(licenseTransactDO);
                     }
 
                     // 同步食品经营许可证
@@ -265,24 +267,34 @@ public class XxlJobHandler {
                         currentStoreSyncCount++;
                     }
 
-                    // 发送消息
-                    if (!pushList.isEmpty()) {
-                        LicenseDTO licenseDTO = new LicenseDTO();
-                        licenseDTO.setEnterpriseId(eid);
-                        licenseDTO.setRequests(pushList);
-                        log.info("licenseDTO:{}",JSONObject.toJSONString(licenseDTO));
-                        simpleMessageService.send(JSONObject.toJSONString(licenseDTO), RocketMqTagEnum.PARTNER_LICENSE_SYNC_QUEUE);
-                    }
                     if (currentStoreSyncCount == CommonConstants.TWO) {
                         updateSyncList.add(licenseTransactDO.getId());
                     }
 
                 }
             });
+            // 发送消息
+            if (!pushList.isEmpty()) {
+                LicenseDTO licenseDTO = new LicenseDTO();
+                licenseDTO.setEnterpriseId(eid);
+                licenseDTO.setRequests(pushList);
+                log.info("licenseDTO:{}",JSONObject.toJSONString(licenseDTO));
+                simpleMessageService.send(JSONObject.toJSONString(licenseDTO), RocketMqTagEnum.PARTNER_LICENSE_SYNC_QUEUE);
+            }
+            //工商信息变更
+            if (!pushBusinessList.isEmpty()){
+                Map<Long, String> transactMap = infoDOS.stream().collect(Collectors.toMap(LicenseSyncDTO::getShopId, LicenseSyncDTO::getStoreId));
+                BusinessDTO businessDTO = new BusinessDTO();
+                businessDTO.setEnterpriseId(eid);
+                businessDTO.setTransactMap(transactMap);
+                businessDTO.setRequests(pushBusinessList);
+                simpleMessageService.send(JSONObject.toJSONString(businessDTO), RocketMqTagEnum.BUSINESS_SYNC);
+            }
 
             hasNext = licenseTransactDOS.size() >= pageSize;
             pageNum++;
         }
+
         log.info("licenseDTO:{}",JSONObject.toJSONString(updateSyncList));
         if (CollectionUtils.isNotEmpty(updateSyncList)) {
             applyLicenseMapper.updateSyncFlagByIds(updateSyncList);

coolstore-partner-web/src/main/resources/application-ab.properties

@@ -62,10 +62,10 @@ signKey=77fea013c3a6459685b83c21a2fc3411
 fixMobileOpenid=HSAY5531DA7
 #xxljob配置
 #xxljob配置
-xxl.job.admin.addresses = http://10.7.53.224:10001/xxl-job-admin
+xxl.job.admin.addresses = http://10.6.48.226:10001/xxl-job-admin
 xxl.job.executor.appname = ${spring.application.name}
 xxl.job.executor.ip =
-xxl.job.executor.port = 40001
+xxl.job.executor.port = 40301
 xxl.job.executor.logpath = logs/xxl-job/jobhandler
 xxl.job.executor.logretentiondays = 30
 xxl.job.accessToken = 25365115eed84e9ba5e0040abb255a09
@@ -85,6 +85,50 @@ aliyun.sms.signName=酷店掌
 mybatis.configuration.variables.enterpriseId=e17cd2dc350541df8a8b0af9bd27f77d
 enterprise.dingCorpId=dingef2502a50df74ccc35c2f4657eb6378f
 
+qywx.task.notice.url2=https://tstore-h5.coolstore.cn/?corpId=%s&appType=%s#/notice?target=%s&noticeType=zx&corpId=%s&appType=%s&eid=%s
+
+#机会点地址
+third.party.appKey=IGSAEQoakR2HEaYx
+third.party.appSecret=aPsA99K1obFeFm3m
+zx.opportunity.url=https://snp.wenmatech.com/
+
+#大数据地址
+zx.big.data.url=https://ds.zhengxinfood.com/
+zx.big.data.appKey=ff203b5567744feaaae49fb86f58c5bf
+zx.big.data.appSecret=35b8b9a400b4430fa022190be0913cd6
+
+#火吗POS
+api.auth.url=https://api.hmdzg.top
+api.auth.username=VA59C0ubfcpcVpl
+api.auth.secret=H9YKHF6R7N16Fvy
+
+#新管家账号
+xgj.api.auth.url=http://117.139.13.24:11180
+xgj.api.auth.username=6446346061e043e392dd53c9c8d1af0b
+xgj.api.auth.secret=3ba6e4c5632547b8b2b3acefe08667bb
+xgj.api.token.url=http://117.139.13.24:29000
+
+#云流水账号
+#yls.api.auth.url=http://scm330-test.366ec.net
+#yls.api.auth.username=096d4009072c927c
+#yls.api.auth.secret=3b56198f096d4009072c927c96fbc8b6
+
+yls.api.auth.url=http://yuanguiwuliu.com
+yls.api.auth.username=096d4009072c927c
+yls.api.auth.secret=3b56198f096d4009072c927c96fbc8b6
+
+#新掌柜账号
+xzg.api.auth.url=http://webapi.zhengxinfood.com
+
+zx.food.url=https://datacenter.zhengxinfood.com
+
+cool.api.appKey=k8J7fG2qR5tY9vX3
+cool.api.secret=wP4sN6dL8zK2xM9c
+
+#maozhejun userID
+special.user.id=wpayJeDAAAhGIFgUJpJN-zg39JuNbYhg_woayJeDAAA0TC8mkCJeXouw94hYA-D3Q
+
+ask.bot.url=https://test.auth.wx.askbot.cn
 
 
 hqt.token.url=https://tc.cloud.hecom.cn