Merge #144 into master from cc_20260520_unify_merge

0520需求汇总 * cc_20260520_unify_merge: (22 commits squashed) - fix:正新鸡排信发自动开通改造 - fix:环境配置 - fix - fix:信发门店设备信息接口入参修改 - fix:信发门店设备信息接口入参修改 - fix:新增根据门店id查询设备接口 - fix - fix:限制设备数量 - fix:问题修复 - fix:网点信息获取转义；网点/设备创建异常抛出 - fix:更新开业报备流程完成日期、首次在营业状态时间 - fix - fix:云流水&新管家账号关闭接口传入闭店原因；新增闭店原因违约闭店 - fix:闭店信息新增字段 - Merge branch 'master' into cc_20260518_store_date - fix:开店流程完成状态判断排除食安阶段 - fix - fix - Merge branch 'cc_20260514_xinfa_modify' into cc_20260520_unify_merge # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java - Merge branch 'cc_20260518_store_date' into cc_20260520_unify_merge - Merge branch 'cc_20260520_close_store_optimize' into cc_20260520_unify_merge - Merge remote-tracking branch 'origin/cc_20260518_close_reason' into cc_20260520_unify_merge Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/144
2026-05-20 08:44:35 +00:00
parent b89e8c9352
commit 3e227cc5fb
38 changed files with 876 additions and 30 deletions
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
@@ -124,6 +124,13 @@ public class DeskController {
        return ResponseResult.success(deskService.xinFaListPendingList(   deskRequest, userInfo   ));
    }

