Merge branch 'master' into pre

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

assortment-ordercenter-sdk/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.8.RELEASE</version>
+            <version>5.5.42-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

call-back-service/pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-data-manager</artifactId>
-            <version>4.3.7.RELEASE</version>
+            <version>5.5.42-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

order-application-service/pom.xml

@@ -162,7 +162,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.40-RELEASE</version>
+            <version>5.5.42-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/annotations/LogIgnore.java

-//package cn.freemud.annotations;
-//
-//import java.lang.annotation.Retention;
-//import java.lang.annotation.RetentionPolicy;
-//
-///**
-// * @author wanghanghang
-// */
-//
-//@Retention(RetentionPolicy.RUNTIME)
-//public @interface LogIgnore {
-//    /**
-//     * 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
-//     *
-//     * @return
-//     */
-//    boolean printLog() default true;
-//
-//    /**
-//     * printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
-//     * 默认成功100
-//     * @return
-//     */
-//    String[] excludeSuccessCodes() default "100";
-//
-//    /**
-//     * statusCodeFieldName 默认返回状态码字段为code
-//     *
-//     * @return
-//     */
-//    String codeFieldName() default "code";
-//
-//    /**
-//     * statusCodeFieldName 默认返回状态码字段为message
-//     *
-//     * @return
-//     */
-//    String messageFieldName() default "message";
-//
-//    /**
-//     * logMessage 日志打印
-//     * @return
-//     */
-//    String logMessage() default "";
-//}

order-application-service/src/main/java/cn/freemud/aop/LogIgnoreFeignAspect.java

 package cn.freemud.aop;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.entities.vo.ThirdPartLogVo;
 import cn.freemud.utils.AppLogUtil;
 import com.alibaba.fastjson.JSON;
@@ -44,7 +44,7 @@ public class LogIgnoreFeignAspect {
     @Value("${temp-feign-print-body-log-methods:aaa,bbb}")
     private volatile List<String> tempFeignPrintBodyLogMethods = Lists.newArrayList();
 
-    @Pointcut("execution(* cn.freemud.service.thirdparty..*.*(..))")
+    @Pointcut("execution(* cn.freemud.service.thirdparty..*.*(..)) || execution(* cn.freemud.management.thirdparty..*.*(..))")
     public void clientLog() {
     }
 

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

@@ -31,7 +31,8 @@ import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.ecology.SendMessageRequest;
 import cn.freemud.entities.dto.openplatform.QueryInvoiceConfigRequest;
 import cn.freemud.entities.dto.order.*;
-import cn.freemud.entities.dto.pay.*;
+import cn.freemud.entities.dto.pay.InvoiceCreateRequest;
+import cn.freemud.entities.dto.pay.OrderInvoiceRequest;
 import cn.freemud.entities.dto.product.AttributeValue;
 import cn.freemud.entities.dto.product.GroupDetail;
 import cn.freemud.entities.dto.product.ProductAttributeGroup;
@@ -110,7 +111,6 @@ import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
@@ -2089,16 +2089,23 @@ public class OrderServiceImpl implements Orderservice {
                 //获取支付返回退款状态
                 state = PayRefundStatus.SUCCESS.getCode();
             } else {
-                //调用支付退款
-                PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
-                //抖音支付退款必传
-                orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
-                response = payServiceImpl.orderRefund(orderPayRefundRequest);
-                if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
-                    return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
+                OrderExtendedReq ext = orderBean.getOrderExtended();
+                if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
+                    //代付人信息不为空  并且和订单创建人不一样，表示代付单
+                    PayRefundResponse resp = paymentHandle.agentPayRefund(orderBean);
+                    state = resp.getPayRefundStatus().getCode();
+                } else {
+                    //调用支付退款
+                    PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+                    //抖音支付退款必传
+                    orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
+                    response = payServiceImpl.orderRefund(orderPayRefundRequest);
+                    if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
+                        return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
+                    }
+                    //获取支付返回退款状态
+                    state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
                 }
-                //获取支付返回退款状态
-                state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
             }
         }
 

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

