Merge branch 'feature/20201119-mixue-zhw' of…

Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group into qa

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

@@ -1551,7 +1551,7 @@ public class OrderServiceImpl implements Orderservice {
         var1.setReqRemark("未支付取消");
             var1.setOperator("admin");
         //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
-        //var1.setCreateEvent(4);
+        var1.setCreateEvent(4);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(var1);
         if (!RESPONSE_SUCCESS_CODE.equals(baseOrderResponse.getErrcode())) {
             return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR.getCode(),baseOrderResponse.getErrmsg());