diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 8653d381d..523b8a99b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -80,13 +80,13 @@ public class WxCardPayController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData cardSpendlist(@ModelAttribute WxCardSpend wxCardSpend, Integer pageNum, Integer pageSize) { + public ResultData cardSpendlist(@ModelAttribute WxCardSpendVo wxCardSpendVo, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); logger.info("cardSpendlist: " + ipStr); - if (wxCardSpend == null) wxCardSpend = new WxCardSpend(); + if (wxCardSpendVo == null) wxCardSpendVo = new WxCardSpendVo(); MallUserInfo user = getUser(); - wxCardSpend.setTenantId(user.getTenantId()); - final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); + wxCardSpendVo.setTenantId(user.getTenantId()); + final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, 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 93782dc96..5e7ad5c5e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @Api(description = "C端扫B端商户码储值卡支付") -@RequestMapping("/api/carday") +@RequestMapping("/api/cardPay") public class WxCardPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -40,14 +40,14 @@ public class WxCardPayController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData cardSpendlist(@ModelAttribute WxCardSpend wxCardSpend, Integer pageNum, Integer pageSize) { + public ResultData cardSpendlist(@ModelAttribute WxCardSpendVo wxCardSpendVo, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); - logger.info("cardSpendlist: " + ipStr + " :" + wxCardSpend.toString()); - if (wxCardSpend == null) wxCardSpend = new WxCardSpend(); + logger.info("cardSpendlist: " + ipStr + " :" + wxCardSpendVo.toString()); + if (wxCardSpendVo == null) wxCardSpendVo = new WxCardSpendVo(); WxMerchantBUser user = getUser(); - wxCardSpend.setTenantId(user.getTenantId()); - wxCardSpend.setMerchantId(user.getMerchantId()); - final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); + wxCardSpendVo.setTenantId(user.getTenantId()); + wxCardSpendVo.setMerchantId(user.getMerchantId()); + final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, 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 2b79e3ecd..09a4955f7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -142,10 +142,10 @@ public class WxCardPayController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData cardOrderList(@ModelAttribute WxCardSpend wxCardSpend, Integer pageNum, Integer pageSize) { + public ResultData cardOrderList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); logger.info("saveCardPayOrder: " + ipStr + " :" + wxCardSpend.toString()); - if (wxCardSpend == null) wxCardSpend = new WxCardSpend(); + if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); WxCUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); 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 fb5c2da81..284a84909 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -67,12 +67,6 @@ public class WxCardSpend implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - @Transient - private Date startdate; - - @Transient - 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 4b39eeb16..e7d8f603a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -1,7 +1,16 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCardSpend; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import javax.persistence.Transient; +import java.util.Date; + +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCardSpendVo extends WxCardSpend { /**卡信息*/ @@ -10,7 +19,7 @@ public class WxCardSpendVo extends WxCardSpend { private String title; /**使用商户名**/ - @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") + @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") private String merchantName; /**补贴额(包含通道费)*/ @@ -23,43 +32,19 @@ public class WxCardSpendVo extends WxCardSpend { @io.swagger.annotations.ApiModelProperty(value="状态(0:未补贴, 1:已补贴)",name="status") private Integer status; - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - public Integer getSubsidy() { - return subsidy; - } - - public void setSubsidy(Integer subsidy) { - this.subsidy = subsidy; - } - - public Integer getRealSubsidy() { - return realSubsidy; - } + /**持有人昵称*/ + @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="ouNickName") + private String ouNickName; - public void setRealSubsidy(Integer realSubsidy) { - this.realSubsidy = realSubsidy; - } + /**持有人绑定的手机号**/ + @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") + private String ouPhone; - public Integer getStatus() { - return status; - } + @Transient + @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") + private Date startdate; - public void setStatus(Integer status) { - this.status = status; - } + @Transient + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") + private Date enddate; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index 2d7068bd3..75dba0c28 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -59,15 +59,15 @@ public class WxCardVo extends WxCardInfo { /**购买人昵称*/ - @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cNickName") - private String cNickName; + @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cuNickName") + private String cuNickName; /**持有人昵称*/ - @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="oNickName") - private String oNickName; + @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="ouNickName") + private String ouNickName; /**持有人绑定的手机号**/ - @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="oPhone") - private String oPhone; + @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") + private String ouPhone; @Transient protected List statusS; @@ -76,8 +76,10 @@ public class WxCardVo extends WxCardInfo { protected String statusStr; @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/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java index bef92e22f..6c34e2ea9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -28,7 +28,7 @@ public interface WxCardSpendService { * @param pageSize * @return */ - PageInfo listAsPage(WxCardSpend record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCardSpendVo 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 3af7fa953..d125235c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -209,7 +209,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Override - public PageInfo listAsPage(WxCardSpend record, Integer pageIndex, Integer pageSize) { + public PageInfo listAsPage(WxCardSpendVo record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardSpendMapper.findCardSpendVoList(record)); } diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 9b78c56a0..536d22cf8 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -103,9 +103,9 @@ - - - + + + @@ -114,7 +114,7 @@ ci.`create_date`,ci.`update_date`, c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status, - cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as o_phone + cu.`nick_name` as cu_nick_name, ou.`nick_name` as ou_nick_name, ou.`phone` as ou_phone @@ -158,8 +158,8 @@ and status = #{status} - - and o_phone = #{oPhone} + + and ou_phone = #{ouPhone} and ci.`create_date` between #{startdate} and #{enddate} diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index f6c6bd8be..27c7d4d6e 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -113,13 +113,17 @@ + + + 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`, c.`title`, - ms.`subsidy`,ms.`real_subsidy`,ms.`status` + ms.`subsidy`,ms.`real_subsidy`,ms.`status`, + ou.`nick_name` as ou_nick_name, ou.`phone` as ou_phone @@ -169,6 +173,9 @@ and cs.`update_date` = #{updateDate} + + and ou_phone = #{oPhone} + and cs.`create_date` between #{startdate} and #{enddate} @@ -180,7 +187,7 @@ - select from wx_card_spend cs @@ -188,6 +195,7 @@ 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_subsidy ms on ms.order_id = cs.order_id + left join wx_c_user ou on ou.id = co.owner_id