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

3
coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/LaunchDataDTO.java
View File

@@ -21,4 +21,7 @@ public class LaunchDataDTO {
@ApiModelProperty("")
private String upSaleTime;
@ApiModelProperty("服务包类型")
private String type;
}

3
coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
View File

@@ -33,6 +33,9 @@ public class RevenueDataDTO {
@ApiModelProperty("营业时间，yyyy-MM-dd")
private String businessDate;
@ApiModelProperty("营业时间")
private String businessTime;
@ApiModelProperty("服务包列表")
private List<LaunchDataDTO> otherLaunchDates;

6
coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/SalesVolumeDayQueryDTO.java
View File

@@ -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;
}

24
coolstore-partner-model/src/main/java/com/cool/store/request/openapi/ShopListRequest.java Normal file
View File

@@ -0,0 +1,24 @@
package com.cool.store.request.openapi;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* <p>
* 门店列表Request
* </p>
*
* @author wangff
* @since 2025/12/11
*/
@Data
public class ShopListRequest {
@ApiModelProperty("手机号")
@NotBlank(message = "手机号不能为空")
private String mobile;
@ApiModelProperty("门店id")
private Long shopId;
}

7
coolstore-partner-model/src/main/java/com/cool/store/request/recipe/SalesVolumeDayRequest.java
View File

@@ -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;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/LaunchDataVO.java
View File

@@ -21,4 +21,7 @@ public class LaunchDataVO {
@ApiModelProperty("")
private String upSaleTime;
@ApiModelProperty("服务包类型")
private String type;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java
View File

@@ -28,6 +28,9 @@ public class RevenueDataVO {
@ApiModelProperty("营业时间，yyyy-MM-dd")
private String businessDate;
@ApiModelProperty("营业时间")
private String businessTime;
@ApiModelProperty("服务包列表")
private List<LaunchDataVO> otherLaunchDates;

2
coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java
View File

@@ -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);

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -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);

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdFoodServiceImpl.java
View File

@@ -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<RevenueDataDTO> list = executeApiCall(url, queryDTO, List.class);
return BeanUtil.toList(list, RevenueDataVO.class, CopyOptions.create().setFieldMapping(Collections.singletonMap("storeCode", "storeNum")));

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()));
}
}