diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 977b9e560..4d7e14d20 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -147,7 +147,6 @@ public class WxCardPayController extends BaseController { wxCardSpendVo = new WxCardSpendVo(); } wxCardSpendVo.updateTenantInfo(getTenantInfo()); - wxCardSpendVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxCardSpendService.listMerchantAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 58d32892e..288d894ac 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -8,6 +8,7 @@ + @@ -25,8 +26,8 @@ - `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` @@ -47,6 +48,9 @@ and `owner_user_id` = #{ownerUserId} + + and `type` = #{type} + and `transaction_id` = #{transactionId}