Merge branch 'feature/20210414_华莱士微商城申请退款_wangshichang' into feature/20210420-华莱士公用分支-张志恒

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

@@ -277,8 +277,8 @@ public class SpellGroupOrderAdapter {
         return queryDeliveryTemplateRequest;
     }
 
-    public GroupWorkRefundRequest convertToGroupWorkRefundRequest(String activityCode, String groupId, String orderId, String userId) {
-        return new GroupWorkRefundRequest(activityCode, groupId, orderId, userId);
+    public GroupWorkRefundRequest convertToGroupWorkRefundRequest(String activityCode,String partnerCode,String groupId, String orderId, String userId) {
+        return new GroupWorkRefundRequest(activityCode,partnerCode, groupId, orderId, userId);
     }
 
     /*------------------下方转换返回信息------------------------*/

order-application-service/src/main/java/cn/freemud/entities/dto/promotion/GroupWorkRefundRequest.java

@@ -20,6 +20,11 @@ public class GroupWorkRefundRequest {
     private String activityCode;
 
     /**
+     * 商户号
+     */
+    private String partnerCode;
+
+    /**
      * 团号
      */
     private String groupId;

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

@@ -2223,7 +2223,7 @@ public class OrderServiceImpl implements Orderservice {
                 // 拼团订单主动退款触发通知促销
                 if (Objects.equals(com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAASMALL.getCode(), orderBean.getSource())
                         && Objects.equals(OrderMarketType.GROUPB.getIndex(), orderBean.getMarketingType())) {
-                    GroupWorkRefundRequest groupWorkRefundRequest = spellGroupOrderAdapter.convertToGroupWorkRefundRequest(orderBean.getSpellGroupActivityCode(),orderBean.getSpellGroupCode(),orderBean.getOid(),orderBean.getUserId());
+                    GroupWorkRefundRequest groupWorkRefundRequest = spellGroupOrderAdapter.convertToGroupWorkRefundRequest(orderBean.getSpellGroupActivityCode(),orderBean.getCompanyId(),orderBean.getSpellGroupCode(),orderBean.getOid(),orderBean.getUserId());
                     GroupWorkRefundResponse refundResponse = spellGroupOrderDataManager.groupWorkRefund(groupWorkRefundRequest);
                     if (Objects.isNull(refundResponse) || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, refundResponse.getStatusCode())) {
                         return ResponseUtil.error(ResponseResult.SPELL_GROUP_REFUND_ERROR);