@@ -111,8 +111,7 @@ public class PayServiceImpl {
     private AssortmentOpenPlatformIappWxappStoreManager assortmentOpenPlatformIappWxappStoreManager;
     @Autowired
     private AssortmentOpenPlatformPartnerPaymentConfigManager openPlatformPartnerPaymentConfigManager;
-    @Autowired
-    private AssortmentOpenPlatformPartnerMerchantManager openPlatformPartnerMerchantManager;
+
 
 
     @Autowired

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

@@ -12,7 +12,7 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.activity.*;
 import org.springframework.cloud.openfeign.FeignClient;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
 import cn.freemud.entities.dto.BatchQueryActivityInfoResponseDto;

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

@@ -13,7 +13,7 @@
 
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.pay.CombPayResponse;
 import cn.freemud.entities.dto.pay.MultiPayResponse;

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

@@ -12,7 +12,7 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.coupon.CouponAvailableReqVo;
 import cn.freemud.entities.coupon.CouponAvailableRespDto;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.CouponCodeResponseDto;
 import cn.freemud.entities.dto.CouponCodeVerificationDto;

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

@@ -3,7 +3,7 @@ package cn.freemud.service.thirdparty;
 
 //import cn.freemud.constant.IgnoreFeignLogAnnotation;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
 import cn.freemud.entities.dto.GetCouponDetailResponseDto;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.GetUserScoreUserDetailDto;
 import cn.freemud.entities.dto.PurchasePaidRequestDto;

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

@@ -13,7 +13,7 @@
 
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.entities.dto.GetMemberExtendInfoRequestDto;
 import cn.freemud.entities.dto.GetMemberExtendInfoResponseDto;
 import cn.freemud.entities.dto.GetMemberInfoByIdRequestDto;

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

@@ -13,7 +13,7 @@
 
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
 import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
 import cn.freemud.entities.dto.user.*;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.entities.dto.user.*;
-import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.membercenter.request.ReturnScoreRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.MCCafeDeliveryBaseResponse;
 import cn.freemud.entities.dto.delivery.*;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.delivery.GetFilterPartnerResponse;
 import cn.freemud.entities.dto.ecology.*;
@@ -12,7 +12,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * 生态服务

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.entities.dto.GetStoreCloudPrintDto;
-import cn.freemud.entities.dto.GetStoreCloudPrintResponseDto;
 import cn.freemud.entities.dto.OrderPrintDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.entities.dto.order.McCafePushOrderDto;
 import cn.freemud.entities.dto.McCafePushOrderResponseDto;
 import feign.Headers;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.entities.dto.delivery.GetFilterPartnerResponse;
-import cn.freemud.entities.dto.openplatform.OrderGetPartnerRequest;
 import cn.freemud.entities.dto.openplatform.QueryInvoiceConfigRequest;
 import cn.freemud.entities.dto.order.OrderInvoiceResponse;
-import cn.freemud.entities.vo.SendOrderCountsMsg;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;

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

 package cn.freemud.service.thirdparty;
 
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.entities.dto.QueryInvoiceRepDto;
 import cn.freemud.entities.vo.QueryInvoiceReq;
 import org.springframework.cloud.openfeign.FeignClient;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.QueryInvoiceRepDto;
 import cn.freemud.entities.dto.QueryRefundFailuresListDto;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.order.FacePayRequestDto;
 import cn.freemud.entities.dto.order.UnifiedPayResponseDto;

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

 package cn.freemud.service.thirdparty;
 
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.product.pointsmall.IntegralProductType;
 import cn.freemud.entities.dto.product.pointsmall.PointMallListProductInfoRequest;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.pos.PosBaseRequestDto;
 import org.springframework.cloud.openfeign.FeignClient;

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

@@ -12,10 +12,9 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.*;
-import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -12,7 +12,7 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.ActivityQueryRequestDto;

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

@@ -12,7 +12,7 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.shoppingCart.GetShoppingCartGoodsApportionDto;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.openplatform.PushOrderStoreDto;
 import org.springframework.cloud.openfeign.FeignClient;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.entities.dto.store.GetEstimateDeliveryRequest;
 import cn.freemud.entities.dto.store.StoreCBaseResponse;
 import cn.freemud.entities.dto.store.StoreCBaseResponseDto;

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

@@ -12,7 +12,7 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.store.*;
 import org.springframework.cloud.openfeign.FeignClient;

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

@@ -12,7 +12,7 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.ShopBaseResponseDto;
 import cn.freemud.entities.dto.*;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.pay.svc.SVCCardAmountRequestDto;
 import cn.freemud.entities.dto.pay.svc.SVCCardAmountResponseDto;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.entities.dto.SvcComPayRequestDto;
 import cn.freemud.entities.dto.SvcComPayResponseDto;
 import org.springframework.cloud.openfeign.FeignClient;

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
 import cn.freemud.entities.EdenResponse;
 import cn.freemud.entities.dto.pay.svc.ConsumeHistoryCreateRequest;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -12,11 +12,8 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.annotations.LogIgnoreFeign;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.constant.ResponseCodeKeyConstant;
-import cn.freemud.entities.dto.GetWxQrcodeDto;
-import cn.freemud.entities.dto.WeChatGetAccessTokenResponseDto;
-import cn.freemud.entities.dto.WechatSendMessageDto;
 import com.freemud.sdk.api.assortment.order.request.order.GroupBuyRequest;
 import com.freemud.sdk.api.assortment.order.response.order.GroupBuyResponse;
 import org.springframework.cloud.openfeign.FeignClient;

order-management/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.31-RELEASE</version>
+            <version>5.5.42-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/annotations/LogIgnoreFeign.java

-package cn.freemud.management.annotations;
-
-import java.lang.annotation.*;
-
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.METHOD})
-@Documented
-@Inherited
-public @interface LogIgnoreFeign {
-
-    /**
-     * 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
-     * @return
-     */
-    boolean printLog() default false;
-
-    String logMessage() default "";  // 输出方法名称，用以识别：Apollo临时开关temp-print-body-log-methods
-
-    /**
-     * printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
-     *
-     * @return
-     */
-    String[] excludeStatusCodes() default "100";
-
-    String statusCodeFieldName() default "code";
-
-    String messageFieldName() default "message";
-
-}
-

