Просмотр исходного кода

//offlineActivity

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
ad9f55dd3f
2 измененных файлов: 7 добавлений и 5 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java
  2. +6
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java

+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java Просмотреть файл

@@ -208,6 +208,7 @@ public class WxOfflineActivityRecord extends TenantEntity {
@TableField(value = "audit_time") @TableField(value = "audit_time")
private Date auditTime; private Date auditTime;


@Excel(name = "积分变动值", width = 20, orderNum = "15")
@TableField(value = "increasedPoints") @TableField(value = "increasedPoints")
private Integer increasedPoints; private Integer increasedPoints;




+ 6
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java Просмотреть файл

@@ -281,8 +281,10 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
} }
creditHistory.setCUserId(cuser.getId()); creditHistory.setCUserId(cuser.getId());
creditHistory.setCreditType(EnumScoreType.POINT_CHANGE.getCode()); creditHistory.setCreditType(EnumScoreType.POINT_CHANGE.getCode());

Integer increasedPoints = record.getIncreasedPoints();
if(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(record.getAuditStatus())){ if(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(record.getAuditStatus())){
if(record.getIncreasedPoints() > 0){
if(increasedPoints > 0){
return; return;
} }
//计算积分 //计算积分
@@ -290,7 +292,6 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
Double priceCondition = creditObject.getDouble(WxScoreRules.STEP); Double priceCondition = creditObject.getDouble(WxScoreRules.STEP);
int baseScore = creditObject.getInteger(WxScoreRules.SCORE); int baseScore = creditObject.getInteger(WxScoreRules.SCORE);


Integer increasedPoints = 0;
if (record.getOrderMoney().compareTo(BigDecimal.valueOf(priceCondition)) > 0) { if (record.getOrderMoney().compareTo(BigDecimal.valueOf(priceCondition)) > 0) {
increasedPoints = record.getOrderMoney().divide(BigDecimal.valueOf(priceCondition),0, RoundingMode.DOWN) increasedPoints = record.getOrderMoney().divide(BigDecimal.valueOf(priceCondition),0, RoundingMode.DOWN)
.multiply(BigDecimal.valueOf(baseScore)).intValue(); .multiply(BigDecimal.valueOf(baseScore)).intValue();
@@ -300,10 +301,10 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
} }
creditHistory.setCreditNum(increasedPoints); creditHistory.setCreditNum(increasedPoints);
}else if(EnumOfflineActivityRecordStatus.INVALID.getCode().equals(record.getAuditStatus())){ }else if(EnumOfflineActivityRecordStatus.INVALID.getCode().equals(record.getAuditStatus())){
if(record.getIncreasedPoints() == 0){
if(increasedPoints == 0){
return; return;
} }
creditHistory.setCreditNum(record.getIncreasedPoints());
creditHistory.setCreditNum(increasedPoints);
} }
if(creditHistory.getCreditNum() > 0){ if(creditHistory.getCreditNum() > 0){
creditHistory.setChangePurpose("活动订单("+record.getOrderNo()+")新增积分"+creditHistory.getCreditNum()); creditHistory.setChangePurpose("活动订单("+record.getOrderNo()+")新增积分"+creditHistory.getCreditNum());
@@ -312,7 +313,7 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
} }
creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record);


record.setIncreasedPoints(creditHistory.getCreditNum());
record.setIncreasedPoints(increasedPoints);
wxOfflineActivityRecordMapper.updateIncreasedPoints(record); wxOfflineActivityRecordMapper.updateIncreasedPoints(record);
} }




Загрузка…
Отмена
Сохранить