diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 0f1ef3624..9516060d8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxCardSpend; +import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.service.WxCardSpendService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxOrderService; @@ -38,6 +39,10 @@ public class WxCardPayController extends BaseController { @Autowired WxCardSpendService wxCardSpendService; + // 售卡记录 + + // 消费记录 + @ApiOperation("C端扫B端储值卡交易流水列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -49,7 +54,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) wxCardSpend = new WxCardSpend(); MallUserInfo user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); - final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); + final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index c7286edf8..dc799737e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -4,6 +4,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.service.WxCardSpendService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxOrderService; @@ -45,7 +46,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) wxCardSpend = new WxCardSpend(); WxMerchantBUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); - final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); + final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 754711838..2b79e3ecd 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.exception.MallinkException; import com.iformall.service.*; import io.swagger.annotations.Api; @@ -147,7 +148,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) wxCardSpend = new WxCardSpend(); WxCUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); - final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); + final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java index d2834d775..d5d86a04e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java @@ -88,7 +88,7 @@ public class WxCardCVo extends WxCouponOrder { /**卡消费信息*/ @io.swagger.annotations.ApiModelProperty(value="卡消费列表",name="cardSpendList") - private List cardSpendList; + private List cardSpendList; public List getMerchantVoList() { @@ -166,11 +166,11 @@ public class WxCardCVo extends WxCouponOrder { this.remainingAmount = remainingAmount; } - public List getCardSpendList() { + public List getCardSpendList() { return cardSpendList; } - public void setCardSpendList(List cardSpendList) { + public void setCardSpendList(List cardSpendList) { this.cardSpendList = cardSpendList; } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java new file mode 100644 index 000000000..fd445053a --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -0,0 +1,18 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.WxCardSpend; + +public class WxCardSpendVo extends WxCardSpend { + + /**使用商户名**/ + @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") + private String merchantName; + + public String getMerchantName() { + return merchantName; + } + + public void setMerchantName(String merchantName) { + this.merchantName = merchantName; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java index 87de15c13..383ee6de1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -3,10 +3,13 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCardSpend; +import com.iformall.domain.vo.WxCardSpendVo; public interface WxCardSpendMapper extends CommonMapper { List findList(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 fc4cbd2c1..bef92e22f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxCardSpendVo; public interface WxCardSpendService { @@ -27,7 +28,7 @@ public interface WxCardSpendService { * @param pageSize * @return */ - PageInfo listAsPage(WxCardSpend record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCardSpend record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 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 646e10d3c..af47835e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.service.WxCardSpendService; @@ -201,8 +202,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Override - public PageInfo listAsPage(WxCardSpend record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardSpendMapper.findList(record)); + public PageInfo listAsPage(WxCardSpend record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardSpendMapper.findCardSpendVoList(record)); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index b9f17973e..160ada98b 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -84,6 +84,96 @@ select from wx_card_spend + + + + + + + + + + + + + + + + + + + + + + + + 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`, + m.`name` + + + + 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.id in + + #{idItem} + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 48ff05124..786497ec5 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -658,9 +658,9 @@ select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > + select="com.iformall.mapper.WxCardSpendMapper.findCardSpendVoList" >