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

Merge #91 into master from cc_20230331_device

Browse Source 
feat：添加阶段状态

* cc_20230331_device: (21 commits squashed)

  - feat：添加采购审批

  - Merge branch 'master' into cc_20230331_device

  - feat：设备发货阶段

  - feat：设备发货

  - feat：设备发货

  - feat：接口调整

  - feat：接口调整

  - feat：接口调整

  - feat：接口调整

  - feat：接口调整

  - feat：接口调整

  - feat：接口调整

  - feat：接口调整

  - feat：查询订单设备明细

  - feat：测试

  - feat：短信模板切换

  - feat：getPendingList

  - feat：代办调整

  - feat：处理人

  - feat：添加阶段状态

  - Merge branch 'master' into cc_20230331_device
    
    # Conflicts:
    #	coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java

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/91
This commit is contained in:
正新
2026-04-12 09:16:48 +00:00
parent 77ca18b6fc
commit 1a77d8fc37
48 changed files with 1874 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,4 +268,11 @@ public class DeskController {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.assignPendingList(request, userInfo));
}
@ApiOperation("待处理-设备通知")
@PostMapping("/deliveryPendingList")
public ResponseResult<PageInfo<DeliveryPendingVO>> deliveryPendingList(@RequestBody AssignPendingRequest request) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.deliveryPendingList(request, userInfo));
}
}

52
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopDeliveryPlanController.java Normal file
View File

@@ -0,0 +1,52 @@
package com.cool.store.controller.webb;
import com.cool.store.enums.DeliveryPlanStageEnum;
import com.cool.store.enums.DeliveryStatusEnum;
import com.cool.store.request.plan.NotifyDeliveryRequest;
import com.cool.store.request.plan.UpdateDeliveryItemRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.plan.ShopDeliveryPlanService;
import com.cool.store.vo.plan.DeliveryDetailVO;
import com.cool.store.vo.plan.DeliveryInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 门店发货阶段控制器
*/
@RequestMapping("/pc/shopDeliveryPlan")
@RestController
@Api("门店发货阶段")
public class ShopDeliveryPlanController {
@Resource
private ShopDeliveryPlanService shopDeliveryPlanService;
@PostMapping("/notifyDelivery")
@ApiOperation("通知发货")
public ResponseResult<Boolean> notifyDelivery(@RequestBody @Validated NotifyDeliveryRequest request) {
return ResponseResult.success(shopDeliveryPlanService.notifyDelivery(request));
}
@GetMapping("/queryDeliveryInfo")
@ApiOperation("查询发货信息")
public ResponseResult<DeliveryInfoVO> queryDeliveryInfo(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(shopDeliveryPlanService.queryDeliveryInfo(shopId));
}
@PostMapping("/updateDeliveryItem")
@ApiOperation("更新发货项信息")
public ResponseResult<Boolean> updateDeliveryItem(@RequestBody @Validated UpdateDeliveryItemRequest request) {
return ResponseResult.success(shopDeliveryPlanService.updateDeliveryItem(request));
}
@GetMapping("/queryDeliveryDetail")
@ApiOperation("根据门店查询发货详细信息")
public ResponseResult<DeliveryDetailVO> queryDeliveryDetail(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(shopDeliveryPlanService.queryDeliveryDetail(shopId));
}
}

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

@@ -4,6 +4,7 @@ import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.request.order.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ExportService;
import com.cool.store.service.order.MiniStoreOrderService;
import com.cool.store.vo.order.*;
@@ -30,6 +31,7 @@ import java.util.List;
public class StoreOrderController {
private final MiniStoreOrderService miniStoreOrderService;
private final ExportService exportService;
@ApiOperation("订单 立规确认 加盟商确认")
@PostMapping("/passOrder")
@@ -117,4 +119,16 @@ public class StoreOrderController {
return ResponseResult.success(miniStoreOrderService.getCurrentShopBindWishlist(shopId));
}
@ApiOperation("查询订单设备明细")
@GetMapping("/queryOrderDeviceDetail")
public ResponseResult<List<OrderDeviceDetailVO>> queryOrderDeviceDetail(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(miniStoreOrderService.queryOrderDeviceDetailByShopId(shopId));
}
@ApiOperation("导出订单设备明细")
@PostMapping("/exportOrderDeviceDetail")
public ResponseResult<Long> exportOrderDeviceDetail(@RequestParam("orderId") Long orderId) {
return ResponseResult.success(exportService.exportOrderDeviceDetail(orderId, CurrentUserHolder.getUser()));
}
}

41
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopDeliveryPlanController.java Normal file
View File

@@ -0,0 +1,41 @@
package com.cool.store.controller.webc;
import com.cool.store.request.plan.NotifyDeliveryRequest;
import com.cool.store.request.plan.UpdateDeliveryItemRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.plan.ShopDeliveryPlanService;
import com.cool.store.vo.plan.DeliveryDetailVO;
import com.cool.store.vo.plan.DeliveryInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* @Auther zx_szh
* @Date 2026/4/2 10:38
* @Version 1.0
*/
@RequestMapping("/mini/shopDeliveryPlan")
@RestController
@Api("门店发货阶段-小程序")
public class MiniShopDeliveryPlanController {
@Resource
private ShopDeliveryPlanService shopDeliveryPlanService;
@GetMapping("/queryDeliveryInfo")
@ApiOperation("查询发货信息")
public ResponseResult<DeliveryInfoVO> queryDeliveryInfo(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(shopDeliveryPlanService.queryDeliveryInfo(shopId));
}
@GetMapping("/queryDeliveryDetail")
@ApiOperation("根据门店查询发货详细信息")
public ResponseResult<DeliveryDetailVO> queryDeliveryDetail(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(shopDeliveryPlanService.queryDeliveryDetail(shopId));
}
}

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

