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

Merge #146 into master from cc_20260520_declare_goods

Browse Source 
fix:新增获取门店报货信息接口

* cc_20260520_declare_goods: (2 commits squashed)

  - fix:新增根据门店编码列表获取门店报货信息接口

  - fix:新增字段

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/146
This commit is contained in:
王非凡
2026-05-21 09:38:59 +00:00
committed by 正新
parent ca54dc5468
commit 3d31c69b5b
12 changed files with 293 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,16 +9,15 @@ import com.cool.store.dto.store.StoreUserPositionDTO;
import com.cool.store.dto.wallet.PaymentDTO;
import com.cool.store.dto.wx.MiniProgramFreeLoginDTO;
import com.cool.store.handler.WeChatHandler;
import com.cool.store.enums.close.CloseTypeEnum;
import com.cool.store.request.OpenApiStoreRequest;
import com.cool.store.request.StoreCodeDTO;
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.openapi.StoreRequest;
import com.cool.store.request.openapi.SubRegionRequest;
import com.cool.store.request.store.StoreNumListRequest;
import com.cool.store.request.privatesphere.PrivateSphereSnRequest;
import com.cool.store.request.wallet.AccountTradeCallbackRequest;
import com.cool.store.request.wallet.AddTagCallbackNoticeRequest;
@@ -33,11 +32,11 @@ import com.cool.store.service.*;
import com.cool.store.service.privatesphere.PrivateSphereQrService;
import com.cool.store.service.wallet.WalletService;
import com.cool.store.service.xinfa.XinFaBusinessService;
import com.cool.store.service.xinfa.XinFaDeviceService;
import com.cool.store.utils.HttpHelper;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.service.close.CloseStoreService;
import com.cool.store.vo.privatesphere.PrivateSphereVO;
import com.cool.store.vo.store.StoreDeclareGoodsVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -315,4 +314,10 @@ public class OpenApiController {
return ApiResponse.success(xinFaBusinessService.getStoreXinFaDeviceDetail(request.getStoreNum()));
}
@ApiOperation("根据门店编码列表获取门店报货信息")
@PostMapping("/getStoreDeclareGoodsInfo")
public ApiResponse<List<StoreDeclareGoodsVO>> getStoreDeclareGoodsInfo(@RequestBody @Validated StoreNumListRequest request) {
return ApiResponse.success(storeService.getStoreDeclareGoodsByStoreNums(request.getStoreNums()));
}
}

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

@@ -1,13 +1,14 @@
package com.cool.store.controller.webb;
import com.cool.store.common.PageBasicInfo;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.dto.store.StoreUserDTO;
import com.cool.store.request.store.StoreListRequest;
import com.cool.store.request.store.StoreNumListRequest;
import com.cool.store.request.UserStoreRequest;
import com.cool.store.response.MiniShopsResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.StoreService;
import com.cool.store.vo.store.StoreDeclareGoodsVO;
import com.cool.store.vo.store.StoreListVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
@@ -50,4 +51,10 @@ public class PCStoreController {
public ResponseResult<List<StoreUserDTO>> getStoreUserPositionList(String storeId, String userName) {
return ResponseResult.success(storeService.getStoreUserPositionList(storeId, userName));
}
@ApiOperation("根据门店编码列表获取门店报货信息")
@PostMapping("/declareGoodsInfo")
public ResponseResult<List<StoreDeclareGoodsVO>> getStoreDeclareGoodsInfo(@RequestBody @Validated StoreNumListRequest request) {
return ResponseResult.success(storeService.getStoreDeclareGoodsByStoreNums(request.getStoreNums()));
}
}