获取参数修改

order-application-service/pom.xml

@@ -131,7 +131,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.27-RELEASE</version>
+            <version>5.5.31-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/entities/db/OpenPlatformPartnerPaymentAuth.java

-package cn.freemud.entities.db;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Date;
-
-@Data
-@Table(name = "open_platform_partner_payment_auth")
-public class OpenPlatformPartnerPaymentAuth {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    /**
-     * 服务商在微信公众平台申请 appid
-     */
-    @Column(name = "sp_appid")
-    private String appId;
-
-    /**
-     * 微信支付分配的服务商商户
-     */
-    @Column(name = "sp_mchid")
-    private String spMchid;
-
-    /**
-     * 微信机构商户号
-     */
-    @Column(name = "unit_mchid")
-    private String unitMchid;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "gmt_created")
-    private Date gmtCreated;
-
-    /**
-     * 修改时间
-     */
-    @Column(name = "gmt_modified")
-    private Date gmtModified;
-}
\ No newline at end of file

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

 package cn.freemud.manager;
 
-import cn.freemud.entities.db.OpenPlatformPartnerPaymentAuth;
 import cn.freemud.entities.db.OpenPlatformPaymentConfig;
-import cn.freemud.manager.dao.OpenPlatformPartnerPaymentAuthDao;
 import cn.freemud.manager.dao.OpenPlatformPaymentConfigDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * 支付配置表manager
  * @author zhenghuan.yang
@@ -20,9 +16,6 @@ public class OpenPlatformPaymentConfigManager {
     @Autowired
     private OpenPlatformPaymentConfigDao openPlatformPaymentConfigDao;
 
-    @Autowired
-    private OpenPlatformPartnerPaymentAuthDao openPlatformPartnerPaymentAuthDao;
-
     public OpenPlatformPaymentConfig selectPaymentConfigByWxAppId(String wxAppId) {
         OpenPlatformPaymentConfig config = new OpenPlatformPaymentConfig();
         config.setWxAppId(wxAppId);
@@ -32,10 +25,4 @@ public class OpenPlatformPaymentConfigManager {
         return openPlatformPaymentConfigDao.insert(config);
     }
 
-    public List<OpenPlatformPartnerPaymentAuth> selectPaymentAuthByAppId(String appId) {
-        OpenPlatformPartnerPaymentAuth pars = new OpenPlatformPartnerPaymentAuth();
-        pars.setAppId(appId);
-        return openPlatformPartnerPaymentAuthDao.select(pars);
-    }
-
 }

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

-package cn.freemud.manager.dao;
-
-import cn.freemud.comm.druid.MyMapper;
-import cn.freemud.entities.db.OpenPlatformPartnerPaymentAuth;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface OpenPlatformPartnerPaymentAuthDao extends MyMapper<OpenPlatformPartnerPaymentAuth> {
-}
\ No newline at end of file

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

@@ -5,7 +5,6 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
-import cn.freemud.entities.db.OpenPlatformPartnerPaymentAuth;
 import cn.freemud.entities.dto.SvcComPayRequestDto;
 import cn.freemud.entities.dto.SvcComPayResponseDto;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
@@ -25,7 +24,6 @@ import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
 import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
-import cn.freemud.manager.OpenPlatformPaymentConfigManager;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.thirdparty.ComPayClient;
 import cn.freemud.service.thirdparty.PaymentNewClient;
@@ -37,15 +35,9 @@ import cn.freemud.utils.ResponseUtil;
 import cn.freemud.utils.ValidationCode;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappStore;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartner;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerConfig;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
+import com.freemud.api.assortment.datamanager.entity.db.*;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
-import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIappWxappStoreManager;
-import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
-import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerManager;
-import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
+import com.freemud.api.assortment.datamanager.manager.*;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.constant.ResponseResultEnum;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -122,7 +114,7 @@ public class PayServiceImpl {
     @Autowired
     private AssortmentOpenPlatformIappWxappStoreManager assortmentOpenPlatformIappWxappStoreManager;
     @Autowired
-    private OpenPlatformPaymentConfigManager openPlatformPaymentConfigManager;
+    private AssortmentOpenPlatformPartnerPaymentConfigManager openPlatformPartnerPaymentConfigManager;
     @Autowired
     private OrderQueueService orderQueueService;
     @Autowired
@@ -202,7 +194,7 @@ public class PayServiceImpl {
         createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean());
         //1元插件要返回参数
         if(createPrepayRequestDto.getPlugIn() != null && createPrepayRequestDto.getPlugIn() == 1 && StringUtils.isNotEmpty(orderPayResponse.getEndTransId())){
-            createOrderResponse.setPlugInParameter(getPaymentAuth(createPrepayRequestDto.getWxAppId(),orderPayResponse.getEndTransId()));
+            createOrderResponse.setPlugInParameter(getPaymentAuth(createPrepayRequestDto.getPartnerId(),createPrepayRequestDto.getWxAppId(),orderPayResponse.getEndTransId()));
         }
         //更新订单支付信息
         BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
@@ -1281,12 +1273,12 @@ public class PayServiceImpl {
     }
 
     //1元捐插件需要参数
-    private PlugInParameter getPaymentAuth(String appId,String outTradeNo) {
+    private PlugInParameter getPaymentAuth(String partnerId,String appId,String outTradeNo) {
         PlugInParameter plugInParameter = new PlugInParameter();
-        List<OpenPlatformPartnerPaymentAuth> openPlatformPartnerPaymentAuths = openPlatformPaymentConfigManager.selectPaymentAuthByAppId(appId);
+        List<AssortmentOpenPlatformPartnerPaymentConfig> openPlatformPartnerPaymentAuths = openPlatformPartnerPaymentConfigManager.queryPartnerPaymentConfigs(partnerId,appId);
         if(CollectionUtils.isNotEmpty(openPlatformPartnerPaymentAuths)){
-            plugInParameter.setMchCode(openPlatformPartnerPaymentAuths.get(0).getSpMchid());
-            plugInParameter.setSubMchCode(openPlatformPartnerPaymentAuths.get(0).getUnitMchid());
+            plugInParameter.setMchCode(openPlatformPartnerPaymentAuths.get(0).getSubMchid());
+            plugInParameter.setSubMchCode(openPlatformPartnerPaymentAuths.get(0).getUnitMchId());
             plugInParameter.setOutTradeNo(outTradeNo);
         }
         return plugInParameter;

order-application-service/src/main/resources/mapper/OpenPlatformPartnerPaymentAuthDao.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.freemud.manager.dao.OpenPlatformPartnerPaymentAuthDao" >
-  <resultMap id="BaseResultMap" type="cn.freemud.entities.db.OpenPlatformPartnerPaymentAuth" >
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="sp_appid" jdbcType="VARCHAR" property="appId" />
-    <result column="sp_mchid" jdbcType="VARCHAR" property="spMchid" />
-    <result column="unit_mchid" jdbcType="VARCHAR" property="unitMchid" />
-    <result column="gmt_created" jdbcType="TIMESTAMP" property="gmtCreated" />
-    <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
-  </resultMap>
-
-</mapper>
\ No newline at end of file