Browse Source

Merge branch 'release_real_202008' of https://git.malls.iformall.com/server/formallProject into release_real_202008

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
f6140720d3
3 changed files with 8 additions and 2 deletions
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java
  2. +5
    -1
      mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml
  3. +2
    -1
      mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java View File

@@ -192,6 +192,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
if(wxPayAccountBill == null){ if(wxPayAccountBill == null){
wxPayAccountBill = new WxPayAccountBill(); wxPayAccountBill = new WxPayAccountBill();
wxPayAccountBill.setTenantId(wxPayAccount.getTenantId()); wxPayAccountBill.setTenantId(wxPayAccount.getTenantId());
wxPayAccountBill.setServiceChargeRate(0);
} }
wxPayAccountBill.setMchId(wxPayAccount.getMchId()); wxPayAccountBill.setMchId(wxPayAccount.getMchId());
wxPayAccountBill.setSubMchId(wxPayAccount.getSubMchId()); wxPayAccountBill.setSubMchId(wxPayAccount.getSubMchId());


+ 5
- 1
mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml View File

@@ -17,6 +17,7 @@
<result column="pay_id" jdbcType="BIGINT" property="payId"/> <result column="pay_id" jdbcType="BIGINT" property="payId"/>
<result column="type" jdbcType="INTEGER" property="type"/> <result column="type" jdbcType="INTEGER" property="type"/>
<result column="pay_bill_id" jdbcType="BIGINT" property="payBillId"/> <result column="pay_bill_id" jdbcType="BIGINT" property="payBillId"/>
<result column="plat" jdbcType="INTEGER" property="plat"/>
<!-- <result column="group_support" jdbcType="INTEGER" property="groupSupport"/>--> <!-- <result column="group_support" jdbcType="INTEGER" property="groupSupport"/>-->


</resultMap> </resultMap>
@@ -24,7 +25,7 @@
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`app_id`,`parent_app_id`,`name`, `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`,
`secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`, `secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`,
`pay_id`,`type`,`pay_bill_id`
`pay_id`,`type`,`pay_bill_id`,`plat`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -86,6 +87,9 @@
<if test=" null != payBillId "> <if test=" null != payBillId ">
and `pay_bill_id` = #{payBillId} and `pay_bill_id` = #{payBillId}
</if> </if>
<if test=" null != plat ">
and `plat` = #{plat}
</if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


+ 2
- 1
mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml View File

@@ -20,7 +20,8 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`,`real_rate`
`id`,`tenant_id`,`parent_tenant_id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,
`type`,`share`,`rate`,`real_rate`,`service_charge_rate`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Loading…
Cancel
Save