+    @ApiOperation("待处理-信发系统开通（填写设备数量）")
+    @PostMapping("/xinFaFillNumPendingList")
+    public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaFillNumPendingList(@RequestBody DeskRequest deskRequest) {
+        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.xinFaFillNumPendingList(   deskRequest, userInfo   ));
+    }
+
    @ApiOperation("待处理-pos")
    @PostMapping("/posListPendingList")
    public ResponseResult<PageInfo<PreparationCommonPendingVO>> posListPendingList(@RequestBody DeskRequest deskRequest) {
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
@@ -67,6 +67,7 @@ import com.cool.store.service.impl.UserAuthMappingServiceImpl;
 import com.cool.store.service.wallet.WalletApiService;
 import com.cool.store.service.wechat.WechatTemplateService;
 import com.cool.store.service.xinfa.XinFaBusinessService;
+import com.cool.store.service.xinfa.XinFaDeviceService;
 import com.cool.store.utils.RsaSignUtil;
 import com.cool.store.utils.poi.StringUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -165,6 +166,20 @@ public class PCTestController {
    BonusService bonusService;
    @Resource
    BonusDistributionRuleDAO bonusRuleDAO;
+    @Resource
+    XinFaDeviceService xinFaDeviceService;
+
+    @PostMapping("/createTerminal")
+    public ResponseResult<Boolean> createTerminal(@RequestBody CreateTerminalDTO createTerminalDTO) {
+        xinFaDeviceService.createTerminal(createTerminalDTO);
+        return ResponseResult.success(true);
+    }
+
+    @PostMapping("/createPoint")
+    public ResponseResult<Boolean> createPoint(@RequestBody CreatePointDTO createPointDTO) {
+        xinFaDeviceService.createPoint(createPointDTO);
+        return ResponseResult.success(true);
+    }

    @PostMapping("/closeUpAutoOpen")
    public void closeUpAutoOpen(Long applyId) {
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/XinFaController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/XinFaController.java
@@ -0,0 +1,49 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.dto.huoma.StoreXinFaDeviceDetail;
+import com.cool.store.dto.huoma.XinfaPointInfoDTO;
+import com.cool.store.request.huoma.XinfaTerminalCreateRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.xinfa.XinFaBusinessService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 信发
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/5/14
+ */
+@RestController
+@RequestMapping("/pc/xinfa")
+@Api(tags = "信发")
+@Slf4j
+@RequiredArgsConstructor
+public class XinFaController {
+    private final XinFaBusinessService xinFaBusinessService;
+
+    @ApiOperation("门店设备信息")
+    @GetMapping("/getStoreXinFaDeviceDetail")
+    public ResponseResult<List<StoreXinFaDeviceDetail>> getStoreXinFaDeviceDetail(String storeId, Long shopId) {
+        return ResponseResult.success(xinFaBusinessService.getStoreXinFaDeviceDetailByStoreId(storeId, shopId));
+    }
+
+    @ApiOperation("门店网点信息")
+    @GetMapping("/getPointInfo")
+    public ResponseResult<XinfaPointInfoDTO> getPointInfo(@RequestParam("storeNum") String storeNum) {
+        return ResponseResult.success(xinFaBusinessService.getPointInfo(storeNum));
+    }
+
+    @ApiOperation("新增信发设备")
+    @PostMapping("/createTerminal")
+    public ResponseResult<Boolean> createTerminal(@RequestBody XinfaTerminalCreateRequest request) {
+        return ResponseResult.success(xinFaBusinessService.createTerminal(request));
+    }
+}
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniXinFaController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniXinFaController.java
@@ -30,6 +30,12 @@ public class MiniXinFaController {
        return ResponseResult.success(xinFaBusinessService.getStoreXinFaDeviceDetail(storeNum));
    }

+    @ApiOperation("门店设备信息")
+    @GetMapping("/getStoreXinFaDeviceDetailV2")
+    public ResponseResult<List<StoreXinFaDeviceDetail>> getStoreXinFaDeviceDetail(String storeId, Long shopId) {
+        return ResponseResult.success(xinFaBusinessService.getStoreXinFaDeviceDetailByStoreId(storeId, shopId));
+    }
+
    @ApiOperation("测试标签信息")
    @PostMapping("/getAccountAllTags")
    public ResponseResult<List<TagDetailDTO>> getAccountAllTags(@RequestBody AccountTagDTO tagDTO) {
--- a/coolstore-partner-web/src/main/resources/application-ab.properties
+++ b/coolstore-partner-web/src/main/resources/application-ab.properties
@@ -166,6 +166,8 @@ huoMa.get.point.terminal.url = https://www.huoMayunping.com/api/terminal/getPoin
 huoMa.get.tag.url = https://www.huomayunping.com/api/tag/search
 huoMa.get.program.url = https://www.huomayunping.com/api/program/search
 huoMa.get.publish.url = https://www.huomayunping.com/api/channelPublish/target/v2/quick-publish
+huoMa.create.point.url = https://www.huomayunping.com/api/point/create
+huoMa.create.terminal.url = https://www.huomayunping.com/api/terminal/create
 huoMa.direct.stores.account = 18375320931
 huoMa.direct.stores.password = Huoma@123456.
 huoMa.franchise.stores.account = 13345565081
--- a/coolstore-partner-web/src/main/resources/application-local.properties
+++ b/coolstore-partner-web/src/main/resources/application-local.properties
@@ -164,6 +164,8 @@ huoMa.get.point.terminal.url = https://www.huoMayunping.com/api/terminal/getPoin
 huoMa.get.tag.url = https://www.huomayunping.com/api/tag/search
 huoMa.get.program.url = https://www.huomayunping.com/api/program/search
 huoMa.get.publish.url = https://www.huomayunping.com/api/channelPublish/target/v2/quick-publish
+huoMa.create.point.url = https://www.huomayunping.com/api/point/create
+huoMa.create.terminal.url = https://www.huomayunping.com/api/terminal/create
 huoMa.direct.stores.account = 18375320931
 huoMa.direct.stores.password = Huoma@123456.
 huoMa.franchise.stores.account = 13345565081
--- a/coolstore-partner-web/src/main/resources/application-online.properties
+++ b/coolstore-partner-web/src/main/resources/application-online.properties
@@ -160,6 +160,8 @@ huoMa.get.point.terminal.url = https://www.huoMayunping.com/api/terminal/getPoin
 huoMa.get.tag.url = https://www.huomayunping.com/api/tag/search
 huoMa.get.program.url = https://www.huomayunping.com/api/program/search
 huoMa.get.publish.url = https://www.huomayunping.com/api/channelPublish/target/v2/quick-publish
+huoMa.create.point.url = https://www.huomayunping.com/api/point/create
+huoMa.create.terminal.url = https://www.huomayunping.com/api/terminal/create
 huoMa.direct.stores.account = 18375320931
 huoMa.direct.stores.password = Huoma@123456.
 huoMa.franchise.stores.account = 13345565081
--- a/coolstore-partner-web/src/main/resources/application-test.properties
+++ b/coolstore-partner-web/src/main/resources/application-test.properties
@@ -166,6 +166,8 @@ huoMa.get.point.terminal.url = https://www.huoMayunping.com/api/terminal/getPoin
 huoMa.get.tag.url = https://www.huomayunping.com/api/tag/search
 huoMa.get.program.url = https://www.huomayunping.com/api/program/search
 huoMa.get.publish.url = https://www.huomayunping.com/api/channelPublish/target/v2/quick-publish
+huoMa.create.point.url = https://www.huomayunping.com/api/point/create
+huoMa.create.terminal.url = https://www.huomayunping.com/api/terminal/create
 huoMa.direct.stores.account = 18375320931
 huoMa.direct.stores.password = Huoma@123456.
 huoMa.franchise.stores.account = 13345565081