Merge remote-tracking branch 'origin/cc_2250513_api' into cc_2250513_api

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

@@ -1,6 +1,7 @@
 package com.cool.store.controller.webb;
 
 import com.cool.store.dao.*;
+import com.cool.store.dto.FoodTokenDTO;
 import com.cool.store.dto.GetAccessTokenDTO;
 import com.cool.store.dto.ModifyPasswordDTO;
 import com.cool.store.entity.*;
@@ -295,6 +296,12 @@ public class PCTestController {
     public ResponseResult<List<String>> getAuthRegionIdAndSubRegionIdByUserId(@RequestParam(value = "userId", required = true) String userId) {
         return ResponseResult.success(userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId));
     }
-
+    @Resource
+    ThirdFoodService thirdFoodService;
+    @ApiOperation("获取菜品市场token")
+    @PostMapping("/getFoodToken")
+    public ResponseResult<String> getFoodToken(@RequestBody @Validated FoodTokenDTO dto) {
+        return ResponseResult.success(thirdFoodService.getFoodToken(dto));
+    }
 
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java

@@ -1,5 +1,6 @@
 package com.cool.store.controller.webc;
 
+import com.cool.store.dto.FoodTokenDTO;
 import com.cool.store.dto.GetAccessTokenDTO;
 import com.cool.store.dto.ModifyPasswordDTO;
 import com.cool.store.dto.ShopAccount.ShopAccountDTO;
@@ -7,6 +8,7 @@ import com.cool.store.request.GetPasswordDTO;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.PushService;
 import com.cool.store.service.ShopAccountService;
+import com.cool.store.service.ThirdFoodService;
 import com.cool.store.service.ThirdXinGuanJiaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +38,9 @@ public class MiniShopAccountController {
     @Resource
     ThirdXinGuanJiaService thirdXinGuanJiaService;
 
+    @Resource
+    ThirdFoodService thirdFoodService;
+
 
     @ApiOperation("根据门店shopId查询平台账号")
     @GetMapping("/getShopAccountByShopId")
@@ -68,6 +73,12 @@ public class MiniShopAccountController {
         return ResponseResult.success(pushService.getXzgToken(dto));
     }
 
+    @ApiOperation("获取菜品市场token")
+    @PostMapping("/getFoodToken")
+    public ResponseResult<String> getFoodToken(@RequestBody @Validated FoodTokenDTO dto) {
+        return ResponseResult.success(thirdFoodService.getFoodToken(dto));
+    }
+
     @ApiOperation("获取加密子串")
     @PostMapping("/getEncryptedSubstring")
     public ResponseResult<String> getEncryptedSubstring(@RequestBody GetPasswordDTO dto) {

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

@@ -118,6 +118,8 @@ zx.big.data.appSecret=35b8b9a400b4430fa022190be0913cd6
 xzg.api.auth.url=http://webapi.zhengxinfood.com
 
 
+zx.food.url=https://datacenter.zhengxinshipin.com
+
 cool.api.appKey=k8J7fG2qR5tY9vX3
 cool.api.secret=wP4sN6dL8zK2xM9c
 

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

@@ -121,6 +121,8 @@ 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