Merge remote-tracking branch 'origin/qa' into qa

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -225,7 +225,7 @@ public class OrderCallBackMQService {
         if (orderInfoReqs.getOrderPayItemCreateReqList().size()>0) {
             OrderPayItemReqs orderPayItemReqs = orderInfoReqs.getOrderPayItemCreateReqList()
                     .stream()
-                    .filter(s -> s.getPayChannelType().equals(PayChannelType.WECHAT.getIndex()) || s.getPayChannelType().equals(PayChannelType.ALIPAY.getIndex()))
+                    .filter(s -> s.getPayChannelType().equals(PayChannelType.WECHAT.getIndex().intValue()) || s.getPayChannelType().equals(PayChannelType.ALIPAY.getIndex().intValue()))
                     .findFirst().orElse(null);
             if (orderPayItemReqs!=null) {
                 userAmount = orderPayItemReqs.getPayAmount().intValue();

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

@@ -1535,21 +1535,26 @@ public class OrderServiceImpl implements Orderservice {
         }
         OrderBean orderBean = responseDto.getData();
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())) {
-            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许删除");
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许取消");
         }
         if (!OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
-            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许删除");
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许取消");
         }
-        DeleteOrderDto deleteOrderDto = orderAdapter.convent2DeleteOrderDto(deleteOrderVo.getOid());
         //
         CancelOrderRequest var1 = new CancelOrderRequest();
-        var1.setOrderId(deleteOrderDto.getOrderId());
+        var1.setOrderId(deleteOrderVo.getOid());
+        var1.setPartnerId(deleteOrderVo.getPartnerId());
+        var1.setAfterSalesType(AfterSalesType.SYSTEM_CANCEL);
+        var1.setReason(null);
         var1.setTrackingNo(LogTreadLocal.getTrackingNo());
-        var1.setOperator("未支付取消");
+        var1.setRefundSerialNo(null);
+        var1.setReqRemark("未支付取消");
+            var1.setOperator("admin");
+        //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
+        var1.setCreateEvent(4);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(var1);
-
         if (!RESPONSE_SUCCESS_CODE.equals(baseOrderResponse.getErrcode())) {
-            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR);
+            return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR.getCode(),baseOrderResponse.getErrmsg());
         }
         // TODO: 2019/9/10 删除订单通知
         backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
@@ -3373,7 +3378,7 @@ public class OrderServiceImpl implements Orderservice {
         AssortmentOpenPlatformIappWxappStore wxAppStore = assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(wxAppid
                 , storeId
                 , byIndex.getEbcode());
-        if (StringUtils.isNotBlank(wxAppStore.getClientCode())) {
+        if (wxAppStore!=null && StringUtils.isNotBlank(wxAppStore.getClientCode())) {
             return wxAppStore.getClientCode();
         }
         return "";
@@ -3398,6 +3403,7 @@ public class OrderServiceImpl implements Orderservice {
 
         backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
         if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(request.getErrcode())) {
+            backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             return this.newSendPaySuccessNoticeMessage();
         } else {
             return this.newSendPayFaileMessage();