From 57c2ef1fbf2553db6a9bf7bfbe987466cbd019cc Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 10 Mar 2024 15:12:15 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxCashBackActivityRecord.java | 4 ++-- .../service/impl/WxCashBackActivityServiceImpl.java | 6 ++---- .../mapper/WxCashBackActivityRecordMapper.xml | 10 +++++++++- 3 files changed, 13 insertions(+), 7 deletions(-) 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 3098a0f6e..38153cab1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java @@ -65,13 +65,13 @@ public class WxCashBackActivityRecord extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "返现金额", name = "cashMoney") private BigDecimal cashMoney; @Excel(name="商管承担比例(%)",width = 20,orderNum = "12") - @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "商管承担比例", name = "mallRate") private BigDecimal mallRate; @Excel(name="商管承担返现金额",width = 20,orderNum = "13") @io.swagger.annotations.ApiModelProperty(value = "商管承担返现金额", name = "mallCashMoney") private BigDecimal mallCashMoney; @Excel(name="商户承担比例(%)",width = 20,orderNum = "14") - @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "商户承担比例", name = "merchantRate") private BigDecimal merchantRate; @Excel(name="商户承担返现金额",width = 20,orderNum = "15") @io.swagger.annotations.ApiModelProperty(value = "商户承担返现金额", name = "merchantCashMoney") 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 8514f8da2..d4a625490 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java @@ -356,6 +356,8 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService EnumCashBackActivityItemRule moneyRule = EnumCashBackActivityItemRule.getEnum(item.getMoneyRule()); record.setCashRate(item.getTotalBackRate()); record.setCashMoney(record.getOrderMoney().multiply(item.getTotalBackRate()).divide(new BigDecimal(100)).setScale(3,BigDecimal.ROUND_HALF_UP)); + record.setMallRate(item.getMallBackRate()); + record.setMerchantRate(item.getMerchantBackRate()); if (moneyRule == EnumCashBackActivityItemRule.MALL_ONLY) { record.setMallCashMoney(record.getCashMoney()); record.setMerchantCashMoney(new BigDecimal(0)); @@ -368,10 +370,6 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService } } - public static void main(String[] args) { - BigDecimal om = new BigDecimal(67298.870); - } - @Override public void saveOrUpdateRecord(WxCashBackActivityRecord record) { final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml index d5e0b43a2..47f56cf6e 100644 --- a/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml @@ -18,7 +18,9 @@ + + @@ -26,7 +28,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`activity_id`,`item_id`,`order_no`,`order_money`,`cus_name`,`create_date`,`update_date`,`phone`, - `address`,`audit_remark`,`audit_status`,`cash_rate`,`cash_money`,`mall_cash_money`,`merchant_cash_money`,`merchant_id` + `address`,`audit_remark`,`audit_status`,`cash_rate`,`cash_money`,`mall_rate`,`mall_cash_money`,`merchant_rate`,`merchant_cash_money`,`merchant_id` @@ -127,9 +129,15 @@ `cash_money` = #{cashMoney}, + + `mall_rate` = #{mallRate}, + `mall_cash_money` = #{mallCashMoney}, + + `merchant_rate` = #{merchantRate}, + `merchant_cash_money` = #{merchantCashMoney},