diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index d204ec946..6b043e982 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -148,8 +148,8 @@ public class WxCardPayController extends BaseController { } MallUserInfo user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); - int num = wxCardSpendService.update(wxCardSpend); - return new ResultData(num); + wxCardSpendService.update(wxCardSpend); + return new ResultData(); } @ApiOperation("卡完结") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index 3df6bc13e..18d912c9b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -77,6 +77,14 @@ public class WxCardSpend implements Serializable { @Transient protected String payStatusStr; + @Transient + @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") + private Date startdate; + + @Transient + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") + private Date enddate; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index ecdc7681f..d067ad62c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -40,11 +40,4 @@ public class WxCardSpendVo extends WxCardSpend { @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") private String ouPhone; - @Transient - @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") - private Date startdate; - - @Transient - @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") - private Date enddate; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java index 8d8e92759..6a0bfa2aa 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -9,7 +9,7 @@ public interface WxCardSpendMapper extends CommonMapper { List findList(WxCardSpend wxCardSpend); - int updateByCond(WxCardSpend wxCardSpend); + void updateByCond(WxCardSpend wxCardSpend); List findCardSpendVoList(WxCardSpend wxCardSpend); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java index a03e72f35..f568cbcc1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -73,7 +73,7 @@ public interface WxCardSpendService { * * @param record */ - int update(WxCardSpend record); + void update(WxCardSpend record); /** * 卡完结 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index fd5e8a3d8..ffd358f0b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -275,7 +275,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } @Override - public int update(WxCardSpend record) { + public void update(WxCardSpend record) { // 1. 检查符合条件的卡消费记录是否已支付 List cardSpends = wxCardSpendMapper.findList(record); if (cardSpends.stream().anyMatch((cs->(!cs.getPayStatus().equals(EnumCardSpendStatus.NOT_PAY.getCode()))))){ @@ -284,8 +284,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 2. 更新支付状态 record.setPayStatus(EnumCardSpendStatus.MANUAL_PAY.getCode()); record.setUpdateDate(new Date()); - int num = wxCardSpendMapper.updateByCond(record); - return num; + wxCardSpendMapper.updateByCond(record); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 2719d95db..ec0d54f8e 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -1,136 +1,151 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`card_id`,`owner_id`,`merchant_id`,`order_id`,`deduction_amount`,`payment`,`real_payment`, `card_remain_amount`,`card_before_amount`,`card_remain_real_amount`,`card_before_real_amount`, `create_date`,`update_date`, `pay_status` - - where 1 = 1 - - and `id` = #{id} - - - and `tenant_id` = #{tenantId} - - - and `card_id` = #{cardId} - - - and `owner_id` = #{ownerId} - - - and `merchant_id` = #{merchantId} - - - and `order_id` = #{orderId} - + + where 1 = 1 + + and `id` = #{id} + + + and `tenant_id` = #{tenantId} + + + and `card_id` = #{cardId} + + + and `owner_id` = #{ownerId} + + + and `merchant_id` = #{merchantId} + + + and `order_id` = #{orderId} + and `deduction_amount` = #{deductionAmount} and `payment` = #{payment} - - and `real_payment` = #{realPayment} - - - and `card_remain_amount` = #{cardRemainAmount} - - - and `card_before_amount` = #{cardBeforeAmount} - + + and `real_payment` = #{realPayment} + + + and `card_remain_amount` = #{cardRemainAmount} + + + and `card_before_amount` = #{cardBeforeAmount} + and `card_remain_real_amount` = #{cardRemainRealAmount} and `card_before_real_amount` = #{cardBeforeRealAmount} - - and `create_date` = #{createDate} - - - and `update_date` = #{updateDate} - - - and `pay_status` = #{payStatus} - - - and `create_date` between #{startdate} and #{enddate} - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - + + and `create_date` = #{createDate} + + + and `update_date` = #{updateDate} + + + and `pay_status` = #{payStatus} + + + and `create_date` between #{startdate} and #{enddate} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - + + + - - - + + + - + cs.`id`,cs.`tenant_id`,cs.`card_id`,cs.`owner_id`,cs.`merchant_id`,cs.`order_id`,cs.`deduction_amount`,cs.`payment`,cs.`real_payment`, cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`, cs.`create_date`,cs.`update_date`, cs.`pay_status`, @@ -139,125 +154,125 @@ ou.`nick_name` as onick_name, ou.`phone` as ou_phone - - where 1 = 1 - - and cs.`id` = #{id} - - - and cs.`tenant_id` = #{tenantId} - - - and cs.`card_id` = #{cardId} - - - and cs.`owner_id` = #{ownerId} - - - and cs.`merchant_id` = #{merchantId} - - - and cs.`order_id` = #{orderId} - - - and cs.`deduction_amount` = #{deductionAmount} - - - and cs.`payment` = #{payment} - - - and cs.`real_payment` = #{realPayment} - - - and cs.`card_remain_amount` = #{cardRemainAmount} - - - and cs.`card_before_amount` = #{cardBeforeAmount} - - - and cs.`card_remain_real_amount` = #{cardRemainRealAmount} - - - and cs.`card_before_real_amount` = #{cardBeforeRealAmount} - - - and cs.`create_date` = #{createDate} - - - and cs.`update_date` = #{updateDate} - - - and cs.`pay_status` = #{payStatus} - - - and ms.`status` = #{status} - - - and ou.`phone` = #{ouPhone} - - - and cs.`create_date` between #{startdate} and #{enddate} - - - and cs.`pay_status` in - - #{sItem} - - - - and cs.id in - - #{idItem} - - - + + where 1 = 1 + + and cs.`id` = #{id} + + + and cs.`tenant_id` = #{tenantId} + + + and cs.`card_id` = #{cardId} + + + and cs.`owner_id` = #{ownerId} + + + and cs.`merchant_id` = #{merchantId} + + + and cs.`order_id` = #{orderId} + + + and cs.`deduction_amount` = #{deductionAmount} + + + and cs.`payment` = #{payment} + + + and cs.`real_payment` = #{realPayment} + + + and cs.`card_remain_amount` = #{cardRemainAmount} + + + and cs.`card_before_amount` = #{cardBeforeAmount} + + + and cs.`card_remain_real_amount` = #{cardRemainRealAmount} + + + and cs.`card_before_real_amount` = #{cardBeforeRealAmount} + + + and cs.`create_date` = #{createDate} + + + and cs.`update_date` = #{updateDate} + + + and cs.`pay_status` = #{payStatus} + + + and ms.`status` = #{status} + + + and ou.`phone` = #{ouPhone} + + + and cs.`create_date` between #{startdate} and #{enddate} + + + and cs.`pay_status` in + + #{sItem} + + + + and cs.id in + + #{idItem} + + + - + select + + from wx_card_spend cs left join wx_coupon_order co on co.id = cs.card_id left join wx_coupon c on c.id = co.coupon_id - left join wx_merchant m on m.id = cs.merchant_id + left join wx_merchant m on m.id = cs.merchant_id left join wx_merchant_subsidy ms on ms.order_id = cs.order_id - left join wx_c_user ou on ou.id = co.owner_id - + left join wx_c_user ou on ou.id = co.owner_id + order by cs.create_date DESC - + + + + + - - - -