order-management/src/main/java/cn/freemud/management/handler/AssisantApplicationHandler.java

+package cn.freemud.management.handler;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.thirdparty.FMAssistantApplicationClient;
+import cn.freemud.management.thirdparty.request.OrderSellCouponRefundRequest;
+import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/4/21 10:55
+ * @description : 小助手额外 业务逻辑操作
+ */
+@Component
+public class AssisantApplicationHandler {
+
+    // 搞个线程池, 不影响主体业务
+
+    @Autowired
+    private FMAssistantApplicationClient fmAssistantApplicationClient;
+
+    @Autowired
+    private LogUtil logUtil;
+
+    /**
+     * 抖音直播卖券的订单核销 退单操作
+     *
+     * @param orderCode     订单号  必须满足下列条件  才能调用接口
+     * @param bizType       com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum#ORDINARY
+     * @param orderClient   com.freemud.application.sdk.api.ordercenter.enums.OrderClientType#ASSISTANT
+     * @param marketingType com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum#TIKTOK_MARKET_ORDER
+     */
+    public void assisantThirdPartyOrderRefundHandler(String orderCode, Integer bizType, String orderClient, Byte marketingType) {
+        boolean isSend = Objects.equals(bizType, BizTypeEnum.ORDINARY.getBizType()) &&
+                Objects.equals(orderClient, OrderClientType.ASSISTANT.getIndex()) &&
+                Objects.equals(marketingType, MarketTypeEnum.TIKTOK_MARKET_ORDER.getIndex());
+        if (isSend) {
+            OrderSellCouponRefundRequest req = new OrderSellCouponRefundRequest();
+            req.setOrderCode(orderCode);
+            try {
+                fmAssistantApplicationClient.orderRefund(req);
+            } catch (Exception e) {
+                logUtil.error("", "通知小助手取消抖音核销券订单失败", e, JSON.toJSONString(req));
+            }
+        }
+    }
+}

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -122,11 +122,10 @@ public class PaymentHandle {
     /**
      * 代付订单退款
      *
-     * @param request
      * @param orderBean
      * @return
      */
-    public PayRefundResponse agentPayRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
+    public PayRefundResponse agentPayRefund(OrderBeanV1 orderBean) {
         PayRefundResponse ret = new PayRefundResponse();
         try {
             OrderExtInfoDto ext = JSON.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -7,6 +7,7 @@ import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.OperateType;
+import cn.freemud.management.handler.AssisantApplicationHandler;
 import cn.freemud.management.enums.*;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderBaseService;
@@ -78,6 +79,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     private OrderSdkService orderSdkService;
     @Autowired
     private EmailAlertService emailAlertService;
+    @Autowired
+    private AssisantApplicationHandler assisantApplicationHandler;
     private static final int SUCCESS = 100;
 
     /**
@@ -247,7 +250,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
                 OrderExtendedReq ext = orderBean.getOrderExtended();
                 if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
                     //代付人信息不为空  并且和订单创建人不一样，表示代付单
-                    refundResponse = paymentHandle.agentPayRefund(request, orderBean);
+                    refundResponse = paymentHandle.agentPayRefund(orderBean);
                 } else {
                     //正常订单现金退款
                     refundResponse = paymentHandle.refund(request, orderBean);

order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java

 package cn.freemud.management.thirdparty;
 
-import cn.freemud.management.annotations.LogIgnoreFeign;
 import cn.freemud.management.constant.ResponseCodeConstant;
 import cn.freemud.management.constant.ResponseCodeKeyConstant;
 import cn.freemud.management.entities.dto.request.order.MCCafeCouponLockRequest;
@@ -9,6 +8,7 @@ import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryRespon
 import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
 import com.freemud.application.sdk.api.couponcenter.offline.response.CouponQueryResponse;
 import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,36 +20,36 @@ public interface CouponOfflineMCCafeClient {
     @PostMapping("/mccafe/redeem")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
             statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
-            printLog = true)
+            printInfoLog = true)
     CouponRedeemResponse redeem(MCCafeCouponRequest mcCafeCouponRequest);
 
     @PostMapping("/mccafe/cancelRedeem")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
             statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
-            printLog = true)
+            printInfoLog = true)
     CouponRedeemResponse cancelRedeem(MCCafeCouponRequest mcCafeCouponRequest);
 
     @PostMapping("/mccafe/query")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
             statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
-            printLog = true)
+            printInfoLog = true)
     CouponQueryResponse query(MCCafeCouponRequest mcCafeCouponRequest);
 
     @PostMapping("/mccafe/batchQuery")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
             statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
-            printLog = true)
+            printInfoLog = true)
     McdNetBatchQueryResponse batchQuery(MCCafeCouponRequest mcCafeCouponRequest);
 
     @PostMapping("/mccafe/lock")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
             statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
-            printLog = true)
+            printInfoLog = true)
     CouponBaseResponse lock(MCCafeCouponLockRequest MCCafeCouponLockRequest);
 
     @PostMapping("/mccafe/unlock")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
             statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
-            printLog = true)
+            printInfoLog = true)
     CouponBaseResponse unlock(MCCafeCouponLockRequest MCCafeCouponLockRequest);
 }

order-management/src/main/java/cn/freemud/management/thirdparty/CustomerMcCafeClient.java

@@ -14,9 +14,9 @@
 package cn.freemud.management.thirdparty;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.management.annotations.LogIgnoreFeign;
 import cn.freemud.management.constant.ResponseCodeConstant;
 import cn.freemud.management.entities.dto.request.customer.ForbiddenCardCodeRequest;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,6 +27,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public interface CustomerMcCafeClient {
 
     @PostMapping(value = "/customerextendservice/qujia/forbiddenCardCode")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, printLog = true)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, printInfoLog = true)
     BaseResponse forbiddenCardCodeForQujia(@RequestBody ForbiddenCardCodeRequest request);
 }

order-management/src/main/java/cn/freemud/management/thirdparty/DeliveryMCCafeClient.java

 package cn.freemud.management.thirdparty;
 
-import cn.freemud.management.annotations.LogIgnoreFeign;
 import cn.freemud.management.constant.ResponseCodeConstant;
 import cn.freemud.management.constant.ResponseCodeKeyConstant;
 import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssemblyackRequest;
 import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderHaltedRequest;
 import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +16,7 @@ public interface DeliveryMCCafeClient {
 
     // 配送停单
     @PostMapping("/delivery/halted")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printInfoLog = true)
     DeliveryResponseDto halted(DeliveryOrderHaltedRequest deliveryOrderHaltedRequest);
 
     /**
@@ -24,6 +24,6 @@ public interface DeliveryMCCafeClient {
      * 入机成功通知配送
      */
     @PostMapping("/delivery/assemblyack")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printInfoLog = true)
     DeliveryResponseDto assemblyAck(DeliveryOrderAssemblyackRequest request);
 }

order-management/src/main/java/cn/freemud/management/thirdparty/FMAssistantApplicationClient.java

+package cn.freemud.management.thirdparty;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.constant.ResponseCodeConstant;
+import cn.freemud.management.constant.ResponseCodeKeyConstant;
+import cn.freemud.management.thirdparty.request.OrderSellCouponRefundRequest;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@FeignClient(name = "ASSISTANT-SERVICE", url = "${saas.assistantserviceclient.feign.url}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface FMAssistantApplicationClient {
+
+
+    /**
+     * 、
+     * 非码侧拒绝接单|取消订单  抖音核销券业务取消订单操作
+     */
+    @PostMapping("/assistant/thirdparty/order/refund")
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printInfoLog = true)
+    BaseResponse orderRefund(@RequestBody OrderSellCouponRefundRequest request);
+}

