提交修改

api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java

@@ -62,8 +62,6 @@ public interface VvTradeOrderDao extends BaseMapper<VvTradeOrderEntity> {
                                                   @IF@LE Long maxCreateTimestamp,
                                                   @IF String createTimestampSort);
 
-    Integer updateByBuerIdAndIds(String status,@By Long buyerId,@By Long id);
-
     List<VvTradeOrderEntity> selectVvTradeOrderByTradeOrderIds(@IFNullReturnEmpty @IN List<Long> id);
 
 

api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java

@@ -151,4 +151,11 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
     List<VvTradeOrderLineEntity> selectVvTradeOrderLineByBuyerIdTrackNumber(Long buyerId, String trackNumber);
 
     List<VvTradeOrderLineEntity> selectByTradeOrderIdAndTransactionId(Long tradeOrderId, @IF String transactionId);
+
+    Integer updateByBuerIdAndIds(String status,@By Long buyerId,@By Long id);
+
+    List<VvTradeOrderLineEntity> selectVvTradeOrderLineByTrackNumberBuyerId(String trackNumber,Long buyerId);
+
+    List<VvTradeOrderLineEntity> selectVvTradeOrderLineByTradeOrderIdBuyerId(Long tradeOrderId,Long buyerId);
+
 }

api-mapper/src/main/java/com/heyu/api/data/utils/CollectionUtils.java

@@ -1,11 +1,10 @@
 package com.heyu.api.data.utils;
 
+import java.util.Collection;
 import java.util.Map;
 
 public class CollectionUtils {
 
-
-
     public static boolean notContainsKey(Map map, Object key) {
         if(map == null){
             return true;
@@ -14,4 +13,19 @@ public class CollectionUtils {
         return !map.containsKey(key);
     }
 
+    /***
+     * 如果不是空
+     * @param collection
+     * @return
+     */
+    public static boolean isNotEmpty(Collection collection) {
+        if(collection == null){
+            return false;
+        }
+        if(org.springframework.util.CollectionUtils.isEmpty(collection)){
+            return false;
+        }
+        return true;
+    }
+
 }

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java

@@ -14,6 +14,10 @@ public class VvTradeOrderDeleteDTO  extends AppBaseRequest {
     private String trackNumber;
 
 
+    /***
+     * 如果订单还没有发货，就传订单编号 ，如果订单已经发货了，就传 物流单号
+     */
+    private Long tradeOrderId;
 
 
 }

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java

@@ -33,8 +33,6 @@ public class AppOrderRequest extends AppBaseRequest {
     // wait_pay:待支付,待发货：wait_shipping,  已经发货: shipping , 已接收，delivered
     private String status;
 
-
-
     /***
      * 逆向状态
      */

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java

@@ -394,14 +394,32 @@ public class AppOrderController {
         return R.ok().setData(vo);
     }
 
-
+    // /app/order/delete
     @Describe("删除订单")
     @RequestMapping("/delete")
     public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) {
-        List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvOrderRequest.getTrackNumber());
+
-        for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
+        if (StringUtils.isNotEmpty(vvOrderRequest.getTrackNumber())) {
-            vvTradeOrderDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId());
+            List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumberBuyerId(
+                    vvOrderRequest.getTrackNumber(),vvOrderRequest.getBuyerId());
+            if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) {
+                for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
+                    vvTradeOrderLineDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId());
+                }
+            }
         }
+
+        if (vvOrderRequest.getTradeOrderId() != null) {
+            List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdBuyerId(
+                    vvOrderRequest.getTradeOrderId(),vvOrderRequest.getBuyerId());
+            if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) {
+                for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
+                    vvTradeOrderLineDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId());
+                }
+            }
+        }
+
+
         return R.ok();
     }