Procházet zdrojové kódy

fix card

release_toaliyun_real
lin před 3 roky
rodič
revize
4564d359bd
2 změnil soubory, kde provedl 6 přidání a 3 odebrání
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java
  2. +6
    -2
      mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java Zobrazit soubor

@@ -147,7 +147,6 @@ public class WxCardPayController extends BaseController {
wxCardSpendVo = new WxCardSpendVo(); wxCardSpendVo = new WxCardSpendVo();
} }
wxCardSpendVo.updateTenantInfo(getTenantInfo()); wxCardSpendVo.updateTenantInfo(getTenantInfo());
wxCardSpendVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
final PageInfo<WxCardSpendMerchantVo> page = wxCardSpendService.listMerchantAsPage(wxCardSpendVo, pageNum, pageSize); final PageInfo<WxCardSpendMerchantVo> page = wxCardSpendService.listMerchantAsPage(wxCardSpendVo, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 6
- 2
mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml Zobrazit soubor

@@ -8,6 +8,7 @@
<result column="coupon_id" jdbcType="BIGINT" property="couponId" /> <result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" /> <result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
<result column="owner_user_id" jdbcType="BIGINT" property="ownerUserId" /> <result column="owner_user_id" jdbcType="BIGINT" property="ownerUserId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="coupon_password_id" jdbcType="BIGINT" property="couponPasswordId" /> <result column="coupon_password_id" jdbcType="BIGINT" property="couponPasswordId" />
<result column="coupon_password" jdbcType="VARCHAR" property="couponPassword" /> <result column="coupon_password" jdbcType="VARCHAR" property="couponPassword" />
<result column="transaction_id" jdbcType="VARCHAR" property="transactionId" /> <result column="transaction_id" jdbcType="VARCHAR" property="transactionId" />
@@ -25,8 +26,8 @@
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`c_user_id`,`owner_user_id`,`coupon_password_id`,`coupon_password`,`transaction_id`,
`amount`,`sale_amount`,`remaining_amount`,`service_fee_amount`,`share_fee_amount`,`remaining_share_fee_amount`,
`id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`c_user_id`,`owner_user_id`,`coupon_password_id`,`coupon_password`,`type`,
`transaction_id`,`amount`,`sale_amount`,`remaining_amount`,`service_fee_amount`,`share_fee_amount`,`remaining_share_fee_amount`,
`rate_amount`,`create_date`,`update_date`,`support_transfer`,`status` `rate_amount`,`create_date`,`update_date`,`support_transfer`,`status`
</sql> </sql>
@@ -47,6 +48,9 @@
<if test=" null != ownerUserId "> <if test=" null != ownerUserId ">
and `owner_user_id` = #{ownerUserId} and `owner_user_id` = #{ownerUserId}
</if> </if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != transactionId "> <if test=" null != transactionId ">
and `transaction_id` = #{transactionId} and `transaction_id` = #{transactionId}
</if> </if>


Načítá se…
Zrušit
Uložit