diff --git a/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java b/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java
index 8af8ee37..28235c16 100644
--- a/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java
+++ b/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java
@@ -303,7 +303,7 @@ public class SecurityUtil {
token = IdUtil.simpleUUID();
tokenUser = new TokenUser(user, tokenProperties.getStorePerms(), saved);
// 单设备登录 之前的token失效
- if (tokenProperties.getSdl()) {
+ /*if (tokenProperties.getSdl()) {
final String oldToken = redisTemplateHelper.get(SecurityConstant.USER_TOKEN + user.getUsername() + "type:" + user.getType());
if (CharSequenceUtil.isNotBlank(oldToken)) {
redisTemplateHelper.delete(SecurityConstant.TOKEN_PRE + oldToken);
@@ -318,7 +318,7 @@ public class SecurityUtil {
redisTemplateHelper.delete(regionKey);
}
- }
+ }*/
// 是否记住账号/保存登录
if (saved) {
redisTemplateHelper.set(SecurityConstant.USER_TOKEN + user.getUsername() + "type:" + user.getType(), token, tokenProperties.getSaveLoginTime(), TimeUnit.DAYS);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommentController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommentController.java
index 2de939f6..2bbe1414 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommentController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommentController.java
@@ -86,66 +86,68 @@ public class CommentController {
}else{
e.setLevel(ShopConstant.SHOP_STATUS_NORMAL);
}
- if(e.getShopId().toUpperCase().startsWith("W")){
- //更新配送员评分
- Worker worker = workerServiceImpl.findByWorkerId(e.getShopId());
- Integer oldCount = worker.getOrderCount() == null ? 0 : worker.getOrderCount();
- BigDecimal oldScore = worker.getScore();
- BigDecimal score = e.getScore();
-
- // 1. 更新单量
- int newCount = oldCount + 1;
-
- // 2. 计算新评分：(旧总分 + 本次评分) / 新单量
- BigDecimal newScore = oldScore.multiply(new BigDecimal(oldCount))
- .add(score)
- .divide(new BigDecimal(newCount), 2, RoundingMode.HALF_UP); // 保留2位小数
- DecimalFormat df = new DecimalFormat("00.00");
-
- String formattedResult = df.format(newScore);
- worker.setScore(new BigDecimal(formattedResult));
-
- // 3. 保存更新
- workerServiceImpl.update(worker);
-
- //更新缓存
- WorkerRedisVo workerRedisVo = workerRedisCacheUtil.get(worker.getRegion(), worker.getWorkerId());
- if(workerRedisVo != null){
- workerRedisVo.setWorker(worker);
- workerRedisCacheUtil.update(worker.getRegion(), workerRedisVo);
- }
- }else{
- //更新店铺评分
- Shop shop = shopService.findById(e.getShopId());
- Integer oldSaleCount = shop.getSaleCount() == null ? 0 : shop.getSaleCount();
- BigDecimal oldScore = shop.getShopScore();
- BigDecimal score = e.getScore();
-
- int newCount = oldSaleCount + 1;
-
- // 2. 计算新评分：(旧总分 + 本次评分) / 新单量
- BigDecimal newScore = oldScore.multiply(new BigDecimal(oldSaleCount))
- .add(score)
- .divide(new BigDecimal(newCount), 2, RoundingMode.HALF_UP); // 保留2位小数
- DecimalFormat df = new DecimalFormat("00.00");
-
- String formattedResult = df.format(newScore);
- shop.setShopScore(new BigDecimal(formattedResult));
- shopService.update(shop);
-
- String shopCacheKey = "SHOP_CACHE:" + shop.getRegionId();
- String shopJson = (String) redisTemplateHelper.hGet(shopCacheKey, shop.getId());
- if (org.apache.commons.lang3.StringUtils.isNotBlank(shopJson)) {
- ShopCacheDTO cacheDTO = JSONUtil.toBean(shopJson, ShopCacheDTO.class);
- if (cacheDTO.getShop() != null) {
- cacheDTO.getShop().setShopScore(new BigDecimal(formattedResult));
- redisTemplateHelper.hPut(shopCacheKey, shop.getId(), JSONUtil.toJsonStr(cacheDTO));
+ if(e.getLevel() == ShopConstant.SHOP_STATUS_LOCK){
+ if(e.getShopId().toUpperCase().startsWith("W")){
+ //更新配送员评分
+ Worker worker = workerServiceImpl.findByWorkerId(e.getShopId());
+ Integer oldCount = worker.getOrderCount() == null ? 0 : worker.getOrderCount();
+ BigDecimal oldScore = worker.getScore();
+ BigDecimal score = e.getScore();
+
+ // 1. 更新单量
+ int newCount = oldCount + 1;
+
+ // 2. 计算新评分：(旧总分 + 本次评分) / 新单量
+ BigDecimal newScore = oldScore.multiply(new BigDecimal(oldCount))
+ .add(score)
+ .divide(new BigDecimal(newCount), 2, RoundingMode.HALF_UP); // 保留2位小数
+ DecimalFormat df = new DecimalFormat("00.00");
+
+ String formattedResult = df.format(newScore);
+ worker.setScore(new BigDecimal(formattedResult));
+
+ // 3. 保存更新
+ workerServiceImpl.update(worker);
+
+ //更新缓存
+ WorkerRedisVo workerRedisVo = workerRedisCacheUtil.get(worker.getRegion(), worker.getWorkerId());
+ if(workerRedisVo != null){
+ workerRedisVo.setWorker(worker);
+ workerRedisCacheUtil.update(worker.getRegion(), workerRedisVo);
+ }
+ }else{
+ //更新店铺评分
+ Shop shop = shopService.findById(e.getShopId());
+ Integer oldSaleCount = shop.getSaleCount() == null ? 0 : shop.getSaleCount();
+ BigDecimal oldScore = shop.getShopScore();
+ BigDecimal score = e.getScore();
+
+ int newCount = oldSaleCount + 1;
+
+ // 2. 计算新评分：(旧总分 + 本次评分) / 新单量
+ BigDecimal newScore = oldScore.multiply(new BigDecimal(oldSaleCount))
+ .add(score)
+ .divide(new BigDecimal(newCount), 2, RoundingMode.HALF_UP); // 保留2位小数
+ DecimalFormat df = new DecimalFormat("00.00");
+
+ String formattedResult = df.format(newScore);
+ shop.setShopScore(new BigDecimal(formattedResult));
+ shopService.update(shop);
+
+ String shopCacheKey = "SHOP_CACHE:" + shop.getRegionId();
+ String shopJson = (String) redisTemplateHelper.hGet(shopCacheKey, shop.getId());
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(shopJson)) {
+ ShopCacheDTO cacheDTO = JSONUtil.toBean(shopJson, ShopCacheDTO.class);
+ if (cacheDTO.getShop() != null) {
+ cacheDTO.getShop().setShopScore(new BigDecimal(formattedResult));
+ redisTemplateHelper.hPut(shopCacheKey, shop.getId(), JSONUtil.toJsonStr(cacheDTO));
+ }
}
}
- }
- //放进缓存 小于4分
- if(e.getScore().compareTo(new BigDecimal(4)) < 0){
- commentCacheUtil.put(e.getShopId(),e);
+ //放进缓存 小于4分
+ if(e.getScore().compareTo(new BigDecimal(4)) < 0){
+ commentCacheUtil.put(e.getShopId(),e);
+ }
}
});
if(comment != null && StringUtils.isNotBlank(comment.get(0).getParentId())){
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallAdPositionController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallAdPositionController.java
new file mode 100644
index 00000000..bc0e71ba
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallAdPositionController.java
@@ -0,0 +1,66 @@
+package cc.hiver.mall.controller;
+
+import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.vo.Result;
+import cc.hiver.mall.entity.MallAdPosition;
+import cc.hiver.mall.pojo.query.MallAdPositionQuery;
+import cc.hiver.mall.service.mybatis.MallAdPositionService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/hiver/mall/adPosition")
+@Api(tags = "广告位接口")
+public class MallAdPositionController {
+
+ @Autowired
+ private MallAdPositionService mallAdPositionService;
+
+ @PostMapping("/add")
+ @ApiOperation(value = "新增广告位")
+ public Result