From ad9f55dd3f4e890c380cf44a92e2eeeb8ca77e7f Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Sat, 7 Dec 2024 21:55:03 +0800 Subject: [PATCH] //offlineActivity --- .../iformall/domain/po/WxOfflineActivityRecord.java | 1 + .../impl/WxOfflineActivityRecordServiceImpl.java | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java index 83c8b8921..64869810f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java @@ -208,6 +208,7 @@ public class WxOfflineActivityRecord extends TenantEntity { @TableField(value = "audit_time") private Date auditTime; + @Excel(name = "积分变动值", width = 20, orderNum = "15") @TableField(value = "increasedPoints") private Integer increasedPoints; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java index f7cf47803..3fa6f62b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java @@ -281,8 +281,10 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco } creditHistory.setCUserId(cuser.getId()); creditHistory.setCreditType(EnumScoreType.POINT_CHANGE.getCode()); + + Integer increasedPoints = record.getIncreasedPoints(); if(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(record.getAuditStatus())){ - if(record.getIncreasedPoints() > 0){ + if(increasedPoints > 0){ return; } //计算积分 @@ -290,7 +292,6 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco Double priceCondition = creditObject.getDouble(WxScoreRules.STEP); int baseScore = creditObject.getInteger(WxScoreRules.SCORE); - Integer increasedPoints = 0; if (record.getOrderMoney().compareTo(BigDecimal.valueOf(priceCondition)) > 0) { increasedPoints = record.getOrderMoney().divide(BigDecimal.valueOf(priceCondition),0, RoundingMode.DOWN) .multiply(BigDecimal.valueOf(baseScore)).intValue(); @@ -300,10 +301,10 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco } creditHistory.setCreditNum(increasedPoints); }else if(EnumOfflineActivityRecordStatus.INVALID.getCode().equals(record.getAuditStatus())){ - if(record.getIncreasedPoints() == 0){ + if(increasedPoints == 0){ return; } - creditHistory.setCreditNum(record.getIncreasedPoints()); + creditHistory.setCreditNum(increasedPoints); } if(creditHistory.getCreditNum() > 0){ creditHistory.setChangePurpose("活动订单("+record.getOrderNo()+")新增积分"+creditHistory.getCreditNum()); @@ -312,7 +313,7 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco } creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record); - record.setIncreasedPoints(creditHistory.getCreditNum()); + record.setIncreasedPoints(increasedPoints); wxOfflineActivityRecordMapper.updateIncreasedPoints(record); }