From 9f9db17088a61ecc1757b0b3f60fe3139f5b4a2a Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 10 Mar 2024 14:44:58 +0800 Subject: [PATCH] fix --- .../market/WxCashBackActivityController.java | 12 ++++++------ .../com/iformall/domain/po/WxCashBackActivity.java | 4 +--- .../iformall/domain/po/WxCashBackActivityRecord.java | 2 +- .../service/impl/WxCashBackActivityServiceImpl.java | 1 + .../mapper/WxCashBackActivityRecordMapper.xml | 9 ++++++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java index 7cb1a9676..bd3f74b8c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -116,13 +116,13 @@ public class WxCashBackActivityController extends BaseController { a.setAuditSuccessRecordSumRough(successRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode()); - BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r); - if (null == auditingRecordSum) { - auditingRecordSum = new BigDecimal(0); - } - a.setAuditingRecordSum(auditingRecordSum); - a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); +// BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r); +// if (null == auditingRecordSum) { +// auditingRecordSum = new BigDecimal(0); +// } + int auditingCount = wxCashBackActivityService.getRecordCount(r); + a.setAuditingCount(auditingCount); if (a.getAllMerchant().intValue() == EnumYesOrNo.YES.getCode().intValue()) { a.setMerchantCount("全部"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java index 19ef9e6ab..561591d99 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java @@ -52,9 +52,7 @@ public class WxCashBackActivity extends TenantEntity { @TableField(exist = false) private BigDecimal auditSuccessRecordSumRough; @TableField(exist = false) - private BigDecimal auditingRecordSum; - @TableField(exist = false) - private BigDecimal auditingRecordSumRough; + private Integer auditingCount; @TableField(exist = false) private BigDecimal merchantRecordSum; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java index 4392200f6..bf7e581c9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java @@ -23,8 +23,8 @@ public class WxCashBackActivityRecord extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "活动", name = "activityId") private Long activityId; - @TableField(exist = false) @Excel(name="活动名称",width = 20,orderNum = "1") + @TableField(exist = false) private String activityName; @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java index 788c1d36b..8514f8da2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java @@ -346,6 +346,7 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService @Override public void auditRecord(WxCashBackActivityRecord record) { + record.setUpdateDate(new Date()); wxCashBackActivityRecordMapper.updateStatus(record); } diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml index d80cc1d47..d5e0b43a2 100644 --- a/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml @@ -60,15 +60,15 @@ and `create_date` <= #{createDateEnd} - + and `cus_name` like concat('%', #{cusName},'%') - + and `phone` like concat('%', #{phone},'%') - + and `order_no` like concat('%', #{orderNo},'%') @@ -133,6 +133,9 @@ `merchant_cash_money` = #{merchantCashMoney}, + + `item_id` = #{itemId}, + `update_date` = #{updateDate} where id=#{id}