Merge branch 'feature/20200407_取消订单闭环' into develop

# Conflicts:
#	order-application-service/src/main/resources/application.properties

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -74,6 +74,8 @@ public class OrderSdkAdapter {
         cancelOrderRequest.setReason(reason);
         cancelOrderRequest.setTrackingNo(trackingNo);
         cancelOrderRequest.setOperator("admin");
+        //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
+        cancelOrderRequest.setCreateEvent(4);
         if (refund_id != null) {
             cancelOrderRequest.setRefundSerialNo(refund_id.toString());
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -181,7 +181,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
                 //TODO 失败取消订单
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "异常订单取消", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null);
                 orderCancel(cancelOrderRequest);
                 return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "商品库存不足");
             }
@@ -195,7 +195,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "异常订单取消", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
@@ -209,7 +209,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, userScoreResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "异常订单取消", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null);
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
@@ -223,7 +223,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponRedeemResponseBaseResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "异常订单取消", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "核销券码失败", "", null);
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1748,6 +1748,8 @@ public class OrderAdapter {
         if(AfterSalesType.SYSTEM_CANCEL.getIndex().equals(afterSalesType.getIndex()) ){
             cancelOrderRequest.setOperator("admin");
         }
+        //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
+        cancelOrderRequest.setCreateEvent(4);
         return cancelOrderRequest;
     }
 

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

@@ -324,7 +324,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     private BaseResponse failPreOrderPay(String trackingNo, QueryOrdersResponse.DataBean.OrderBean orderBean, String cardCode) {
         //失败冲正库存，冲正活动库存，取消订单
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                AfterSalesType.SYSTEM_CANCEL, "异常订单取消", trackingNo, null);
+                AfterSalesType.SYSTEM_CANCEL, "获取预支付失败", trackingNo, null);
         orderCenterSdkService.orderCancel(cancelOrderRequest);
         return ResponseUtil.error(ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getCode(), ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getMessage(), null);
     }
@@ -371,7 +371,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "异常订单取消", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null);
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             return ResponseUtil.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
         }

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

@@ -1858,7 +1858,7 @@ public class OrderServiceImpl implements Orderservice {
     private BaseResponse failPreOrderPay(String trackingNo, QueryOrdersResponse.DataBean.OrderBean orderBean, String cardCode) {
         //失败冲正库存，冲正活动库存，取消订单
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                AfterSalesType.SYSTEM_CANCEL, "异常订单取消", trackingNo, null);
+                AfterSalesType.SYSTEM_CANCEL, "获取预支付失败", trackingNo, null);
         orderCenterSdkService.orderCancel(cancelOrderRequest);
         // TODO: 2019/9/10 hubowen mq推送变更
         //backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.PRODUCT.getCode(),TransTypeEnum.ACTIVITY.getCode()), backOrdersNotifyActivityQueue, backOrdersNotifyActivityExchange);
@@ -2069,7 +2069,7 @@ public class OrderServiceImpl implements Orderservice {
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "异常订单取消", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null);
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             //如果编辑订单支付信息失败，冲正
             // backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.PRODUCT.getCode(),TransTypeEnum.ACTIVITY.getCode()), backOrdersNotifyActivityQueue, backOrdersNotifyActivityExchange);