Merge remote-tracking branch 'origin/master' into 20211028-订单赠品支持选择属性-zhiwei.zha

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -226,16 +226,6 @@ public class OrderController {
     }
 
     /**
-     * 取消支付删除订单
-     */
-//    @ApiAnnotation(logMessage = "deleteOrderById")
-//    @PostMapping("/deleteOrderById")
-//    public BaseResponse deleteOrderById(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
-//        //return orderservice.deleteOrderById(deleteOrderVo);
-//        return orderservice.cancelPayOrder(deleteOrderVo);
-//    }
-
-    /**
      * 用户申请退款
      */
     @ApiAnnotation(logMessage = "refund")

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

@@ -152,6 +152,8 @@ public class OrderServiceImpl implements Orderservice {
     private List<String> cocoPartnerId;
     @Value("#{'${hls.partnerId}'.split(',')}")
     private List<String> hlsPartnerId;
+    @Value("#{'${order.delete.partnerId}'.split(',')}")
+    private List<String> deletePartnerId;
     @Value("#{'${order.not.automatic.twist.partnerId}'.split(',')}")
     private List<String> notAutomaticTwistPartnerId;
     @Value("${order.not.automatic.twist.time}")
@@ -1771,17 +1773,22 @@ public class OrderServiceImpl implements Orderservice {
         if (paySuccess) {
             return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "支付成功");
         }
-//        DeleteOrderDto deleteOrderDto = orderAdapter.convent2DeleteOrderDto(deleteOrderVo.getOid());
-//
-//        DeleteOrderRequest var1 = new DeleteOrderRequest();
-//        var1.setOrderId(deleteOrderDto.getOrderId());
-//        var1.setOrderSdkType(getDefaultOrderSdkType(deleteOrderVo.getPartnerId()));
-//        var1.setTrackingNo(LogThreadLocal.getTrackingNo());
-//        BaseOrderResponse baseOrderResponse = orderCenterSdkService.deleteOrder(var1);
-//
-//        if (!RESPONSE_SUCCESS_CODE.equals(baseOrderResponse.getErrcode())) {
-//            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR);
-//        }
+        String partnerId = deleteOrderVo.getPartnerId();
+        if (CollectionUtils.isEmpty(deletePartnerId) || deletePartnerId.contains("") || 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 {
+                orderBusinessService.orderCancel(cancelOrderRequest);
+//                orderSdkService.deleteOrder(var1,LogThreadLocal.getTrackingNo());
+            }catch (Exception e) {
+                ErrorLog.printErrorLog("删除订单失败", "order/v2/cancel", JSONObject.toJSONString(cancelOrderRequest), e);
+            }
+        }
         // TODO: 2019/9/10 删除订单通知
         orderQueueService.backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
         return ResponseUtil.success();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderDeleteReq.java

@@ -17,6 +17,8 @@ import lombok.Data;
 @Data
 public class OrderDeleteReq {
 
+    private String partnerId;
+
     private String orderCode;
 
     //操作人