Merge branches 'develop' and 'feature/20191216_记录订单操作人_wuping' of…

Merge branches 'develop' and 'feature/20191216_记录订单操作人_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -1689,6 +1689,9 @@ public class OrderAdapter {
         cancelOrderRequest.setReason(reason);
         cancelOrderRequest.setTrackingNo(trackingNo);
         cancelOrderRequest.setRefundSerialNo(refundId);
+        if(AfterSalesType.SYSTEM_CANCEL.getIndex().equals(afterSalesType.getIndex()) ){
+            cancelOrderRequest.setOperator("admin");
+        }
         return cancelOrderRequest;
     }
 

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

@@ -1127,7 +1127,7 @@ public class OrderServiceImpl implements Orderservice {
             // 未接单
             if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
                 //商家未接单逻辑处理    1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
-                BaseResponse baseResponse = partnerNoTakeOrder(orderRefundVo, orderBean, orderId);
+                BaseResponse baseResponse = partnerNoTakeOrder(orderRefundVo, orderBean, orderId,AfterSalesType.USER_CANCEL);
                 if (baseResponse != null) {
                     return baseResponse;
                 }
@@ -1163,7 +1163,7 @@ public class OrderServiceImpl implements Orderservice {
      * @param orderRefundVo
      * @param orderBean
      */
-    private BaseResponse partnerNoTakeOrder(OrderRefundVo orderRefundVo, OrderBean orderBean, String fatherOrderId) {
+    private BaseResponse partnerNoTakeOrder(OrderRefundVo orderRefundVo, OrderBean orderBean, String fatherOrderId,AfterSalesType afterSalesType) {
         com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
         Long refundId = System.currentTimeMillis();
         String partnerId = orderBean.getCompanyId();
@@ -1179,7 +1179,8 @@ public class OrderServiceImpl implements Orderservice {
             state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
         }
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
-                partnerId, AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogTreadLocal.getTrackingNo(), refundId.toString());
+                partnerId, afterSalesType, orderRefundVo.getReason(), LogTreadLocal.getTrackingNo(), refundId.toString());
+        cancelOrderRequest.setOperator(orderBean.getUserName());
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
         if (PayRefundStatus.RUNNING.getCode().intValue() == state) {
             // 退款中
@@ -1189,7 +1190,6 @@ public class OrderServiceImpl implements Orderservice {
             cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
         }
         cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
-        cancelOrderRequest.setOperator(orderBean.getUserName());
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
         if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
@@ -1540,8 +1540,7 @@ public class OrderServiceImpl implements Orderservice {
         orderRefundVo.setPartnerId(orderBean.getCompanyId());
         orderRefundVo.setReason(refundReason);
         //系统异常取消订单
-        orderBean.setUserName("admin");
-        partnerNoTakeOrder(orderRefundVo, orderBean, oid);
+        partnerNoTakeOrder(orderRefundVo, orderBean, oid,AfterSalesType.SYSTEM_CANCEL);
         // 发送消息到消息中心推送给pos前端
         PushMessageNoticeDto pushMessageNoticeDto = messageNoticeAdapter.convent2PushMessageNoticeDto(2, partnerId, storeId,
                 null, null, null, null);