@@ -4,12 +4,15 @@ import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.request.order.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ExportService;
import com.cool.store.service.order.MiniStoreOrderService;
import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.order.MiniStoreOrderDetailVO;
import com.cool.store.vo.order.MiniStoreOrderListVO;
import com.cool.store.vo.order.MiniStoreWishlistDetailVO;
import com.cool.store.vo.order.MiniStoreWishlistListVO;
import com.cool.store.vo.order.OrderDeviceDetailVO;
import com.cool.store.vo.order.OrderDeviceConfigItemVO;
import com.github.pagehelper.PageInfo;
@@ -28,6 +31,7 @@ import javax.validation.Valid;
public class MiniStoreOrderController {
private final MiniStoreOrderService miniStoreOrderService;
private final ExportService exportService;
@ApiOperation("创建订单")
@PostMapping("/create")
@@ -59,17 +63,17 @@ public class MiniStoreOrderController {
return ResponseResult.success(miniStoreOrderService.updateOrder(request,PartnerUserHolder.getUser()));
}
@ApiOperation("撤回订单到草稿")
@PostMapping("/withdraw")
public ResponseResult<Boolean> withdraw(@RequestBody MiniStoreOrderRequest request) {
return ResponseResult.success(miniStoreOrderService.withdraw(request.getOrderId()));
}
@ApiOperation("作废订单")
@PostMapping("/cancel")
public ResponseResult<Boolean> cancel(@RequestBody MiniStoreOrderRequest request) {
return ResponseResult.success(miniStoreOrderService.cancel(request.getOrderId()));
}
// @ApiOperation("撤回订单到草稿")
// @PostMapping("/withdraw")
// public ResponseResult<Boolean> withdraw(@RequestBody MiniStoreOrderRequest request) {
// return ResponseResult.success(miniStoreOrderService.withdraw(request.getOrderId()));
// }
//
// @ApiOperation("作废订单")
// @PostMapping("/cancel")
// public ResponseResult<Boolean> cancel(@RequestBody MiniStoreOrderRequest request) {
// return ResponseResult.success(miniStoreOrderService.cancel(request.getOrderId()));
// }
@ApiOperation("门店预定列表")
@PostMapping("/queryPageByLineId")
@@ -131,4 +135,10 @@ public class MiniStoreOrderController {
return ResponseResult.success(miniStoreOrderService.passOrder(request, null));
}
@ApiOperation("查询订单设备明细")
@GetMapping("/queryOrderDeviceDetail")
public ResponseResult<List<OrderDeviceDetailVO>> queryOrderDeviceDetail(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(miniStoreOrderService.queryOrderDeviceDetailByShopId(shopId));
}
}

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

@@ -1,5 +1,6 @@
package com.cool.store.controller.webc;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
import com.cool.store.dao.*;
@@ -37,6 +38,7 @@ import com.cool.store.service.impl.CommonService;
import com.cool.store.service.wallet.WalletService;
import com.cool.store.service.close.CloseStoreAccountService;
import com.cool.store.service.close.CloseStoreRefundService;
import com.cool.store.utils.CoolDateUtils;
import com.cool.store.utils.poi.ExcelUtil;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.vo.RegionPathNameVO;
@@ -108,11 +110,10 @@ public class TestController {
private WalletPayInfoDAO walletPayInfoDAO;
@Resource
private ShopAllocationInfoDAO shopAllocationInfoDAO;
@Resource
UserAuthMappingService userAuthMappingService;
@Resource
CommonService commonService;
@Resource
UserAuthMappingService userAuthMappingService;
@Autowired
private ShopInfoDAO shopInfoDAO;
@Resource
@@ -478,13 +479,26 @@ public class TestController {
return ResponseResult.success(storeService.handleStoreLogLai(flag,storeCode));
}
@Resource
LineInfoDAO lineInfoDAO;
@GetMapping("/testSendMsg")
public ResponseResult<Boolean> testSendMsg(@RequestParam(value = "poneNumber", required = false) String poneNumber ,
@RequestParam(value = "shopId", required = false) Long shopId ,
@RequestParam(value = "templateCode", required = false) SMSMsgEnum templateCode) {
commonService.sendSms(poneNumber, templateCode);
Map<String, String> templateParam = new HashMap<>();
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
Date date = new Date();
templateParam.put("partnerName",lineInfo.getUsername());
templateParam.put("shopName",shopInfo.getShopName());
templateParam.put("shippingDate", DateUtil.format(date, CoolDateUtils.DATE_FORMAT_DAY));
commonService.sendSms(poneNumber, templateCode,templateParam);
return ResponseResult.success();
}
@GetMapping("/pushReceiptToXGJ")
public ResponseResult<Boolean> pushReceiptToXGJ(@RequestParam(value = "shopId", required = false) Long shopId,
@RequestParam(value = "payId", required = false) Long payId) {

2
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -55,7 +55,7 @@ oss.host=https://oss-cool.coolstore.cn/
#cdn地址
cdn.url=https://oss-cool.coolstore.cn
cdn.url=https://oss-cool.coolstore.cn/
#TRTC
trtc.sdkAppId=1600026212