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

Merge #71 into master from cc_20260318_wishlist

Browse Source 
feat：订单待确认 审批流去掉

* cc_20260318_wishlist: (22 commits squashed)

  - feat：心愿单接口

  - feat：心愿单接口

  - feat：心愿单接口

  - feat：心愿单接口 查询当前门店铺位绑定的心愿单

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

  - Merge branch 'master' into cc_20260318_wishlist

  - feat：代码merge 错误处理

  - feat：新增storeType

  - feat：查询逻辑调整

  - feat：新增use_ai 赛选

  - feat：新增use_ai 赛选

  - feat：新增use_ai 赛选

  - feat：心愿单状态筛选

  - feat：查询当前门店铺位绑定的心愿单 mini

  - feat：bug修复

  - feat：类型调整

  - feat：名称

  - feat：订单待确认 审批流去掉

  - feat：订单待确认 审批流去掉

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/71
This commit is contained in:
正新
2026-03-23 11:51:20 +00:00
parent d50a31d044
commit a13ba2175c
38 changed files with 908 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,10 +2,7 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.request.order.OrderAuditRecordRequest;
import com.cool.store.request.order.PCStoreOrderOptionQuantityUpdateRequest;
import com.cool.store.request.order.PCStoreOrderQueryRequest;
import com.cool.store.request.order.WishAllListRequest;
import com.cool.store.request.order.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.order.MiniStoreOrderService;
import com.cool.store.vo.order.*;
@@ -78,11 +75,8 @@ public class StoreOrderController {
@ApiOperation("心愿单详情")
@GetMapping("/wishlist/detail")
public ResponseResult<MiniStoreWishlistDetailVO> wishlistDetail(@RequestParam("storeTypeId") Long storeTypeId,
@RequestParam("lineId") Long lineId,
@RequestParam("versionNo") String versionNo) {
return ResponseResult.success(miniStoreOrderService.wishlistDetail(storeTypeId,versionNo, lineId));
public ResponseResult<MiniStoreWishlistDetailVO> wishlistDetail(@RequestParam("wishlistId") Long wishlistId) {
return ResponseResult.success(miniStoreOrderService.wishlistDetail(wishlistId));
}
@ApiOperation("PC心愿单列表")
@@ -91,4 +85,16 @@ public class StoreOrderController {
return ResponseResult.success(miniStoreOrderService.wishAllList( request));
}
@ApiOperation("心愿单待立规审批")
@PostMapping("/wishlist/wishlistApprove")
public ResponseResult<Boolean> wishlistApprove(@RequestBody @Valid WishlistAuditRequest request) {
return ResponseResult.success(miniStoreOrderService.wishlistApprove(request,CurrentUserHolder.getUser()));
}
@ApiOperation("查询当前门店铺位绑定的心愿单")
@GetMapping("/wishlist/getCurrentShopBindWishlist")
public ResponseResult<MiniStoreWishlistDetailVO> getCurrentShopBindWishlist(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(miniStoreOrderService.getCurrentShopBindWishlist(shopId));
}
}

14
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.controller.webc;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dto.OpenInfoDTO;
import com.cool.store.request.*;
@@ -10,10 +11,7 @@ import com.cool.store.response.ShopResponse;
import com.cool.store.service.PointService;
import com.cool.store.service.ShopService;
import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.point.MiniPointPageVO;
import com.cool.store.vo.point.PointDetailVO;
import com.cool.store.vo.point.PointFinancialDataVO;
import com.cool.store.vo.point.ShopRentInfoVO;
import com.cool.store.vo.point.*;
import com.cool.store.vo.shop.MiniShopPageVO;
import com.cool.store.vo.shop.ShopStageInfoVO;
import com.cool.store.vo.shop.ShopStageVO;
@@ -170,4 +168,12 @@ public class MiniShopController {
public ResponseResult<OpenInfoDTO> getShopOpenInfo(@RequestParam("shopId")Long shopId) {
return ResponseResult.success(shopService.getShopOpenInfo(shopId));
}
@ApiOperation("选址人员获取可推荐铺位列表")
@PostMapping("/getRecommendPointList")
public ResponseResult<PageInfo<PointPageVO>> getRecommendPointList(@RequestBody @Validated RecommendPointPageRequest request) {
request.setLineId(PartnerUserHolder.getUser().getLineId());
request.setUseAi(1);
return ResponseResult.success(pointService.getRecommendPointList(request));
}
}

23
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniStoreOrderController.java
View File

@@ -103,9 +103,8 @@ public class MiniStoreOrderController {
@ApiOperation("心愿单详情")
@GetMapping("/wishlist/detail")
public ResponseResult<MiniStoreWishlistDetailVO> wishlistDetail(@RequestParam("storeTypeId") Long storeTypeId,
@RequestParam("versionNo") String versionNo) {
return ResponseResult.success(miniStoreOrderService.wishlistDetail(storeTypeId,versionNo, PartnerUserHolder.getUser().getLineId()));
public ResponseResult<MiniStoreWishlistDetailVO> wishlistDetail(@RequestParam("wishlistId") Long wishlistId) {
return ResponseResult.success(miniStoreOrderService.wishlistDetail(wishlistId));
}
@ApiOperation("心愿单列表")
@@ -114,4 +113,22 @@ public class MiniStoreOrderController {
return ResponseResult.success(miniStoreOrderService.wishlistList( PartnerUserHolder.getUser()));
}
@ApiOperation("心愿单绑定铺位")
@PostMapping("/wishlist/wishlistBindPoint")
public ResponseResult<Boolean> wishlistBindPoint(@RequestBody @Valid WishlistBindPointRequest request) {
return ResponseResult.success(miniStoreOrderService.wishlistBindPoint(request));
}
@ApiOperation("查询当前门店铺位绑定的心愿单")
@GetMapping("/wishlist/getCurrentShopBindWishlist")
public ResponseResult<MiniStoreWishlistDetailVO> getCurrentShopBindWishlist(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(miniStoreOrderService.getCurrentShopBindWishlist(shopId));
}
@ApiOperation("订单 加盟商确认")
@PostMapping("/passOrder")
public ResponseResult<Boolean> passOrder(@RequestBody OrderAuditRecordRequest request) {
return ResponseResult.success(miniStoreOrderService.passOrder(request, null));
}
}