springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -389,6 +389,8 @@ @ApiOperation(value = "配送完成") @PutMapping("/order/finishDeliver") public R finishDeliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){ deliverDTO.setOperUserAccount(getLoginUserInfo().getPhone()); deliverDTO.setIsAdmin(true); return communityService.finishDeliverOrder(deliverDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java
@@ -19,4 +19,8 @@ public class ComShopOrderDeliverDTO { @ApiModelProperty(value = "订单ID") private Long orderId; @ApiModelProperty(value = "操作账号", hidden = true) private String operUserAccount; @ApiModelProperty(value = "是否是管理员", hidden = true) private Boolean isAdmin = false; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java
@@ -20,4 +20,8 @@ private String logisticsCompany; @ApiModelProperty(value = "物流单号") private String logisticsNo; @ApiModelProperty(value = "操作账号", hidden = true) private String operUserAccount; @ApiModelProperty(value = "是否是管理员", hidden = true) private Boolean isAdmin; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -444,8 +444,7 @@ */ @PostMapping("/deliverOrder") R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){ Long orderId = deliverDTO.getOrderId(); return comShopOrderService.deliverOrder(orderId); return comShopOrderService.deliverOrder(deliverDTO); } /** * 订单配送 @@ -454,8 +453,7 @@ */ @PostMapping("/finishDeliverOrder") R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){ Long orderId = deliverDTO.getOrderId(); return comShopOrderService.finishDeliverOrder(orderId); return comShopOrderService.finishDeliverOrder(deliverDTO); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
@@ -87,7 +87,7 @@ IPage<ComShopOrderSearchVO> pageOrderBy(Page page, @Param("pageComShopOrderSearchDTO") PageComShopOrderSearchDTO pageComShopOrderSearchDTO); @Select("<script> " + "SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name) AS goods_name , count(og.id) AS goods_count, " + "SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name) AS goods_name , sum(og.amount) AS goods_count, " + " su.phone AS account, uad.name AS receiver, uad.phone AS receiverPhone, \n" + " concat(uad.province_name, uad.city_name, uad.district_name, uad.detail_address) AS receiver_address, ss.name AS storeName, sr.remark," + " CASE\n" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
@@ -94,17 +94,17 @@ /** * 订单配送 * @param orderId 订单id * @param orderDeliverDTO 订单信息 * @return 配送结果 */ R deliverOrder(Long orderId); R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO); /** * 订单完成配送 * @param orderId 订单id * @param orderDeliverDTO 订单信息 * @return 完成配送结果 */ R finishDeliverOrder(Long orderId); R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO); /** * 获取订单导出数据 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -574,14 +574,30 @@ comShopOrderDO.setLogisticsNo(orderShipDTO.getLogisticsNo()); int updated = comShopOrderDAO.updateById(comShopOrderDO); if(updated==1){ //创建订单操作记录 ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO(); orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo()); orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver); orderOperateDO.setOperationTime(new Date()); if(orderShipDTO.getIsAdmin()){ orderOperateDO.setOperationContent("已发货"); orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount()); }else { orderOperateDO.setOperationContent("已发货"); orderOperateDO.setOperationBy("用户"); } int inserted = comShopOrderOperateDAO.insert(orderOperateDO); if(inserted!=1){ log.error("订单发货日志保存错误"); } return R.ok("发货成功"); } return R.fail("发货失败!"); } @Override public R deliverOrder(Long orderId) { ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderId); public R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) { ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId()); if(comShopOrderDO==null){ return R.fail("订单不存在"); } @@ -598,18 +614,35 @@ comShopOrderDO.setStatus(3); int updated = comShopOrderDAO.updateById(comShopOrderDO); if(updated==1){ //创建订单操作记录 ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO(); orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo()); orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver); orderOperateDO.setOperationTime(new Date()); if(orderDeliverDTO.getIsAdmin()){ orderOperateDO.setOperationContent("已发货"); orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount()); }else { orderOperateDO.setOperationContent("已发货"); orderOperateDO.setOperationBy("用户"); } int inserted = comShopOrderOperateDAO.insert(orderOperateDO); if(inserted!=1){ log.error("订单发货日志保存错误"); } return R.ok("开始配送"); } return R.fail("操作失败!"); } @Override public R finishDeliverOrder(Long orderId) { ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderId); public R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) { ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId()); if(comShopOrderDO==null){ return R.fail("订单不存在"); } if(!(comShopOrderDO.getDeliveryStatus() == 4)){ if(comShopOrderDO.getDeliveryStatus() != 4 && comShopOrderDO.getDeliveryStatus() != 3){ return R.fail("订单还未开始配送"); } if(!(comShopOrderDO.getStatus() == 3)){ @@ -619,6 +652,23 @@ comShopOrderDO.setDeliveryStatus(5); int updated = comShopOrderDAO.updateById(comShopOrderDO); if(updated==1){ //创建订单操作记录 ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO(); orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo()); orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.complete); orderOperateDO.setOperationTime(new Date()); if(orderDeliverDTO.getIsAdmin()){ orderOperateDO.setOperationContent("订单已完成"); orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount()); }else { orderOperateDO.setOperationContent("订单已完成"); orderOperateDO.setOperationBy("用户"); } int inserted = comShopOrderOperateDAO.insert(orderOperateDO); if(inserted!=1){ log.error("订单发货日志保存错误"); } return R.ok("配送完成"); } return R.fail("操作失败!"); springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java
@@ -85,6 +85,8 @@ @PutMapping("/ship") @ShopOperLog(operType = 9) public R ship(@RequestBody ComShopOrderShipDTO orderShipDTO){ orderShipDTO.setOperUserAccount(getLoginUserInfo().getAccount()); orderShipDTO.setIsAdmin(false); return communityService.shipOrder(orderShipDTO); } @@ -92,12 +94,16 @@ @PutMapping("/startDeliver") @ShopOperLog(operType = 10) public R deliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){ deliverDTO.setOperUserAccount(getLoginUserInfo().getAccount()); deliverDTO.setIsAdmin(false); return communityService.deliverOrder(deliverDTO); } @ApiOperation(value = "配送完成") @PutMapping("/finishDeliver") public R finishDeliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){ deliverDTO.setOperUserAccount(getLoginUserInfo().getAccount()); deliverDTO.setIsAdmin(false); return communityService.finishDeliverOrder(deliverDTO); }
