Merge branch 'master' of http://115.29.66.169:10080/yiyao_shop/api

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/impl/ShopOrderPackageServiceImpl.java

@@ -296,6 +296,7 @@ public class ShopOrderPackageServiceImpl implements IShopOrderPackageService {
                 shopOrderDetail.setShipedNum(item.getNumber());
                 shopOrderDetail.setShippingStatus(ShippingStatus.ALL_SHIP);
                 shopOrderDetail.setTransactionStatus(TransactionStatus.WAIT_RECEIVE);
+                shopOrderDetail.setFactShipTime(new Date());
                 shopOrderDetailMapper.updateById(shopOrderDetail);
             }
 
@@ -319,6 +320,7 @@ public class ShopOrderPackageServiceImpl implements IShopOrderPackageService {
                 shopOrderDetail.addShipNum(item.getNumber());
                 shopOrderDetail.setShippingStatus(shopOrderDetail.getShipedNum().equals(shopOrderDetail.getProductNum()) ? ShippingStatus.ALL_SHIP : ShippingStatus.PART_SHIP);
                 shopOrderDetail.setTransactionStatus(ShippingStatus.ALL_SHIP.equals(shopOrderDetail.getShippingStatus()) ? TransactionStatus.WAIT_RECEIVE : TransactionStatus.WAIT_DELIVER);
+                shopOrderDetail.setFactShipTime(new Date());
                 shopOrderDetailMapper.updateById(shopOrderDetail);
             }
         }
@@ -331,6 +333,7 @@ public class ShopOrderPackageServiceImpl implements IShopOrderPackageService {
             order.setShippingStatus(ShippingStatus.ALL_SHIP);
             order.setTransactionStatus(TransactionStatus.WAIT_RECEIVE);
         }
+        order.setShippingTime(new Date());
         shopOrderMapper.updateById(order);
 
         return shopOrderPackage;
@@ -389,11 +392,13 @@ public class ShopOrderPackageServiceImpl implements IShopOrderPackageService {
             shopOrderDetail.setShipedNum(item.getNumber());
             shopOrderDetail.setShippingStatus(ShippingStatus.ALL_SHIP);
             shopOrderDetail.setTransactionStatus(TransactionStatus.WAIT_RECEIVE);
+            shopOrderDetail.setFactShipTime(new Date());
             shopOrderDetailMapper.updateById(shopOrderDetail);
         }
         shopOrderPackageItemService.batchSaveItem(items);
         order.setShippingStatus(ShippingStatus.ALL_SHIP);
         order.setTransactionStatus(TransactionStatus.WAIT_RECEIVE);
+        order.setShippingTime(new Date());
         shopOrderMapper.updateById(order);
         return shopOrderPackage;
 
@@ -483,12 +488,12 @@ public class ShopOrderPackageServiceImpl implements IShopOrderPackageService {
         if (allReceipted) {
             order.setReceivingStatus(ReceivingStatus.ALL_RECEIVE);
             order.setTransactionStatus(TransactionStatus.TRADE_SUCCESS);
-            order.setActualReceivingTime(now);
             order.setCompletionTime(now);
         } else {
             order.setReceivingStatus(ReceivingStatus.PARTIAL_RECEIVE);
             order.setTransactionStatus(TransactionStatus.WAIT_RECEIVE);
         }
+        order.setActualReceivingTime(now);
         shopOrderMapper.updateById(order);
         return order;
     }

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/impl/ShopOrderServiceImpl.java

@@ -502,7 +502,8 @@ public class ShopOrderServiceImpl implements IShopOrderService {
         order.setCancellationMethod(CancellationMethod.PAY_SUCCESS_CANCEL);
         order.setCloseTime(new Date());
         baseMapper.updateById(order);
-
+        //优惠券回退
+        couponReceiveRecordService.backCoupon(order.getOrderId());
         //子订单
         shopOrderDetailService.refundOperate(orderId, rightsMethod);
     }