浏览代码

add deliver

wangming 2 天之前
父节点
当前提交
76d63b06eb

+ 6 - 1
yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java

@@ -30,7 +30,6 @@ public class OrderItem implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long orderItemId;
 
-
     private Long shopId;
 
     /**
@@ -189,5 +188,11 @@ public class OrderItem implements Serializable {
     @TableField(exist = false)
     private Double goodsTotal;
 
+    @TableField(exist = false)
+    private Integer refundIngCount;
+
+    @TableField(exist = false)
+    private Integer refundSuccessCount;
+
 
 }

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

@@ -105,6 +105,12 @@ public class OrderController {
         UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
         order.setUserAddrOrder(userAddrOrder);
         List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber);
+        if (!orderItems.isEmpty()){
+            orderItems.forEach(c->{
+                c.setRefundIngCount(orderItemService.refundIngCount(c.getOrderItemId()));
+                c.setRefundSuccessCount(orderItemService.refundSuccessCount(c.getOrderItemId()));
+            });
+        }
         order.setOrderItems(orderItems);
         return R.SUCCESS(order);
     }

+ 4 - 0
yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java

@@ -26,6 +26,10 @@ public interface OrderItemMapper extends BaseMapper<OrderItem> {
 
     List<OrderItem> getRefundTypeByOrderItem2(@Param("refundId") Long refundId);
 
+    Integer refundIngCount(Long orderItemId);
+
+    Integer refundSuccessCount(Long orderItemId);
+
 //    List<OrderItem> getUnCloseRefundOrderItemByOrderNumber(String orderNumber);
 
 //	void insertBatch(List<OrderItem> orderItems);

+ 5 - 0
yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java

@@ -24,5 +24,10 @@ public interface OrderItemService extends IService<OrderItem> {
 
     List<OrderItem> getRefundTypeByOrderItem2(Long refundId);
 
+    Integer refundIngCount(Long orderItemId);
+
+    Integer refundSuccessCount(Long orderItemId);
+
+
 //    List<OrderItem> getUnCloseRefundOrderItemByOrderNumber(String orderNumber);
 }

+ 10 - 0
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderItemServiceImpl.java

@@ -39,6 +39,16 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
         return orderItemMapper.getRefundTypeByOrderItem2(refundId);
     }
 
+    @Override
+    public Integer refundIngCount(Long orderItemId) {
+        return orderItemMapper.refundIngCount(orderItemId);
+    }
+
+    @Override
+    public Integer refundSuccessCount(Long orderItemId) {
+        return orderItemMapper.refundSuccessCount(orderItemId);
+    }
+
 
 //    @Override
 //    public List<OrderItem> getUnCloseRefundOrderItemByOrderNumber(String orderNumber) {

+ 0 - 1
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -1151,7 +1151,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return map;
     }
 
-
     private boolean isPaymentOver7Days(Date paymentDate) {
         // 1. 将支付时间转换为 Instant
         Instant paymentInstant = paymentDate.toInstant();

+ 16 - 0
yami-shop-service/src/main/resources/mapper/OrderItemMapper.xml

@@ -65,4 +65,20 @@
         <!--AND toi.`order_number` = #{orderNumber}-->
     <!--</select>-->
 
+    <select id="refundIngCount" resultType="integer">
+        SELECT IFNULL(SUM(product_count), 0) c
+        FROM `tz_order_refund_sku` a
+                 LEFT JOIN tz_order_refund b on a.order_refund_id = b.refund_id
+        WHERE a.order_item_id = #{orderItemId}
+          and b.return_money_sts !=70;
+    </select>
+
+    <select id="refundSuccessCount" resultType="integer">
+        SELECT IFNULL(SUM(product_count), 0) c
+        FROM `tz_order_refund_sku` a
+                 LEFT JOIN tz_order_refund b on a.order_refund_id = b.refund_id
+        WHERE a.order_item_id = #{orderItemId}
+          and b.return_money_sts =70;
+    </select>
+
 </mapper>