order-management/src/main/java/cn/freemud/management/thirdparty/MulitiPaymentClient.java

@@ -13,7 +13,6 @@
 package cn.freemud.management.thirdparty;
 
 
-import cn.freemud.management.annotations.LogIgnoreFeign;
 import cn.freemud.management.constant.ResponseCodeConstant;
 import cn.freemud.management.constant.ResponseCodeKeyConstant;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
@@ -22,6 +21,7 @@ import cn.freemud.management.entities.dto.request.pay.AgentPayRefundReq;
 import cn.freemud.management.entities.dto.response.pay.AgentPayQueryResp;
 import cn.freemud.management.entities.dto.response.pay.AgentPayRefundResp;
 import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -37,14 +37,14 @@ public interface MulitiPaymentClient {
      * 混合支付退款接口
      */
     @PostMapping("/payment/application/refund")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printInfoLog = true)
     MultiOrderRefundResponse paymentApplicationRefund(MultiOrderRefundRequest multiOrderRefundRequest, @RequestHeader("partnerId") String partnerId);
 
     /**
      * 批量支付退款
      */
     @PostMapping("/payment/application/batch/refund")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printInfoLog = true)
     PayBatchRefundResponse batchRefund(BatchOrderRefundV2Request batchOrderRefundV2Request);
 
 
