Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of…

Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/pom.xml

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java

@@ -23,6 +23,8 @@ public class CancelOrderRequest extends BaseConfig {
 
     private String partnerId;
 
+    private String storeId;
+
     private AfterSalesType afterSalesType;
     /**
      * 订单ID

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

@@ -2782,4 +2782,51 @@ public class OrderAdapter {
                 createOrderOperateDto.getCardAmount() == null ? 0 : createOrderOperateDto.getCardAmount(), orderExtInfoDTO);
     }
 
+    public Integer getNewOrderClient(String name) {
+        String _name = OrderSourceType.SAAS.getCode();
+        Integer orderClientType;
+        switch (name) {
+            case "saas":
+                orderClientType = 2;
+                break;
+            case "alipay":
+                orderClientType=3;
+                break;
+            case "jdwm":
+                orderClientType = 10;
+                break;
+            case "mtwm":
+                orderClientType = 11;
+                break;
+            case "eleme":
+                orderClientType = 8;
+                break;
+            case "bdwm":
+                orderClientType = 9;
+                break;
+            case "ebwm":
+                orderClientType = 9;
+                break;
+            case "saas_member":
+                orderClientType = 13;
+                break;
+            case "saas_order":
+                orderClientType = 14;
+                break;
+            case "pos":
+                orderClientType = 15;
+                break;
+            case "meal":
+                orderClientType = 19;
+                break;
+            case "saasmall":
+                orderClientType = 23;
+                break;
+            default:
+                orderClientType = OrderClientType.SAAS.getIndex();
+                break;
+        }
+        return orderClientType;
+    }
+
 }

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

@@ -96,6 +96,7 @@ import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
 import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
 import com.freemud.sdk.api.assortment.order.adapter.ActivitySdkAdapter;
 import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO;
+import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
@@ -1144,15 +1145,33 @@ public class OrderServiceImpl implements Orderservice {
                 //backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.ACTIVITY.getCode(), TransTypeEnum.COUPON.getCode(), TransTypeEnum.PRODUCT.getCode()));
                 backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             } else {
-                com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest var1 = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest();
-                OrderRefundRequestDto orderRefundRequestDto = orderAdapter.convent2OrderRefundRequestDto(orderRefundVo, orderBean.getOid());
-                BeanUtil.convertBean(orderRefundRequestDto, var1);
-                var1.setTrackingNo(LogTreadLocal.getTrackingNo());
-                var1.setPartnerId(orderRefundVo.getPartnerId());
-                var1.setStoreId(orderBean.getShopId());
-                var1.setOrderStatus(orderBean.getStatus());
-                var1.setOperator(orderBean.getUserName());
-                BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1);
+//                com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest var1 = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest();
+//                OrderRefundRequestDto orderRefundRequestDto = orderAdapter.convent2OrderRefundRequestDto(orderRefundVo, orderBean.getOid());
+//                BeanUtil.convertBean(orderRefundRequestDto, var1);
+//                var1.setTrackingNo(LogTreadLocal.getTrackingNo());
+//                var1.setPartnerId(orderRefundVo.getPartnerId());
+//                var1.setStoreId(orderBean.getShopId());
+//                var1.setOrderStatus(orderBean.getStatus());
+//                var1.setOperator(orderBean.getUserName());
+//                BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1);
+
+                CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
+                cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
+                cancelOrderRequest.setStoreId(orderBean.getShopId());
+                cancelOrderRequest.setOrderId(orderBean.getOid());
+                cancelOrderRequest.setOrderClient(orderAdapter.getNewOrderClient(orderBean.getSource()));
+
+                //传入的售后单类型为：2：售中用户取消 8：售后申请
+                cancelOrderRequest.setAfterSalesType(AfterSalesType.USER_CANCEL);
+                if (OldOrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
+                    cancelOrderRequest.setAfterSalesType(AfterSalesType.USER_SALE_RETURN);
+                }
+                cancelOrderRequest.setReason(orderRefundVo.getReason());
+                cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
+                cancelOrderRequest.setOperator(orderBean.getUserName());
+                cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+                BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
+
                 if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), baseResponseDto.getErrmsg());
                 }
@@ -1160,7 +1179,7 @@ public class OrderServiceImpl implements Orderservice {
                     sendPosMessage(partnerId, orderBean.getShopId());
                 }
                 //通知小助手发送申请退款公众号订阅消息
-                sendApplyRefundSubscriptionNotice(orderBean,var1);
+                sendApplyRefundSubscriptionNotice(orderBean, orderRefundVo);
                 //已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票
                 printApplyRefundSmallTicket(orderBean, orderRefundVo);
             }
@@ -2110,7 +2129,7 @@ public class OrderServiceImpl implements Orderservice {
      * 通知小助手发送申请退款公众号订阅消息
      * @param orderBean
      */
-    public void sendApplyRefundSubscriptionNotice(OrderBean orderBean,OrderRefundRequest request) {
+    public void sendApplyRefundSubscriptionNotice(OrderBean orderBean,OrderRefundVo request) {
         LogUtil.debug("sendApplyRefundSubscriptionNotice", JSONObject.toJSONString(request), null);
         String partnerId = orderBean.getCompanyId();
         String shopId = orderBean.getShopId();
@@ -2143,7 +2162,7 @@ public class OrderServiceImpl implements Orderservice {
         MpTemplateMsgDataValue keyword5 = new MpTemplateMsgDataValue();
         keyword5.setValue(orderBean.getPhone());
         MpTemplateMsgDataValue remark = new MpTemplateMsgDataValue();
-        remark.setValue(request.getReason()+","+request.getRemark());
+        remark.setValue(request.getReason()+","+request.getRemarks());
         data.setFirst(first);
         data.setKeyword1(keyword1);
         data.setKeyword2(keyword2);

order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java

@@ -88,7 +88,7 @@ public class OrderServiceTest {
         JSONObject jsonObject = JSONObject.parseObject(string);
         QueryOrderByIdResponseDto orderByIdResponseDto = jsonObject.toJavaObject(QueryOrderByIdResponseDto.class);
         QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderByIdResponseDto.getData();
-        orderService.sendApplyRefundSubscriptionNotice(orderBean,request);
+//        orderService.sendApplyRefundSubscriptionNotice(orderBean,request);
 
     }