Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into develop

order-application-service/src/main/java/cn/freemud/fuyou/service/FuYouOrderService.java

@@ -199,7 +199,7 @@ public class FuYouOrderService {
             return baseResponse;
         }
         //3 .退优惠券
-       return rectification(order, "富有商家退款");
+       return rectification(order, "商家退款");
 
     }
 

order-application-service/src/main/java/cn/freemud/fuyou/service/processor/AliPayEventProcessor.java

@@ -115,8 +115,7 @@ private final PaymentNewService paymentNewService;
         com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo());
         log.info("aliPay.paymentFeignClient.codePay,request:{},response:{}", JSON.toJSONString(codePayRequest),JSON.toJSONString(codePayResponseBaseResponse));
         if(ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getCode()) ||
-                ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getCode()) ||
-                ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getData().getResultCode())
+                ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),String.valueOf(codePayResponseBaseResponse.getData().getCode()))
         ){
             baseResponse.setCode(codePayResponseBaseResponse.getCode());
             baseResponse.setMessage(codePayResponseBaseResponse.getMessage());
@@ -128,6 +127,9 @@ private final PaymentNewService paymentNewService;
 
 
 
+
+
+
     @Override
     OrderSettlementReq getOrderSettlement(DiscountRequest request) {
         OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();

order-application-service/src/main/java/cn/freemud/fuyou/service/processor/CouponEventProcessor.java

@@ -100,7 +100,7 @@ public class CouponEventProcessor extends AbstractProcessor {
     @Override
     OrderSettlementReq getOrderSettlement(DiscountRequest request) {
         OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
-        return buildOrderSettlement("富有优惠券", OrderSettlementType.COUPON, false, orderInfoReqs, request);
+        return buildOrderSettlement("优惠券", OrderSettlementType.COUPON, false, orderInfoReqs, request);
     }
 
     @Override