diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/LaunchDataDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/LaunchDataDTO.java index 586a7b61b..9379de8ec 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/LaunchDataDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/LaunchDataDTO.java @@ -21,4 +21,7 @@ public class LaunchDataDTO { @ApiModelProperty("") private String upSaleTime; + + @ApiModelProperty("服务包类型") + private String type; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java index 7852f4eca..b2309b398 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java @@ -33,6 +33,9 @@ public class RevenueDataDTO { @ApiModelProperty("营业时间,yyyy-MM-dd") private String businessDate; + + @ApiModelProperty("营业时间") + private String businessTime; @ApiModelProperty("服务包列表") private List otherLaunchDates; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/SalesVolumeDayQueryDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/SalesVolumeDayQueryDTO.java index e5b34b8f9..42cafbe1f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/SalesVolumeDayQueryDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/SalesVolumeDayQueryDTO.java @@ -20,6 +20,12 @@ public class SalesVolumeDayQueryDTO { @ApiModelProperty("日期,yyyy-MM-dd") private String businessDate; + @ApiModelProperty("开始日期") + private String businessDateFrom; + + @ApiModelProperty("结束日期") + private String businessDateTo; + @ApiModelProperty("门店编码") private String storeCode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/ShopListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/ShopListRequest.java new file mode 100644 index 000000000..94625035a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/ShopListRequest.java @@ -0,0 +1,24 @@ +package com.cool.store.request.openapi; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + *

+ * 门店列表Request + *

+ * + * @author wangff + * @since 2025/12/11 + */ +@Data +public class ShopListRequest { + @ApiModelProperty("手机号") + @NotBlank(message = "手机号不能为空") + private String mobile; + + @ApiModelProperty("门店id") + private Long shopId; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/recipe/SalesVolumeDayRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/recipe/SalesVolumeDayRequest.java index 655e72e16..ee8fa9ed5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/recipe/SalesVolumeDayRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/recipe/SalesVolumeDayRequest.java @@ -16,9 +16,14 @@ import javax.validation.constraints.NotBlank; @Data public class SalesVolumeDayRequest { @ApiModelProperty("日期,yyyy-MM-dd") - @NotBlank(message = "日期不能为空") private String businessDate; + @ApiModelProperty("开始日期") + private String businessDateFrom; + + @ApiModelProperty("结束日期") + private String businessDateTo; + @ApiModelProperty("门店id") @NotBlank(message = "门店id不能为空") private String storeId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/LaunchDataVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/LaunchDataVO.java index be478eff4..87f81ba7b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/LaunchDataVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/LaunchDataVO.java @@ -21,4 +21,7 @@ public class LaunchDataVO { @ApiModelProperty("") private String upSaleTime; + + @ApiModelProperty("服务包类型") + private String type; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java index 5c623cbce..b9b9e3669 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java @@ -28,6 +28,9 @@ public class RevenueDataVO { @ApiModelProperty("营业时间,yyyy-MM-dd") private String businessDate; + @ApiModelProperty("营业时间") + private String businessTime; + @ApiModelProperty("服务包列表") private List otherLaunchDates; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index 8e7d0fb54..774387581 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -111,6 +111,8 @@ public interface ShopService { ShopResponse getShopNameAndCode(Long shopId,Long lineId); + ShopResponse getShopNameAndCodeByMobile(String mobile, Long shopId); + String getFranchiseBrandName(Long shopId); //处理shop表省市区 Integer dateHandler(Integer pageNum, Integer pageSize); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 699d46359..fc1bbc277 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -703,6 +703,15 @@ public class ShopServiceImpl implements ShopService { return response; } + @Override + public ShopResponse getShopNameAndCodeByMobile(String mobile, Long shopId) { + LineInfoDO lineInfo = lineInfoDAO.getLineByMobile(mobile); + if (Objects.isNull(lineInfo)) { + throw new ServiceException(LINE_ID_IS_NOT_EXIST); + } + return getShopNameAndCode(shopId, lineInfo.getId()); + } + @Override public String getFranchiseBrandName(Long shopId) { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdFoodServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdFoodServiceImpl.java index 7e71fe14c..9ba93e782 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdFoodServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdFoodServiceImpl.java @@ -99,7 +99,7 @@ public class ThirdFoodServiceImpl implements ThirdFoodService { if (Objects.isNull(storeDO)) { throw new ServiceException(ErrorCodeEnum.STORE_NOT_FIND); } - SalesVolumeDayQueryDTO queryDTO = new SalesVolumeDayQueryDTO(request.getBusinessDate(), storeDO.getStoreNum()); + SalesVolumeDayQueryDTO queryDTO = new SalesVolumeDayQueryDTO(request.getBusinessDate(), request.getBusinessDateFrom(), request.getBusinessDateTo(), storeDO.getStoreNum()); String url = "/v1/store/business/day"; List list = executeApiCall(url, queryDTO, List.class); return BeanUtil.toList(list, RevenueDataVO.class, CopyOptions.create().setFieldMapping(Collections.singletonMap("storeCode", "storeNum"))); diff --git 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 index 033ae4b55..9a508e176 100644 --- 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 @@ -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 statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){ @@ -249,4 +254,9 @@ public class OpenApiController { return ApiResponse.successByWallet(walletService.onlineCommercialBankCallback(request)); } + @ApiOperation("根据手机号获取门店列表") + @PostMapping("/getShopList") + public ResponseResult getShopNameAndCode(@RequestBody @Validated ShopListRequest request) { + return ResponseResult.success(shopService.getShopNameAndCodeByMobile(request.getMobile(), request.getShopId())); + } }