Merge remote-tracking branch 'origin/master' into cc_20250903_big_screen

# Conflicts: # coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
2025-10-15 11:28:38 +08:00
parent 8f7a044d28 b4e88f5424
commit 1cb6e26017
48 changed files with 829 additions and 176 deletions
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
@@ -60,6 +60,7 @@ public class SignValidateFilter implements Filter {
                    "/zxjp/**/api/audit/result",
                    "/zxjp/**/api/license",
                    "/zxjp/mini/line/getRegionPayPic",
+                    "/zxjp/mini/miniProgram/getUserInfoByToken",
                    "/zxjp/ws/**"

            );
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.dto.*;
 import com.cool.store.dto.store.StoreUserPositionDTO;
+import com.cool.store.dto.wx.MiniProgramFreeLoginDTO;
 import com.cool.store.request.OpenApiStoreRequest;
 import com.cool.store.request.StoreCodeDTO;
 import com.cool.store.request.*;
@@ -49,6 +50,8 @@ public class OpenApiController {
    StoreService storeService;
    @Resource
    MessageTemplateService messageTemplateService;
+    @Resource
+    WechatMiniAppService wechatMiniAppService;

    @PostMapping("/statusRefresh")
    public ApiResponse<Boolean> statusRefresh(@RequestBody  StatusRefreshDTO statusRefreshDTO){
@@ -68,6 +71,13 @@ public class OpenApiController {
    public ApiResponse<PageInfo<StoreDTO>> getStoreList(@RequestBody @Validated OpenApiStoreRequest dto) {
        return ApiResponse.success(storeService.getStoreExtendFieldInfo(dto.getPageSize(),dto.getPageNum()));
    }
+
+    @ApiOperation("获取接入物联网门店信息")
+    @PostMapping("/getIoTStoreList")
+    public ApiResponse<PageInfo<StoreNameDTO>> getIotStoreList(@RequestBody @Validated OpenApiStoreRequest dto) {
+        return ApiResponse.success(storeService.getIotStoreList(dto.getPageNum(), dto.getPageSize()));
+    }
+
    @ApiOperation("新管家回调 刷新收款单状态")
    @PostMapping("/changeReceiptStatus")
    public ApiResponse<Boolean> changeReceiptStatus(@RequestBody @Validated ReceiptCallBackRequest request){
@@ -169,4 +179,10 @@ public class OpenApiController {
    public ApiResponse<Boolean> handleMessage(@RequestBody @Validated ThirdHandleMessageRequest  request) {
        return messageTemplateService.thirdHandleMessage(request);
    }
+
+    @ApiOperation("根据手机号获取短期token")
+    @PostMapping("/getShortTermToken")
+    public ApiResponse<String> getTokenByMobile(@RequestBody @Validated MiniProgramFreeLoginDTO param) {
+        return ApiResponse.success(wechatMiniAppService.getShortTermTokenByMobile(param));
+    }
 }
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java
@@ -7,6 +7,7 @@ import com.cool.store.response.ResponseResult;
 import com.cool.store.service.WechatMiniAppService;
 import com.cool.store.vo.PartnerUserInfoVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

@@ -65,4 +66,11 @@ public class MiniProgramAppController {
        PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser();
        return ResponseResult.success(userInfoVO);
    }
+
+    @ApiOperation("根据短期token获取用户信息")
+    @ApiImplicitParam(name = "token", value = "短期token", required = true, dataType = "String", paramType = "query")
+    @GetMapping("/getUserInfoByToken")
+    public ResponseResult<PartnerUserInfoVO> getUserInfoByToken(String token) {
+        return ResponseResult.success(wechatMiniAppService.getUserInfoByShortTermToken(token));
+    }
 }
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java
@@ -5,6 +5,8 @@ import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.*;
 import com.cool.store.dto.OpenCityDTO;
 import com.cool.store.dto.ocr.InvoiceDTO;
+import com.cool.store.dto.store.StoreUserPositionDTO;
+import com.cool.store.dto.store.StoreUserUpdateDTO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.enums.IDCardSideEnum;
@@ -20,6 +22,7 @@ import com.cool.store.request.ShopListSuccessOpenRequest;
 import com.cool.store.request.xfsgFirstOrderListRequest;
 import com.cool.store.response.MiniShopsResponse;
 import com.cool.store.response.ResponseResult;
+import com.cool.store.response.caipin.StoreUserResponse;
 import com.cool.store.response.xfsgFirstOderListResponse;
 import com.cool.store.service.*;
 import com.cool.store.utils.poi.ExcelUtil;
@@ -29,6 +32,7 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -77,6 +81,10 @@ public class TestController {

    @Resource
    ShopStageInfoDAO shopStageInfoDAO;
+    @Resource
+    ThirdFoodService thirdFoodService;
+    @Autowired
+    StoreService storeService;

    @PostMapping("/getFirstOrders")
    public ResponseResult<xfsgFirstOderListResponse> getFirstOrders(@RequestBody xfsgFirstOrderListRequest storeCodeList) {
@@ -354,4 +362,11 @@ public class TestController {
    public void initTallyBook() {
        xxlJobHandler.initTallyBook();
    }
+
+    @GetMapping("/pushStoreUser")
+    public void pushStoreUser(String storeCode){
+        List<StoreUserPositionDTO> storeUser = storeService.getStoreUser(Arrays.asList(storeCode));
+        List<StoreUserUpdateDTO> storeUserUpdateDTOS = JSONObject.parseArray(JSONObject.toJSONString(storeUser), StoreUserUpdateDTO.class);
+        StoreUserResponse storeUserResponse = thirdFoodService.pushStoreUser(storeUserUpdateDTOS);
+    }
 }
--- a/coolstore-partner-web/src/main/resources/application-ab.properties
+++ b/coolstore-partner-web/src/main/resources/application-ab.properties
@@ -120,7 +120,7 @@ yls.api.auth.secret=3b56198f096d4009072c927c96fbc8b6
 #新掌柜账号
 xzg.api.auth.url=http://webapi.zhengxinfood.com

-zx.food.url=https://datacenter.zhengxinfood.com
+zx.food.url=https://datacenter.zhengxinfood.com/interface

 cool.api.appKey=k8J7fG2qR5tY9vX3
 cool.api.secret=wP4sN6dL8zK2xM9c
--- a/coolstore-partner-web/src/main/resources/application-local.properties
+++ b/coolstore-partner-web/src/main/resources/application-local.properties
@@ -127,7 +127,7 @@ yls.api.auth.secret=3b56198f096d4009072c927c96fbc8b6
 #新掌柜账号
 xzg.api.auth.url=http://webapi.zhengxinfood.com

-zx.food.url=https://datacenter.zhengxinfood.com
+zx.food.url=https://datacenter.zhengxinfood.com/interface

 cool.api.appKey=k8J7fG2qR5tY9vX3
 cool.api.secret=wP4sN6dL8zK2xM9c
--- a/coolstore-partner-web/src/main/resources/application-online.properties
+++ b/coolstore-partner-web/src/main/resources/application-online.properties
@@ -125,7 +125,7 @@ zx.big.data.appSecret=35b8b9a400b4430fa022190be0913cd6
 xzg.api.auth.url=http://webapi.zhengxinfood.com


-zx.food.url=https://datacenter.zhengxinshipin.com
+zx.food.url=https://datacenter.zhengxinshipin.com/interface

 cool.api.appKey=k8J7fG2qR5tY9vX3
 cool.api.secret=wP4sN6dL8zK2xM9c
--- a/coolstore-partner-web/src/main/resources/application-test.properties
+++ b/coolstore-partner-web/src/main/resources/application-test.properties
@@ -128,7 +128,7 @@ yls.api.auth.secret=3b56198f096d4009072c927c96fbc8b6
 #新掌柜账号
 xzg.api.auth.url=http://webapi.zhengxinfood.com

-zx.food.url=https://datacenter.zhengxinfood.com
+zx.food.url=https://datacenter.zhengxinfood.com/interface

 cool.api.appKey=k8J7fG2qR5tY9vX3
 cool.api.secret=wP4sN6dL8zK2xM9c