From b3d2eb2ea9f6dcaff1fb8de302e732e82f3cff54 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Fri, 21 Apr 2023 14:31:26 +0800 Subject: [PATCH] fix bug --- .../main/java/com/iformall/domain/po/WxCreditHistory.java | 4 ---- .../src/main/java/com/iformall/domain/po/WxOrder.java | 4 ---- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 2 -- .../iformall/service/impl/WxCreditHistoryServiceImpl.java | 8 ++------ .../iformall/service/impl/WxScoreRulesServiceImpl.java | 8 ++------ 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index 6a77fa336..27892435d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -103,8 +103,4 @@ public class WxCreditHistory extends BaseTenantEntity { } return spendStr; } - - @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="是否积分按照支付比例",name="isCreditByPamentRate") - private boolean isCreditByPamentRate = true; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 4d0b333bf..c9fd3a4a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -204,8 +204,4 @@ public class WxOrder extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType") private Integer shippingType; - @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="是否积分按照支付比例",name="isCreditByPamentRate") - private boolean isCreditByPamentRate = true; - } 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 9fbadc31c..dc7de1b63 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -316,7 +316,6 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { orderUpdate.setPayment(payment); }else if(coupon.getCardScoreRule().intValue() == EnumCardScoreRule.BY_PRICE.getCode().intValue()){ orderUpdate.setPayment(record.getDeductionAmount()); - orderUpdate.setCreditByPamentRate(false); } if (null != merchant) { wxScoreRulesService.addScore2(coupon,EnumScoreType.CONSUMPTION, orderUpdate, merchant.getBusinessId()); @@ -345,7 +344,6 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setSpend(payment); }else if(coupon.getCardScoreRule().intValue() == EnumCardScoreRule.BY_PRICE.getCode().intValue()){ creditHistory.setSpend(record.getDeductionAmount()); - creditHistory.setCreditByPamentRate(false); } //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(record.getMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 671758d84..444f4efc9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -1038,12 +1038,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { // 4. 计算积分 if (record.getSpend() >= priceCondition.intValue()) { - if (record.isCreditByPamentRate()) { - Double dScoreT = Math.floor(record.getSpend() * 1.0D / priceCondition * baseScore); - addCreditNumber = dScoreT.intValue(); - }else { - addCreditNumber = record.getSpend(); - } + Double dScoreT = Math.floor(record.getSpend() * 1.0D / priceCondition * baseScore); + addCreditNumber = dScoreT.intValue(); log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: " + addCreditNumber); } else { log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: 0, not touch credit limit"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 5cb89db65..22aa3c566 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -380,12 +380,8 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { // 4. 计算成长值 if(order.getPayment() >= priceCondition.intValue()) { - if (order.isCreditByPamentRate()) { - Double dScoreT = Math.floor(order.getPayment() * 1.0D / priceCondition * baseScore); - addScoreNumber = dScoreT.intValue(); - }else { - addScoreNumber = order.getPayment(); - } + Double dScoreT = Math.floor(order.getPayment() * 1.0D / priceCondition * baseScore); + addScoreNumber = dScoreT.intValue(); logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: " + addScoreNumber); if (addScoreNumber == 0) { return 0;