From 1a3cb3d15f1c159d12f7569c9058e6fbc114969a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 19 Dec 2022 11:01:22 +0800
Subject: [PATCH] 20221219 1、生成物流单号 2、支付后订单状态自动成为待收货状态 3、新增编辑商品后，会自动计算补贴金额和商品星级，并显示在后台商品列表中
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index 6dfb13f..62d0087 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -72,6 +72,10 @@
@Override
public MallScoreSignRecord judgeScoreIsContinuity(MallScoreSignRecord mallScoreSignRecord) {
+ if (mallScoreSignRecord.getSignTime() == null) {
+ return mallScoreSignRecord;
+ }
+
// 若最新签到日期，与当天相差大于一天，则更新数据库(避免定时器更新失败)
if (DateUtil.betweenDay(mallScoreSignRecord.getSignTime(), new Date(), true) > 1 || mallScoreSignRecord.getTotalCnt() == 7) {
mallScoreSignRecord.setTotalCnt(0);
@@ -93,14 +97,14 @@
MallScoreSignRecord mallScoreSignRecord = mallScoreSignRecordMapper.selectRecentSignRecord(member.getId());
if (mallScoreSignRecord == null) {
mallScoreSignRecord = new MallScoreSignRecord();
- } else {
- mallScoreSignRecord = judgeScoreIsContinuity(mallScoreSignRecord);
}
if (mallScoreSignRecord.getSignTime() != null && DateUtil.betweenDay(mallScoreSignRecord.getSignTime(), new Date(), true) == 0) {
throw new FebsException("今天已签到");
}
+ mallScoreSignRecord = judgeScoreIsContinuity(mallScoreSignRecord);
+
ScoreSettingDto scoreSetting = JSONObject.parseObject(dic.getValue(),ScoreSettingDto.class);
int days = mallScoreSignRecord.getTotalCnt() == null ? 1 : mallScoreSignRecord.getTotalCnt() + 1;
switch (days) {
--
Gitblit v1.9.1