Merge branches 'feature/20211028_取消支付删除订单_wuping' and 'qa' of…

Merge branches 'feature/20211028_取消支付删除订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/service/business/OrderBusinessService.java

 package cn.freemud.service.business;
 
 import com.freemud.application.sdk.api.ordercenter.request.PaySuccessReq;
+import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderRequest;
+import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse;
 
@@ -20,4 +22,6 @@ public interface OrderBusinessService {
 
     CreateOrderResponse createOrderFlow(CreateOrderRequest createOrderRequest);
 
+    BaseOrderResponse orderCancel(CancelOrderRequest cancelOrderRequest);
+
 }

order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java

@@ -328,7 +328,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
 
 
 
-//    @Override
+    @Override
     public BaseOrderResponse orderCancel(CancelOrderRequest cancelOrderRequest) {
         OrderCancelReq request = new OrderCancelReq();
         //商户号必传

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1800,15 +1800,19 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "支付成功");
         }
         String partnerId = deleteOrderVo.getPartnerId();
-        if (deletePartnerId == null || deletePartnerId.contains(partnerId)) {
-            OrderDeleteReq var1 = new OrderDeleteReq();
-            var1.setPartnerId(partnerId);
-            var1.setOrderCode(deleteOrderVo.getOid());
-            var1.setOperator(LogThreadLocal.getTrackingNo());
+        if (CollectionUtils.isEmpty(deletePartnerId) || deletePartnerId.contains(partnerId)) {
+            String reason = "用户取消支付";
+            CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
+                    partnerId, AfterSalesType.USER_CANCEL, reason, LogThreadLocal.getTrackingNo(), System.currentTimeMillis()+"");
+            cancelOrderRequest.setOperator(orderBean.getUserName());
+            cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
+            cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
+            cancelOrderRequest.setReqRemark(reason);
             try {
-                orderSdkService.deleteOrder(var1,LogThreadLocal.getTrackingNo());
+                orderBusinessService.orderCancel(cancelOrderRequest);
+//                orderSdkService.deleteOrder(var1,LogThreadLocal.getTrackingNo());
             }catch (Exception e) {
-                ErrorLog.printErrorLog("删除订单失败", "order/v2/delete", JSONObject.toJSONString(var1), e);
+                ErrorLog.printErrorLog("删除订单失败", "order/v2/cancel", JSONObject.toJSONString(cancelOrderRequest), e);
             }
         }
         // TODO: 2019/9/10 删除订单通知