suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #11 into master from cc_20251114_minor_req

Browse Source 
fix:数据看板日营业数据字段修改

* cc_20251114_minor_req: (8 commits squashed)

  - fix:门店日营销数据

  - fix:jackson反序列化配置忽略未定义字段

  - fix:菜品市场数据新增字段

  - fix:菜品市场数据新增字段

  - Merge branch 'master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
    #	coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

  - fix:数据看板日营业数据字段修改

  - fix:根据手机号获取门店列表 开放接口

  - Merge branch 'refs/heads/master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/11
This commit is contained in:
王非凡
2025-12-11 09:09:27 +00:00
committed by 苏竹红
parent 1e6912bf59
commit b4b4d0b988
11 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
View File

@@ -13,11 +13,14 @@ import com.cool.store.request.*;
import com.cool.store.request.close.store.ThirdCloseStoreApplyRequest;
import com.cool.store.request.notice.ThirdHandleMessageRequest;
import com.cool.store.request.notice.ThirdMatterRequest;
import com.cool.store.request.openapi.ShopListRequest;
import com.cool.store.request.wallet.AccountTradeCallbackRequest;
import com.cool.store.request.wallet.AddTagCallbackNoticeRequest;
import com.cool.store.request.wallet.OnlineCommercialBankCallbackRequest;
import com.cool.store.request.xgj.FranchiseFeeCallBackRequest;
import com.cool.store.request.xgj.ReceiptCallBackRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.ShopResponse;
import com.cool.store.response.bigdata.ApiResponse;
import com.cool.store.service.*;
import com.cool.store.service.wallet.WalletService;
@@ -67,6 +70,8 @@ public class OpenApiController {
WalletService walletService;
@Resource
CloseStoreService closeStoreService;
@Resource
ShopService shopService;
@PostMapping("/statusRefresh")
public ApiResponse<Boolean> statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){
@@ -249,4 +254,9 @@ public class OpenApiController {
return ApiResponse.successByWallet(walletService.onlineCommercialBankCallback(request));
}
@ApiOperation("根据手机号获取门店列表")
@PostMapping("/getShopList")
public ResponseResult<ShopResponse> getShopNameAndCode(@RequestBody @Validated ShopListRequest request) {
return ResponseResult.success(shopService.getShopNameAndCodeByMobile(request.getMobile(), request.getShopId()));
}
}