add deliver

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -84,7 +84,7 @@ public class OrderController {
 
     @GetMapping("/deliverListStatusNum")
     @ApiOperation("后管端-快递订单列表-订单状态数量")
-    public R<Map<String,Integer>> deliverListStatusNum() {
+    public R<Map<String, Integer>> deliverListStatusNum() {
         return R.SUCCESS(orderService.deliverListStatusNum());
     }
 
@@ -93,9 +93,9 @@ public class OrderController {
      */
     @GetMapping("/orderPayByShopId")
     @ApiOperation(value = "根据商家id获取支付信息")
-    public R<OrderPayParam> orderPayByShopId(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")@RequestParam("startTime") Date startTime,
-                                             @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")@RequestParam("endTime") Date endTime) {
-        OrderPayParam actualTotal = orderService.getPayUserCountByshopId(null,startTime,endTime);
+    public R<OrderPayParam> orderPayByShopId(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam("startTime") Date startTime,
+                                             @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam("endTime") Date endTime) {
+        OrderPayParam actualTotal = orderService.getPayUserCountByshopId(null, startTime, endTime);
         return R.SUCCESS(actualTotal);
     }
 
@@ -112,15 +112,15 @@ public class OrderController {
         UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
         order.setUserAddrOrder(userAddrOrder);
         List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber);
-        if (!orderItems.isEmpty()){
-            orderItems.forEach(c->{
+        if (!orderItems.isEmpty()) {
+            orderItems.forEach(c -> {
                 c.setRefundIngCount(orderItemService.refundIngCount(c.getOrderItemId()));
                 c.setRefundSuccessCount(orderItemService.refundSuccessCount(c.getOrderItemId()));
             });
         }
         order.setOrderItems(orderItems);
         User user = userService.getById(order.getUserId());
-        if (user!=null) {
+        if (user != null) {
             order.setNickName(user.getNickName());
             order.setUserMobile(user.getUserMobile());
         }
@@ -137,7 +137,7 @@ public class OrderController {
     @PreAuthorize("@pms.hasPermission('platform:order:exportExcel')")
     public void soldExcel(OrderParam orderParam, HttpServletResponse response) {
 //        orderParam.setIsPayed(1);
-        orderService.soldExcel(orderParam,response);
+        orderService.soldExcel(orderParam, response);
 //
     }
 
@@ -146,20 +146,20 @@ public class OrderController {
     @Transactional(rollbackFor = Exception.class)
     public R<Void> delivery(@RequestBody DeliveryOrderParam deliveryOrderParam) {
         Order order = orderService.getOne(new LambdaUpdateWrapper<Order>().eq(Order::getOrderNumber, deliveryOrderParam.getOrderNumber()));
-        if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.PADYED.value()) && Objects.equals(order.getDvyType(), DvyType.FETCH.value())){
+        if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.PADYED.value()) && Objects.equals(order.getDvyType(), DvyType.FETCH.value())) {
             throw new GlobalException("订单不处于待入库状态，无法进行入库");
-        }else if (!Objects.equals(order.getHbOrderStatus(), 1)){
+        } else if (!Objects.equals(order.getHbOrderStatus(), 1)) {
             throw new GlobalException("订单不处于待发货状态，无法进行发货");
         }
 
         List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(deliveryOrderParam.getOrderNumber());
         if (!orderItems.isEmpty()) {
-            orderItems.forEach(orderItem->
-                    CullenUtils.validateDataThrowException(orderItemService.refundIngCount(orderItem.getOrderItemId())!=0,"该订单存在售后中商品，请处理后发货..."));
+            orderItems.forEach(orderItem ->
+                    CullenUtils.validateDataThrowException(orderItemService.refundIngCount(orderItem.getOrderItemId()) != 0, "该订单存在售后中商品，请处理后发货..."));
         }
 
         Order orderParam = new Order();
-        if (deliveryOrderParam.getDvyType().equals(2)){
+        if (deliveryOrderParam.getDvyType().equals(2)) {
             orderParam.setOrderId(order.getOrderId());
             orderParam.setDvyType(2);
             orderService.updateById(orderParam);
@@ -167,7 +167,7 @@ public class OrderController {
         }
 
         orderParam.setOrderId(order.getOrderId());
-        if (!Objects.equals(order.getDvyType(), DvyType.FETCH.value()) || !Objects.equals(order.getDvyType(), DvyType.NOT_DELIVERY.value())){
+        if (!Objects.equals(order.getDvyType(), DvyType.FETCH.value()) || !Objects.equals(order.getDvyType(), DvyType.NOT_DELIVERY.value())) {
             orderParam.setDvyId(deliveryOrderParam.getDvyId());
             orderParam.setDvyFlowId(deliveryOrderParam.getDvyFlowId());
         }
@@ -180,7 +180,7 @@ public class OrderController {
 
         for (OrderItem orderItem : orderItems) {
             productService.removeProductCacheByProdId(orderItem.getProdId());
-            skuService.removeSkuCacheBySkuId(orderItem.getSkuId(),orderItem.getProdId());
+            skuService.removeSkuCacheBySkuId(orderItem.getSkuId(), orderItem.getProdId());
         }
 
         OrderSettlement settlement = orderSettlementService.getOne(new LambdaQueryWrapper<OrderSettlement>().eq(OrderSettlement::getOrderNumber, deliveryOrderParam.getOrderNumber()));
@@ -193,8 +193,8 @@ public class OrderController {
                 toOrderStr(orderItems),
                 userAddrOrder.getMobile(),
                 connect.getBizUserId(),
-                delivery.getDvyNo(),1
-                );
+                delivery.getDvyNo(), 1
+        );
         return R.SUCCESS();
     }