Browse Source

add deliver

wangming 1 day ago
parent
commit
804a5a8efb

+ 3 - 0
yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java

@@ -194,5 +194,8 @@ public class OrderItem implements Serializable {
     @TableField(exist = false)
     private Integer refundSuccessCount;
 
+    @TableField(exist = false)
+    private Integer refundCount;
+
 
 }

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

@@ -30,6 +30,8 @@ public interface OrderItemMapper extends BaseMapper<OrderItem> {
 
     Integer refundSuccessCount(Long orderItemId);
 
+    Integer refundCount(Long orderItemId);
+
 //    List<OrderItem> getUnCloseRefundOrderItemByOrderNumber(String orderNumber);
 
 //	void insertBatch(List<OrderItem> orderItems);

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

@@ -28,6 +28,8 @@ public interface OrderItemService extends IService<OrderItem> {
 
     Integer refundSuccessCount(Long orderItemId);
 
+    Integer refundCount(Long orderItemId);
+
 
 //    List<OrderItem> getUnCloseRefundOrderItemByOrderNumber(String orderNumber);
 }

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

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

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

@@ -307,6 +307,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 //代表全部退,所以需要增加运费显示
                 orderRefundDto.setGoodsTotal(orderRefundDto.getGoodsTotal() + orderRefundDto.getFreightAmount());
             }
+            item.forEach(c-> c.setRefundCount(orderItemService.refundCount(c.getOrderItemId())));
         }
         orderRefundDto.setOrderItems(item);
     }

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

@@ -81,4 +81,12 @@
           and b.return_money_sts =70;
     </select>
 
+    <select id="refundCount" 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 !=40
+    </select>
+
 </mapper>