修改商户支付配置商户编号为appid

src/main/java/com/emato/cuspay/biz/wx/AbstractCusDeclareBiz.java

@@ -32,7 +32,7 @@ public abstract class AbstractCusDeclareBiz implements CuspayBiz {
         List<MerchPayCfg> list = this.paymentService.loadMerchPayCfg();
         if (list != null && !list.isEmpty()) {
             list.forEach(cfg ->{
-                payCaches.put(cfg.getMerchSn(), cfg);
+                payCaches.put(cfg.getAppid(), cfg);
             });
         }
     }

src/main/java/com/emato/cuspay/biz/wx/WxCusDeclareBiz.java

@@ -123,7 +123,7 @@ public class WxCusDeclareBiz extends AbstractCusDeclareBiz implements CuspayBiz
         wxCbPayDocList.forEach(wxCbPayDoc -> {
 
             //获取商户信息 从缓存中去  缓存不存在 从数据库重取
-            MerchPayCfg merchPayCfg = getMerchPayCfgCache(wxCbPayDoc.getMerchSn());
+            MerchPayCfg merchPayCfg = getMerchPayCfgCache(wxCbPayDoc.getAppid());
 
             MerchNotiBuilder builder = new MerchNotiBuilder();
 
@@ -134,17 +134,17 @@ public class WxCusDeclareBiz extends AbstractCusDeclareBiz implements CuspayBiz
 
             if (merchPayCfg == null) {
                 wxCbPayDoc.setReturnCode("FAIL");
-                wxCbPayDoc.setReturnMsg("商户编号为【"+wxCbPayDoc.getMerchSn()+"】的商户支付配置信息不存在");
+                wxCbPayDoc.setReturnMsg("appid为【"+wxCbPayDoc.getAppid()+"】的商户支付配置信息不存在");
                 wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
-                logger.error("商户编号为【"+wxCbPayDoc.getMerchSn()+"】的商户支付配置信息不存在");
+                logger.error("appid为【"+wxCbPayDoc.getAppid()+"】的商户支付配置信息不存在");
                 return;
             }
 
             if (merchPayCfg.getMerchWxApiKey() == null) {
                 wxCbPayDoc.setReturnCode(WxContants.ERROR_NO_INFOMATION);
-                wxCbPayDoc.setReturnMsg("商户编号为【"+wxCbPayDoc.getMerchSn()+"】的商户支付信息api密钥为空");
+                wxCbPayDoc.setReturnMsg("appid为【"+wxCbPayDoc.getAppid()+"】的商户支付信息api密钥为空");
                 wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
-                logger.error("商户编号为【"+wxCbPayDoc.getMerchSn()+"】的商户支付信息api密钥为空");
+                logger.error("appid为【"+wxCbPayDoc.getAppid()+"】的商户支付信息api密钥为空");
                 return;
             }
             //设置商户配置信息

src/main/java/com/emato/cuspay/biz/wx/WxCusDeclareQueryBiz.java

@@ -98,7 +98,7 @@ public class WxCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cuspa
         wxCbPayDocs.forEach(wxCbPayDoc -> {
             WxQuerySuccessResponseMsgDto querySuccessResponseDto = new WxQuerySuccessResponseMsgDto();
             //获取商户信息 从缓存中去  缓存不存在 从数据库重取
-            MerchPayCfg merchPayCfg = getMerchPayCfgCache(wxCbPayDoc.getMerchSn());
+            MerchPayCfg merchPayCfg = getMerchPayCfgCache(wxCbPayDoc.getAppid());
 
             MerchNotiBuilder builder = new MerchNotiBuilder();
 
@@ -109,17 +109,17 @@ public class WxCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cuspa
 
             if (merchPayCfg == null) {
                 wxCbPayDoc.setReturnCode("FAIL");
-                wxCbPayDoc.setReturnMsg("商户编号为【"+wxCbPayDoc.getMerchSn()+"】的商户支付配置信息不存在");
+                wxCbPayDoc.setReturnMsg("appid为【"+wxCbPayDoc.getAppid()+"】的商户支付配置信息不存在");
                 wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
-                logger.error("商户编号为【"+wxCbPayDoc.getMerchSn()+"】的商户支付配置信息不存在 ");
+                logger.error("appid为【"+wxCbPayDoc.getAppid()+"】的商户支付配置信息不存在 ");
                 return;
             }
 
             if (merchPayCfg.getMerchWxApiKey() == null) {
                 wxCbPayDoc.setReturnCode(WxContants.ERROR_NO_INFOMATION);
-                wxCbPayDoc.setReturnMsg("商户编号为【"+wxCbPayDoc.getMerchSn()+"】的商户支付信息api密钥为空");
+                wxCbPayDoc.setReturnMsg("appid为【"+wxCbPayDoc.getAppid()+"】的商户支付信息api密钥为空");
                 wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
-                logger.error("商户编号为【"+wxCbPayDoc.getMerchSn()+"】的商户支付信息api密钥为空 ");
+                logger.error("appid为【"+wxCbPayDoc.getAppid()+"】的商户支付信息api密钥为空 ");
                 return;
             }
             //设置商户配置信息

src/main/java/com/emato/cuspay/entity/merch/MerchPayCfg.java

@@ -6,7 +6,7 @@ import java.util.Date;
 public class MerchPayCfg implements Serializable {
     private String payCfgSn;
 
-    private String merchSn;
+    private String appid;
 
     private String merchWxApiKey;
 
@@ -42,12 +42,12 @@ public class MerchPayCfg implements Serializable {
         this.payCfgSn = payCfgSn == null ? null : payCfgSn.trim();
     }
 
-    public String getMerchSn() {
-        return merchSn;
+    public String getAppid() {
+        return appid;
     }
 
-    public void setMerchSn(String merchSn) {
-        this.merchSn = merchSn == null ? null : merchSn.trim();
+    public void setAppid(String appid) {
+        this.appid = appid == null ? null : appid.trim();
     }
 
     public String getMerchWxApiKey() {

src/main/java/com/emato/cuspay/service/impl/MerchPaymentServiceImpl.java

@@ -36,10 +36,10 @@ public class MerchPaymentServiceImpl implements MerchPaymentService {
 
         try {
             MerchPayCfg payCfg = new MerchPayCfg();
-            payCfg.setMerchSn(merchPayCfg.getMerchSn());
+            payCfg.setAppid(merchPayCfg.getAppid());
             payCfg.setPayChnlFlag(merchPayCfg.getPayChnlFlag());
             if(merchPayCfgMapper.getMerchPayCfgByMerchsnAndChnlFlag(payCfg) != null){
-                return  new ResponseMessage.Builder().setCode(ResponseStatus.ERROR.getItem()).setMsg("商户编号为"+merchPayCfg.getMerchSn()+"的支付配置信息已存在")
+                return  new ResponseMessage.Builder().setCode(ResponseStatus.ERROR.getItem()).setMsg("appid为"+merchPayCfg.getAppid()+"的支付配置信息已存在")
                         .build();
             }
         } catch (Exception e) {

src/main/java/com/emato/cuspay/web/controller/merch/MerchPaymentController.java

@@ -39,7 +39,7 @@ public class MerchPaymentController {
         Map<String, Object> validate = MapBeanUtils.fromObject(merchPayCfg);
         Map<String, Object> beVerified = Maps.newHashMap();
 
-        beVerified.put("merchSn", "商户编号");
+        beVerified.put("appid", "appid");
         beVerified.put("merchWxApiKey","api密钥");
         beVerified.put("notifyUrl","商户通知回调接口");
         beVerified.put("payChnlFlag", "支付通道标识（weixin:微信,alipay:蚂蚁金服）");

src/main/java/com/emato/cuspay/wx/service/impl/WxCbPayDocServiceImpl.java

@@ -44,11 +44,11 @@ public class WxCbPayDocServiceImpl implements WxCbPayDocService {
         wxCbPayDoc.setWxPaySn(TablePrimaryKeyPrefix.wx_cb_pay_type + IdWorkerAide.nextId());
         //设置支付单状态 待审核
         wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_00.getItem());
-        String merchSn = wxCbPayDoc.getMerchSn();
+        String appid = wxCbPayDoc.getAppid();
         try {
-            List<MerchPayCfg> merchPayCfgList = merchPayCfgMapper.getMerchPayCfgByMerchsn(merchSn);
+            List<MerchPayCfg> merchPayCfgList = merchPayCfgMapper.getMerchPayCfgByMerchsn(appid);
             if(merchPayCfgList.size() == 0){
-                return  new ResponseMessage.Builder().setCode(ResponseStatus.ERROR.getItem()).setMsg("商户编号为"+merchSn+"的支付配置信息不存在")
+                return  new ResponseMessage.Builder().setCode(ResponseStatus.ERROR.getItem()).setMsg("appid为" + appid + "的支付配置信息不存在")
                         .build();
             }
         } catch (Exception e) {

src/main/resources/mybatis/mapper/MerchPayCfgMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.emato.cuspay.dao.mapper.merch.MerchPayCfgMapper" >
   <resultMap id="BaseResultMap" type="com.emato.cuspay.entity.merch.MerchPayCfg" >
     <id column="pay_cfg_sn" property="payCfgSn" jdbcType="VARCHAR" />
-    <result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
+    <result column="appid" property="appid" jdbcType="VARCHAR" />
     <result column="merch_wx_api_key" property="merchWxApiKey" jdbcType="VARCHAR" />
     <result column="notify_url" property="notifyUrl" jdbcType="VARCHAR" />
     <result column="pay_chnl_flag" property="payChnlFlag" jdbcType="VARCHAR" />
@@ -16,7 +16,7 @@
     <result column="tstm" property="tstm" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    pay_cfg_sn, merch_sn, merch_wx_api_key, notify_url, pay_chnl_flag, is_valid, remark, creater_sn, create_time, moder_sn,
+    pay_cfg_sn, appid, merch_wx_api_key, notify_url, pay_chnl_flag, is_valid, remark, creater_sn, create_time, moder_sn,
     mod_time, tstm
   </sql>
 
@@ -36,8 +36,8 @@
       <if test="payCfgSn != null" >
         pay_cfg_sn,
       </if>
-      <if test="merchSn != null" >
-        merch_sn,
+      <if test="appid != null" >
+        appid,
       </if>
       <if test="merchWxApiKey != null" >
         merch_wx_api_key,
@@ -74,8 +74,8 @@
       <if test="payCfgSn != null" >
         #{payCfgSn,jdbcType=VARCHAR},
       </if>
-      <if test="merchSn != null" >
-        #{merchSn,jdbcType=VARCHAR},
+      <if test="appid != null" >
+        #{appid,jdbcType=VARCHAR},
       </if>
       <if test="merchWxApiKey != null" >
         #{merchWxApiKey,jdbcType=VARCHAR},
@@ -112,8 +112,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.entity.merch.MerchPayCfg" >
     update merch_pay_cfg
     <set >
-      <if test="merchSn != null" >
-        merch_sn = #{merchSn,jdbcType=VARCHAR},
+      <if test="appid != null" >
+        appid = #{appid,jdbcType=VARCHAR},
       </if>
       <if test="merchWxApiKey != null" >
         merch_wx_api_key = #{merchWxApiKey,jdbcType=VARCHAR},
@@ -152,24 +152,24 @@
   <select id="selectByWxMercherSn" resultMap="BaseResultMap" parameterType="java.lang.String">
     SELECT
     <include refid="Base_Column_List" />
-    FROM merch_pay_cfg WHERE merch_sn = #{merchSn} AND pay_chnl_flag = "weixin"
+    FROM merch_pay_cfg WHERE appid = #{appid} AND pay_chnl_flag = "weixin"
   </select>
 
   <select id="selectMerchPayCfg" resultMap="BaseResultMap">
     SELECT 
-    <include refid="Base_Column_List"/>
+    *
     FROM merch_pay_cfg
   </select>
 
   <select id="getMerchPayCfgByMerchsnAndChnlFlag" resultMap="BaseResultMap" parameterType="com.emato.cuspay.entity.merch.MerchPayCfg">
     SELECT
     <include refid="Base_Column_List" />
-    FROM merch_pay_cfg WHERE merch_sn = #{merchSn} AND pay_chnl_flag = #{payChnlFlag}
+    FROM merch_pay_cfg WHERE appid = #{appid} AND pay_chnl_flag = #{payChnlFlag}
   </select>
 
   <select id="getMerchPayCfgByMerchsn" resultMap="BaseResultMap" parameterType="java.lang.String">
     SELECT
     <include refid="Base_Column_List" />
-    FROM merch_pay_cfg WHERE merch_sn = #{merchSn}
+    FROM merch_pay_cfg WHERE appid = #{appid}
   </select>
 </mapper>