diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index 8d68e14e8..e946da6f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -40,7 +40,7 @@ public class WxMerchantSubsidyController extends BaseController { @ApiOperation("补贴记录汇总") @GetMapping("sum") @SystemControllerLog(description = "商户-补贴记录-汇总") - public ResultData count(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy) { + public ResultData count(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy) { String ipStr = getIpAddr(); logger.info("subsidy/sum: " + ipStr + " :" + wxMerchantSubsidy.toString()); if (wxMerchantSubsidy == null) { @@ -92,7 +92,7 @@ public class WxMerchantSubsidyController extends BaseController { @ApiOperation("更新补贴记录") @PostMapping("updateSubsidied") @SystemControllerLog(description = "商户-更新补贴记录") - public ResultData updateSubsidied(@RequestBody WxMerchantSubsidy wxMerchantSubsidy) { + public ResultData updateSubsidied(@RequestBody WxMerchantSubsidyVo wxMerchantSubsidy) { String ipStr = getIpAddr(); logger.info("subsidy/update: " + ipStr + " :" + wxMerchantSubsidy.toString()); if (wxMerchantSubsidy == null) { @@ -117,7 +117,7 @@ public class WxMerchantSubsidyController extends BaseController { @ApiOperation("补贴记录导出") @GetMapping("/exportData") @SystemControllerLog(description = "商户-补贴记录-导出") - public void exportData(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { + public void exportData(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { logger.info("[" + getIpAddr() + "] subsidy/exportData"); if (wxMerchantSubsidy == null) { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件不能为空"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 9c4836da3..95a622f0f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -59,17 +59,17 @@ public class WxMerchantSubsidy extends BaseEntity { private Integer receiverPayment; @Transient - @Excel(name="本次消费(元)",width = 20,orderNum = "4") + @Excel(name="本次消费(元)",width = 20,orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPaymentStr") private String orderPaymentStr; @Transient - @Excel(name="商户应收(元)",width = 20,orderNum = "5") + @Excel(name="商户应收(元)",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="接收金额(包含通道费)",name="receiverPaymentStr") private String receiverPaymentStr; @Transient - @Excel(name="补贴(元)",width = 20,orderNum = "6") + @Excel(name="补贴(元)",width = 20,orderNum = "7") @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidyStr") private String subsidyStr; @@ -81,11 +81,11 @@ public class WxMerchantSubsidy extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="线上补贴额/实收补贴额(通道费扣除)",name="realSubsidy") private Integer realSubsidy; - @Excel(name="补贴状态",width = 20,orderNum = "7",replace = { "未补贴_0", "已自动补贴_1","已手工补贴_2"}) + @Excel(name="补贴状态",width = 20,orderNum = "8",replace = { "未补贴_0", "已自动补贴_1","已手工补贴_2"}) @io.swagger.annotations.ApiModelProperty(value="状态(0:未补贴, 1:已补贴, 2:已手工补贴)",name="status") private Integer status; - @Excel(name="交易时间",width = 20,orderNum = "3",format="yyyy-MM-dd HH:mm") + @Excel(name="交易时间",width = 20,orderNum = "4",format="yyyy-MM-dd HH:mm") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java index daadf9e7c..2b84574d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java @@ -12,36 +12,30 @@ import javax.persistence.Transient; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMerchantSubsidyVo extends WxMerchantSubsidy { - /**卡信息*/ - /**封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /**券名称**/ + + @Excel(name="活动名称",width = 20,orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /**副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; - /**单位**/ + @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") private Integer unit; - /**须知**/ + @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") private String detail; - /**购买须知**/ @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") private String remark; - /**使用商户名**/ @Excel(name="消费商户",width = 20,orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; - /**持有人昵称**/ @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="nickName") private String nickName; - /**持有人手机**/ @io.swagger.annotations.ApiModelProperty(value="持有人手机",name="phone") private String phone; diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java index 513c8dc78..a5f035ad3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java @@ -17,7 +17,7 @@ public interface WxMerchantSubsidyService { * @param record * @return */ - List> sumForSubsidy(WxMerchantSubsidy record); + List> sumForSubsidy(WxMerchantSubsidyVo record); /** * 根据实体查询分页列表 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index cf795d4ae..1ba74daef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -31,7 +31,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { ExcelService excelService; @Override - public List> sumForSubsidy(WxMerchantSubsidy record) { + public List> sumForSubsidy(WxMerchantSubsidyVo record) { return wxMerchantSubsidyMapper.sumVoList(record); } @@ -74,7 +74,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { wxMerchantSubsidyMapper.deleteByPrimaryKey(id); } - @Override + @Override public void exportData(WxMerchantSubsidy wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { List list = wxMerchantSubsidyMapper.findVoList(wxMerchantSubsidy); excelService.exportExcel(list, null, "补贴记录", WxMerchantSubsidyVo.class, "补贴记录.xlsx", response, false); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index c2ea2be73..0ebfeb34e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -95,8 +95,19 @@ update wx_merchant_subsidy set `status` = #{status} - where `tenant_id`=#{tenantId} and merchant_id=#{merchantId} - and id in (${idStr}) + where 1=1 + + and `tenant_id`=#{tenantId} + + + and `merchant_id`=#{merchantId} + + + and id in + + #{idItem} + + @@ -228,7 +239,7 @@ - select ms.`merchant_id` merchantId, m.`name` as merchantName, IFNULL(sum(ms.`order_payment`),0) as sumOrderPayment, IFNULL(sum(ms.`receiver_payment`),0) as sumReceiverPayment, @@ -245,6 +256,9 @@ and ms.`merchant_id` = #{merchantId} + + and c.`title` like concat('%', #{title},'%') + and ms.`status` in