提交修改

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

@@ -135,7 +135,7 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
                                                         @IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp,
                                                         @IF @LIKE String productName,
                                                         @IFNullReturnEmpty  Long buyerId,
-                                                        @IF String reverseStatus,
+                                                        @IF @IsNotEmpty String reverseStatus,
                                                         @IF @OrderBy(VvTradeOrderLineEntity.create_timestamp) String createTimestampSort);
 
     @GroupBy(VvTradeOrderLineEntity.sku_id)

api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractReverseAction.java

@@ -43,7 +43,7 @@ public abstract class AbstractReverseAction {
     }
 
 
-    public static OrderActionDTO check(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp,String buttonName) {
+    public static OrderActionDTO getOrderAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, String buttonName) {
         List<OrderActionDTO> orderActionDTOS = getOrderActionDTO(vvReverseOrderEntity, isApp);
         if(CollectionUtils.isNotEmpty(orderActionDTOS)){
             for (OrderActionDTO orderActionDTO : orderActionDTOS) {
@@ -55,4 +55,13 @@ public abstract class AbstractReverseAction {
         return null;
     }
 
+
+    public static boolean checkFailed(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp,String buttonName) {
+        OrderActionDTO orderActionDTO =  getOrderAction(vvReverseOrderEntity, isApp, buttonName);
+        if(orderActionDTO !=null){
+            return false;
+        }
+        return true;
+    }
+
 }

api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java

@@ -1,6 +1,6 @@
 package com.test.xxx.mysql;
 
-import com.heyu.api.data.dao.vv.VvRequestLogDao;
+import com.heyu.api.data.dao.vv.VvTradeOrderLineDao;
 import com.lz.mybatis.plugin.utils.TestParseUtils;
 import com.lz.mybatis.plugin.utils.t.Tuple2;
 import org.junit.Test;
@@ -11,7 +11,7 @@ SqlParseUtilsTest {
     @Test
     public void test1() {
 
-        Tuple2<Boolean, String> tuple = TestParseUtils.testSql(VvRequestLogDao::selectVvRequestLogByCreateTime).getData();
+        Tuple2<Boolean, String> tuple = TestParseUtils.testSql(VvTradeOrderLineDao::selectByAppCondition).getData();
 
         System.out.println(tuple.getSecond());
 

api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java

@@ -15,18 +15,16 @@ public class AppliyReverseProveRequest extends AppBaseRequest {
      * 物流单号
      */
     private String trackNumber;
-
-
     /***
      * 逆向物流单号
      */
     private Long reverseOrderId;
-
-
     /***
      *  图片或视频
      */
     private List<ResourceDTO> resourceDTOList;
 
 
+
+
 }

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

@@ -34,6 +34,7 @@ public class AppOrderRequest extends AppBaseRequest {
 
     /***
      * 逆向状态
+     * 如果想查看退货退款，则传1 ，否则不传
      */
     private String reverseStatus;
 

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java

@@ -133,7 +133,7 @@ public class AdminReverseController {
     @RequestMapping("/approve")
     public R approve(@RequestBody VvApproveRequest vvApproveRequest) {
         VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(vvApproveRequest.getReverseOrderId());
-        OrderActionDTO orderActionDTO = AbstractReverseAction.check(vvReverseOrderEntity, false, vvApproveRequest.getButtonName());
+        OrderActionDTO orderActionDTO = AbstractReverseAction.getOrderAction(vvReverseOrderEntity, false, vvApproveRequest.getButtonName());
         if (orderActionDTO == null) {
             return R.error("没有这个按钮的权限");
         }

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

@@ -2,22 +2,23 @@ package com.heyu.api.controller.vv;
 
 
 import com.alibaba.fastjson.JSON;
-import com.heyu.api.data.service.impl.ResourceDTO;
 import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseCloseRequest;
 import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseProveRequest;
-import com.heyu.api.data.service.impl.AppliyReverseRequest;
 import com.heyu.api.common.annotation.AppLogin;
 import com.heyu.api.common.annotation.Describe;
 import com.heyu.api.data.dao.vv.*;
 import com.heyu.api.data.entity.vv.*;
-import com.heyu.api.data.enums.ReverseStatusEnums;
+import com.heyu.api.data.enums.*;
-import com.heyu.api.data.enums.ReverseUploadSceneEnums;
+import com.heyu.api.data.kuaidi100.KuaiDi100Utils;
-import com.heyu.api.data.enums.ShippingTypeEnums;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AppliyReverseRequest;
+import com.heyu.api.data.service.impl.ResourceDTO;
+import com.heyu.api.data.service.impl.ReverseOrderService;
+import com.heyu.api.data.service.vv.VvPackageService;
+import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
 import com.heyu.api.data.utils.NumberUtil;
 import com.heyu.api.data.utils.R;
 import com.heyu.api.data.utils.SanUtils;
-import com.heyu.api.data.service.impl.ReverseOrderService;
-import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +57,9 @@ public class AppReverseController {
 
     @Autowired
     private VvTradeOrderConvertService vvTradeOrderConvertService;
+
+    @Autowired
+    private VvPackageService vvPackageService;
     /***
      *
      * https://api.1024api.com/api-interface/app/reverse/add
@@ -90,8 +94,10 @@ public class AppReverseController {
     @Describe("逆向订单更新订单号")
     @RequestMapping("/upload/tracknumber")
     public R uploadTracknumber(@RequestBody AppliyReverseProveRequest appliyReverseRequest) {
+
         VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(appliyReverseRequest.getReverseOrderId());
-        if (!ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvReverseOrderEntity.getStatus())) {
+        if ( AbstractReverseAction.checkFailed(vvReverseOrderEntity, false,
+                OrderActionEnums.App_Buyer_Upload_Reverse_TrackNumber.getButtonName())) {
             return R.error("逆向订单状态非seller_agree_return_wait_buyer_post，不对");
         }
 
@@ -119,6 +125,28 @@ public class AppReverseController {
         vvPackageEntity.setShippingType(ShippingTypeEnums.reverse.getType());
         vvPackageEntity.setTrackNumber(vvPackageEntity.getTrackNumber());
         vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity);
+
+        vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.user.getRole(), false);
+        List<VvReverseOrderLineEntity> vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvReverseOrderEntity.getId());
+        List<Long> tradeOrderLineIds = SanUtils.getFieldList(vvReverseOrderLineEntities, VvReverseOrderLineEntity::getTradeOrderLineId);
+
+        VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber());
+        List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderByTradeOrderIds(tradeOrderLineIds);
+        //  创建订阅
+        KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(),
+                vvTradeOrderLineEntityList.get(0).getBuyerPhone());
+
+        for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
+            tradeOrderLineEntity.setStatus(ReverseStatusEnums.shipping.getStatus());              // 已经发货
+            vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+            vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+                    OrderStatusEnums.shipping,
+                    appliyReverseRequest.getBuyerId() + ""
+            );
+        }
+
+
+
         return R.ok();
     }
 
@@ -135,8 +163,6 @@ public class AppReverseController {
                         && !ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus())
                         && !ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvReverseOrderEntity.getStatus())) {
 
-
-
             return R.error("逆向订单状态非buyer_apply_reverse_wait_seller_agree 和 seller_agree_return_wait_buyer_post,订单不允许关闭 ");
         }