@@ -52,13 +52,13 @@ public interface MulitiPaymentClient {
      * 代付退款
      */
     @PostMapping("/payment/application/agentRefund")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printInfoLog = true)
     AgentPayRefundResp agentPayRefund(AgentPayRefundReq req);
 
     /**
      * 代付查询
      */
     @PostMapping("/payment/application/agentQuery")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printInfoLog = true)
     AgentPayQueryResp agentPayQuery(AgentPayQueryReq req);
 }

order-management/src/main/java/cn/freemud/management/thirdparty/OMSActivityClient.java

@@ -13,11 +13,11 @@
 package cn.freemud.management.thirdparty;
 
 
-import cn.freemud.management.annotations.LogIgnoreFeign;
 import cn.freemud.management.constant.ResponseCodeConstant;
 import cn.freemud.management.constant.ResponseCodeKeyConstant;
 import cn.freemud.management.entities.dto.request.activity.GroupWorkRefundRequest;
 import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,7 +36,7 @@ public interface OMSActivityClient {
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
             statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
             messageFieldName = ResponseCodeKeyConstant.MSG,
-            printLog = true)
+            printInfoLog = true)
     GroupWorkRefundResponse groupWorkRefund(GroupWorkRefundRequest groupWorkRefundRequest);
 
 }

order-management/src/main/java/cn/freemud/management/thirdparty/OMSPaymentClient.java

 package cn.freemud.management.thirdparty;
 
-import cn.freemud.management.annotations.LogIgnoreFeign;
 import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import cn.freemud.management.entities.dto.request.pay.PaymentQueryOrderRequestDto;
 import cn.freemud.management.entities.dto.response.pay.PayRefundData;
 import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
 import com.freemud.application.sdk.api.base.BaseResponse;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

order-management/src/main/java/cn/freemud/management/thirdparty/request/OrderSellCouponRefundRequest.java

+package cn.freemud.management.thirdparty.request;
+
+import lombok.Data;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/4/21 11:35
+ * @description : 抖音核销订单 需要退款核销请求
+ */
+@Data
+public class OrderSellCouponRefundRequest {
+    /**
+     * 非码订单号
+     */
+    private String orderCode;
+
+}

order-application-service/src/main/java/cn/freemud/annotations/LogIgnoreFeign.java → ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/annotation/LogIgnoreFeign.java

-package cn.freemud.annotations;
+package com.freemud.application.sdk.api.ordercenter.annotation;
 
 import java.lang.annotation.*;
 

shopping-cart-application-service/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.15.RESEALE</version>
+            <version>5.5.42-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>