提交修改

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

@@ -24,6 +24,14 @@ public class AppliyReverseRequest extends AppBaseRequest {
     private String trackNumber;
 
 
+    /***
+     * 退款状态
+     */
+    private String status;
+
+
+
+
     /***
      * 申请退款金额,如果卖家没有选择修改，则不需要传
      */
@@ -48,8 +56,9 @@ public class AppliyReverseRequest extends AppBaseRequest {
     private List<ResourceDTO> resourceDTOList;
 
     /***
-     * 退款状态
+     * 订单号
      */
-    private String status;
+    private Long tradeOrderId;
+
 
 }

api-third/src/main/java/com/heyu/api/jsapi/JsapiPrepay.java

@@ -220,7 +220,6 @@ public class JsapiPrepay {
         VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(tradeOrderId);
         VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(reverseOrderId);
         CreateRequest request = new CreateRequest();
-
         request.transactionId = vvTradeOrderEntity.getTransactionId();      // 【微信支付订单号】 微信支付侧订单的唯一标识，订单支付成功后，查询订单和支付成功回调通知会返回该参数。transaction_id和out_trade_no必须二选一进行传参。
 
         request.outTradeNo = tradeOrderId + "";      // 【商户订单号】 商户下单时传入的商户系统内部订单号。transaction_id和out_trade_no必须二选一进行传参。

api-third/src/main/java/com/heyu/api/service/impl/ReverseOrderServiceImpl.java

@@ -71,7 +71,7 @@ public class ReverseOrderServiceImpl implements ReverseOrderService {
         vvReverseOrderEntity.setRefundCount(tradeOrderLineIds.size());
         vvReverseOrderEntity.setGmtBuyerApplyRefund(new Date());
         vvReverseOrderEntity.setRefundReason(appliyReverseRequest.getRefundReason());
-        vvReverseOrderEntity.setGmtCancel(new Date());
+
         vvReverseOrderDao.insertOrUpdateVvReverseOrder(vvReverseOrderEntity);
         BigDecimal preSum = BigDecimal.ZERO;
 
@@ -110,7 +110,6 @@ public class ReverseOrderServiceImpl implements ReverseOrderService {
             vvTradeOrderLineEntity.setReverseStatus(appliyReverseRequest.getStatus());
             vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
         }
-
         if (CollectionUtils.isNotEmpty(appliyReverseRequest.getResourceDTOList())) {
             for (ResourceDTO resourceDTO : appliyReverseRequest.getResourceDTOList()) {
                 VvReverseOrderProveEntity vvReverseOrderProveEntity = new VvReverseOrderProveEntity();

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

@@ -353,6 +353,7 @@ public class AdminOrderController {
             reverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount());
             reverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund));
             reverseOrderEntity.setGmtPreRefund(new Date());
+            reverseOrderEntity.setGmtCancel(new Date());
             vvReverseOrderDao.updateVvReverseOrderById(reverseOrderEntity);
         }
         return r;

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

@@ -452,7 +452,7 @@ public class AppOrderController {
 
 
     /***
-     * 订单关闭   /app/order/close
+     * 订单关闭   https://api.1024api.com/api-interface/app/order/close
      */
     @Describe("订单关闭")
     @RequestMapping("/close")

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

@@ -14,6 +14,7 @@ import com.heyu.api.data.dao.vv.*;
 import com.heyu.api.data.entity.vv.*;
 import com.heyu.api.data.utils.R;
 import com.heyu.api.data.utils.SanUtils;
+import com.heyu.api.data.utils.StringUtils;
 import com.heyu.api.service.ReverseOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -32,7 +33,6 @@ import java.util.List;
 @RequestMapping("/app/reverse")
 public class AppReverseController {
 
-
     @Autowired
     private VvReverseOrderDao vvReverseOrderDao;
 
@@ -42,9 +42,6 @@ public class AppReverseController {
     @Autowired
     private VvTradeOrderLineDao vvTradeOrderLineDao;
 
-    @Autowired
-    private VvTradeOrderDao vvTradeOrderDao;
-
     @Autowired
     private VvReverseOrderProveDao vvReverseOrderProveDao;
 
@@ -55,9 +52,10 @@ public class AppReverseController {
     private ReverseOrderService reverseOrderService;
 
 
+
     /***
-     * /app/reverse/add
      *
+     * https://api.1024api.com/api-interface/app/reverse/add
      * 逆向订单创建
      * @param appliyReverseRequest
      * @return
@@ -65,9 +63,23 @@ public class AppReverseController {
     @Describe("逆向订单创建")
     @RequestMapping("/add")
     public R add(@RequestBody AppliyReverseRequest appliyReverseRequest) {
-        List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(appliyReverseRequest.getTrackNumber());
+        appliyReverseRequest.setStatus(ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree.getStatus());
-        return reverseOrderService.createReverseOrder(vvTradeOrderLineEntityList, appliyReverseRequest);
+        appliyReverseRequest.setRefundReason("买家申请退款：" + appliyReverseRequest.getRefundReason());
 
+        List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = null;
+        if(StringUtils.isNotEmpty(appliyReverseRequest.getTrackNumber())){
+            vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(appliyReverseRequest.getTrackNumber());
+        }else{
+            vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(appliyReverseRequest.getTradeOrderId());
+        }
+
+        R r = reverseOrderService.createReverseOrder(vvTradeOrderLineEntityList, appliyReverseRequest);
+        if (r.ifSuccessful()) {
+            VvReverseOrderEntity vvReverseOrderEntity = (VvReverseOrderEntity) r.getData();
+            vvReverseOrderEntity.setGmtBuyerPost(new Date());
+            vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity);
+        }
+        return R.ok();
     }
 
     /**

api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/WeiXinPayCloseHandler.java

@@ -25,7 +25,6 @@ public class WeiXinPayCloseHandler extends BaseDelayedHandler {
 
     @Override
     public R handler(String message) {
-
         log.info("weiXinPayCloseHandler receive message:{}", message);
         WeiXinPayDelayDTO weiXinPayDelayDTO = JSONObject.parseObject(message, WeiXinPayDelayDTO.class);
 
@@ -36,9 +35,10 @@ public class WeiXinPayCloseHandler extends BaseDelayedHandler {
                 vvTradeOrderLineEntity.setStatus(OrderStatusEnums.close.getStatus());
                 vvTradeOrderLineEntity.setGmtClose(new Date());
                 vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
+            }else{
+                log.info("weiXinPayCloseHandler not to close tradeOrderLineId:{} status:{}", vvTradeOrderLineEntity.getId(),vvTradeOrderLineEntity.getStatus());
             }
         }
-
         return R.ok();
     }
 }