一元捐插件参数

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

@@ -3397,6 +3397,7 @@ public class OrderAdapter {
             orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());
             createOrderResponseVo.setOrderInfo(orderInfo);
         }
+        createOrderResponseVo.setOutTradeNo(orderPayResponse.getEndTransId());
 
         return createOrderResponseVo;
     }

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -22,6 +22,7 @@ import cn.freemud.entities.vo.encircle.EncircleReserveBaseVo;
 import cn.freemud.entities.vo.order.CreateCashierOrderVo;
 import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
 import cn.freemud.entities.vo.order.OrderAppealVo;
+import cn.freemud.entities.vo.order.PaymentConfigVo;
 import cn.freemud.handler.OrderReportJobHandler;
 import cn.freemud.monitorcenter.tools.HealthUtil;
 import cn.freemud.service.*;
@@ -481,5 +482,17 @@ public class OrderController {
         return orderservice.createAndGetOrderInvoice(request);
     }
 
+
+    /**
+     * 一元捐插件获取支付配置
+     * @param createOrderVo
+     * @return
+     */
+    @ApiAnnotation(logMessage = "paymentConfig")
+    @PostMapping("/paymentConfig")
+    public BaseResponse paymentConfig(@Validated @LogParams @RequestBody PaymentConfigVo createOrderVo) {
+        return orderAdapterService.getPaymentConfig(createOrderVo);
+    }
+
 }
 

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

@@ -72,6 +72,4 @@ public class CreatePrepayRequestDto {
 
     private String sessionId;
 
-    //一元捐插件开通传 1=1元捐 2=……
-    private Integer plugIn;
 }

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java

@@ -69,6 +69,7 @@ public class CreateOrderResponseVo {
      */
     private OrderInfo orderInfo;
 
-    private PlugInParameter plugInParameter;
+    //一元捐插件新增
+    private String outTradeNo;
 
 }

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -497,6 +497,4 @@ public class CreateOrderVo {
      */
     private String contactsName;
 
-    //一元捐插件开通传 1=1元捐 2=……
-    private Integer plugIn;
 }

order-application-service/src/main/java/cn/freemud/entities/vo/order/PaymentConfigVo.java

+package cn.freemud.entities.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+public class PaymentConfigVo {
+
+    @ApiModelProperty("会话Id")
+    @NotEmpty(message = "会话Id不能为空")
+    private String sessionId;
+
+    @ApiModelProperty("商户号")
+    @NotEmpty(message = "商户号不能为空")
+    private String partnerId;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/order/PlugInParameter.java

@@ -9,6 +9,4 @@ public class PlugInParameter {
 
     private String subMchCode;
 
-    private String outTradeNo;
-
 }

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

@@ -7,6 +7,8 @@ import cn.freemud.constant.RedisLockKey;
 import cn.freemud.entities.dto.ConfirmOrderDto;
 import cn.freemud.entities.dto.order.CreateCashierOrderDto;
 import cn.freemud.entities.vo.*;
+import cn.freemud.entities.vo.order.PaymentConfigVo;
+import cn.freemud.entities.vo.order.PlugInParameter;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.service.handle.SaasOrderHandle;
@@ -94,7 +96,7 @@ public class OrderAdapterServiceImpl {
     @Autowired
     private MCCafeOrderService mcCafeOrderService;
 
-    private UniversalOrderService universalOrderService;
+//    private UniversalOrderService universalOrderService;
     @Autowired
     private CreateOrderServiceFactory createOrderServiceFactory;
     @Autowired
@@ -129,6 +131,8 @@ public class OrderAdapterServiceImpl {
     private ApolloVariableConfig apolloVariable;
     @Autowired
     private CashierOrderService cashierOrderService;
+    @Autowired
+    private PayServiceImpl payService;
 
     //获取下单实现对象
     private OrderFactoryService getCreateOrderBean(AssortmentCustomerInfoVo assortmentCustomerInfoVo,CreateOrderVo createOrderVo){
@@ -364,4 +368,16 @@ public class OrderAdapterServiceImpl {
         return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
     }
 
+
+
+    public BaseResponse<PlugInParameter> getPaymentConfig(PaymentConfigVo createOrderVo){
+        AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(createOrderVo.getSessionId());
+        if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
+            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
+        }
+        //1元插件要返回参数
+        return ResponseUtil.success(payService.getPaymentAuth(createOrderVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId()));
+
+    }
+
 }

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

@@ -332,7 +332,6 @@ public class OrderServiceImpl implements Orderservice {
         CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto) createOrderOperateDtoResponse.getResult();
         //创建支付
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(userLoginInfoDto, createOrderVo, createOrderOperateDto, extInfo);
-        createPrepayRequestDto.setPlugIn(createOrderVo.getPlugIn());
         return ResponseUtil.success(payServiceImpl.createPrepayOrder(createPrepayRequestDto));
     }
 

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

@@ -192,10 +192,6 @@ public class PayServiceImpl {
             throw new ServiceException(baseResponse.getCode(), baseResponse.getMessage());
         }
         createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean());
-        //1元插件要返回参数
-        if(createPrepayRequestDto.getPlugIn() != null && createPrepayRequestDto.getPlugIn() == 1 && StringUtils.isNotEmpty(orderPayResponse.getEndTransId())){
-            createOrderResponse.setPlugInParameter(getPaymentAuth(createPrepayRequestDto.getPartnerId(),createPrepayRequestDto.getWxAppId(),orderPayResponse.getEndTransId()));
-        }
         //更新订单支付信息
         BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
         if (baseEditResponse != null) {
@@ -1273,13 +1269,12 @@ public class PayServiceImpl {
     }
 
     //1元捐插件需要参数
-    private PlugInParameter getPaymentAuth(String partnerId,String appId,String outTradeNo) {
+    public PlugInParameter getPaymentAuth(String partnerId,String appId) {
         PlugInParameter plugInParameter = new PlugInParameter();
         List<AssortmentOpenPlatformPartnerPaymentConfig> openPlatformPartnerPaymentAuths = openPlatformPartnerPaymentConfigManager.queryPartnerPaymentConfigs(partnerId,appId);
         if(CollectionUtils.isNotEmpty(openPlatformPartnerPaymentAuths)){
-            plugInParameter.setMchCode(openPlatformPartnerPaymentAuths.get(0).getSubMchid());
-            plugInParameter.setSubMchCode(openPlatformPartnerPaymentAuths.get(0).getUnitMchId());
-            plugInParameter.setOutTradeNo(outTradeNo);
+            plugInParameter.setMchCode(openPlatformPartnerPaymentAuths.get(0).getUnitMchId());
+            plugInParameter.setSubMchCode(openPlatformPartnerPaymentAuths.get(0).getSubMchid());
         }
         return plugInParameter;
     }