订单，积分，分类，退货的功能优化

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

@@ -100,9 +100,9 @@ public class OrderController {
     public ResponseEntity<Void> delivery(@RequestBody DeliveryOrderParam deliveryOrderParam) {
         Long shopId = SecurityUtils.getShopUser().getShopId();
         Order order = orderService.getOrderByOrderNumberAndShopId(deliveryOrderParam.getOrderNumber(),shopId,true);
-        if (!Objects.equals(order.getStatus(), 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.getStatus(), OrderStatus.PADYED.value())){
+        }else if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.PADYED.value())){
             throw new GlobalException("订单不处于待发货状态，无法进行发货");
         }
         List<OrderRefund> orderRefunds = orderRefundService.getProcessingOrderRefundByOrderId(order.getOrderId());
@@ -119,7 +119,7 @@ public class OrderController {
         }
         orderParam.setDvyTime(new Date());
         orderParam.setUpdateTime(new Date());
-        orderParam.setStatus(OrderStatus.CONSIGNMENT.value());
+        orderParam.setHbOrderStatus(OrderStatus.CONSIGNMENT.value());
         orderParam.setUserId(order.getUserId());
 
         orderService.delivery(orderParam);
@@ -159,7 +159,7 @@ public class OrderController {
                 .eq(Order::getOrderId, order.getOrderId())
                 .eq(Order::getOrderNumber,order.getOrderNumber())
         );
-        if (orderDb.getStatus() <= OrderStatus.PADYED.value() || Objects.equals(orderDb.getStatus(),OrderStatus.WAIT_GROUP.value())){
+        if (orderDb.getHbOrderStatus() <= OrderStatus.PADYED.value() || Objects.equals(orderDb.getHbOrderStatus(),OrderStatus.WAIT_GROUP.value())){
             UserAddrOrder userAddrOrder = order.getUserAddrOrder();
             userAddrOrderService.updateById(userAddrOrder);
         }else {
@@ -220,11 +220,11 @@ public class OrderController {
         }
         orderRefundParam.setBuyerMobile(order.getUserMobile());
         orderRefundParam.setRefundAmount(order.getTotal());
-        if (Objects.equals(order.getStatus(), OrderStatus.CLOSE.value())) {
+        if (Objects.equals(order.getHbOrderStatus(), OrderStatus.CLOSE.value())) {
             throw new GlobalException("当前订单已失败");
         }
 
-        if (Objects.equals(order.getStatus(), OrderStatus.WAIT_GROUP.value())) {
+        if (Objects.equals(order.getHbOrderStatus(), OrderStatus.WAIT_GROUP.value())) {
             throw new GlobalException("当前订单正在等待成团状态，需等待成团才能进行下一步操作");
         }
 
@@ -242,7 +242,7 @@ public class OrderController {
 //        }
 
         //待收货 -> 整单退款 -> 退款金额 < 订单金额 - 运费金额
-        if (Objects.equals(order.getStatus(), OrderStatus.CONSIGNMENT.value()) && orderRefundParam.getRefundType().equals(RefundType.ALL.value())) {
+        if (Objects.equals(order.getHbOrderStatus(), OrderStatus.CONSIGNMENT.value()) && orderRefundParam.getRefundType().equals(RefundType.ALL.value())) {
             Double refundAmount = Arith.sub(order.getActualTotal(),order.getFreightAmount());
             if (orderRefundParam.getRefundAmount() > refundAmount){
                 throw new GlobalException("退款金额已超出订单金额，无法申请");
@@ -350,7 +350,7 @@ public class OrderController {
         } else {
             newOrderRefund.setOrderItemId(orderRefundParam.getOrderItemId());
             // 待发货状态-最后一件商品进行退款，退款金额 =  商品金额 + 订单运费金额
-            if (Objects.equals(order.getStatus(),OrderStatus.PADYED.value()) && order.getFreightAmount() > 0){
+            if (Objects.equals(order.getHbOrderStatus(),OrderStatus.PADYED.value()) && order.getFreightAmount() > 0){
                 int orderItenCount = orderItemService.count(new LambdaQueryWrapper<OrderItem>().eq(OrderItem::getOrderNumber, order.getOrderNumber()));
                 if (Objects.equals(orderRefunds.size(),orderItenCount - 1)){
                     newOrderRefund.setRefundAmount(Arith.add(newOrderRefund.getRefundAmount(),order.getFreightAmount()));

yami-shop-multishop/src/main/java/com/yami/shop/multishop/controller/OrderRefundController.java

@@ -149,7 +149,7 @@ public class OrderRefundController {
                 order.setOrderId(orderRefundDto.getOrderId());
                 // 更新到发货状态
                 Date date = new Date();
-                order.setStatus(OrderStatus.CONSIGNMENT.value());
+                order.setHbOrderStatus(OrderStatus.CONSIGNMENT.value());
                 order.setUpdateTime(date);
                 order.setDvyTime(date);
                 Integer type = null;