订单同意退款(已经退货完成)时,通知促销

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

@@ -8,12 +8,11 @@ import cn.freemud.entities.dto.product.ProductInfo;
 import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
 import cn.freemud.entities.dto.promotion.CalculationDiscountRequestDto;
 import cn.freemud.entities.dto.promotion.GroupWorkQueryRequest;
-import cn.freemud.entities.dto.promotion.GroupWorkRefundRequest;
 import cn.freemud.enums.OrderType;
 import cn.freemud.enums.PayType;
+import cn.freemud.management.entities.dto.request.activity.GroupWorkRefundRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
-import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
@@ -24,10 +23,8 @@ import com.freemud.application.sdk.api.promotioncenter.request.promotion.Activit
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.util.DateUtil;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -278,7 +275,7 @@ public class SpellGroupOrderAdapter {
         return queryDeliveryTemplateRequest;
     }
 
-    public GroupWorkRefundRequest convertToGroupWorkRefundRequest(String activityCode,String partnerCode,String groupId, String orderId, String 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

-package cn.freemud.entities.dto.promotion;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 通知促销团员取消订单
- *
- * @author shichang.wang 2021/4/21
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-public class GroupWorkRefundRequest {
-
-    /**
-     * 活动号
-     */
-    private String activityCode;
-
-    /**
-     * 商户号
-     */
-    private String partnerCode;
-
-    /**
-     * 团号
-     */
-    private String groupId;
-
-    /**
-     * 订单
-     */
-    private String orderId;
-
-    /**
-     * 用户id
-     */
-    private String userId;
-
-
-
-}

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

-package cn.freemud.entities.dto.promotion;
-
-import lombok.Data;
-
-/**
- * 通知促销团员取消订单
- *
- * @author shichang.wang 2021/4/21
- */
-
-@Data
-public class GroupWorkRefundResponse {
-
-    /**
-     * 提示
-     */
-    private String msg;
-
-    /**
-     * 内容
-     */
-    private Object result;
-
-    /**
-     * 成功-100
-     */
-    private Integer statusCode;
-
-    /**
-     * 版本号
-     */
-    private String ver;
-
-}

order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java

@@ -222,19 +222,4 @@ public class SpellGroupOrderDataManager {
         }
         return virtualBindStoreResponse.getResult();
     }
-
-
-    /**
-     * 订单主动退款调促销接口
-     *
-     * @param groupWorkRefundRequest
-     * @return
-     */
-    public GroupWorkRefundResponse groupWorkRefund(GroupWorkRefundRequest groupWorkRefundRequest) {
-        GroupWorkRefundResponse groupWorkRefundResponse = promotionDiscountClient.groupWorkRefund(groupWorkRefundRequest);
-        if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(groupWorkRefundResponse.getStatusCode())) {
-            return null;
-        }
-        return groupWorkRefundResponse;
-    }
 }

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

@@ -57,7 +57,9 @@ import cn.freemud.enums.ResponseResult;
 import cn.freemud.enums.OrderType;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
+import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse;
 import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
+import cn.freemud.management.service.handle.ActivityHandle;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.manager.SpellGroupOrderDataManager;
 import cn.freemud.redis.RedisCache;
@@ -314,6 +316,9 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private SpellGroupOrderAdapter spellGroupOrderAdapter;
 
+    @Autowired
+    private ActivityHandle activityHandle;
+
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
         String trackingNo = LogTreadLocal.getTrackingNo();
@@ -2225,8 +2230,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.getCompanyId(),orderBean.getSpellGroupCode(),orderBean.getOid(),orderBean.getUserId());
-                    GroupWorkRefundResponse refundResponse = spellGroupOrderDataManager.groupWorkRefund(groupWorkRefundRequest);
+                    GroupWorkRefundResponse refundResponse = activityHandle.groupWorkRefund(queryOrderByIdResponse.getData());
                     if (Objects.isNull(refundResponse) || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, refundResponse.getStatusCode())) {
                         return ResponseUtil.error(ResponseResult.SPELL_GROUP_REFUND_ERROR);
                     }

order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java

@@ -61,14 +61,6 @@ public interface PromotionDiscountClient {
     @PostMapping("/groupWork/query")
     GroupWorkQueryResponse groupWorkQuery(GroupWorkQueryRequest groupWorkQueryRequest);
 
-    /**
-     * 订单主动退款调促销接口
-     * @param groupWorkRefundRequest
-     * @return
-     */
-    @PostMapping("/activity/groupWork/refund")
-    GroupWorkRefundResponse groupWorkRefund(GroupWorkRefundRequest groupWorkRefundRequest);
-
 
     /**
      * 支付回调时，参团