| Pass |
- 18:10:46 |
+ 15:27:11 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
八月 10, 2026 18:10:46
+
八月 11, 2026 15:27:11
Ended
-
八月 10, 2026 18:10:46
+
八月 11, 2026 15:27:11
diff --git a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
index a6490f05..9faf7a80 100644
--- a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
+++ b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
@@ -168,7 +168,7 @@ public class AuthController {
return ResultUtil.error("璐﹀彿鎴栧瘑鐮侀敊璇");
}
// 閿佸畾褰撳墠鐧诲綍鐢ㄦ埛鐨勭被鍨
- user.setType(type);
+ //user.setType(type);
final String accessToken = securityUtil.getToken(user, saveLogin);
result.put("accessToken", accessToken);
// 杩斿洖褰撳墠鐧诲綍浜虹殑淇℃伅
@@ -259,7 +259,7 @@ public class AuthController {
throw new HiverException("鎵嬫満鍙蜂笉瀛樺湪");
}
// 閿佸畾褰撳墠鐧诲綍鐢ㄦ埛鐨勭被鍨
- user.setType(type);
+ //user.setType(type);
final String accessToken = securityUtil.getToken(user, saveLogin);
result.put("accessToken", accessToken);
// 杩斿洖褰撳墠鐧诲綍浜虹殑淇℃伅
diff --git a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
index 89b9e1eb..813e5636 100644
--- a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
+++ b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
@@ -478,6 +478,9 @@ public class UserController {
}*/
u.setPassword(old.getPassword());
+ if(u.getType().equals("3")){
+ u.setType("0,3");
+ }
// 鏄惁鏈夌淮鎶ゆ垚鏈潈闄 1:鏄紱0鍚
// u.setShopAdminCost(StringUtils.isEmpty(u.getShopAdminCost())?"0":u.getShopAdminCost());
userService.update(u);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java
index 884cca34..539ed6f5 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java
@@ -140,8 +140,10 @@ public class WorkerController {
if(u.getRegion().equals(worker.getRegion())){
return new ResultUtil().setData(worker);
}else{
+ String oldRegion = worker.getRegion();
worker.setRegion(u.getRegion());
workerService.update(worker);
+ syncWorkerRegionCache(oldRegion, worker);
return new ResultUtil().setData(worker);
}
}else{
@@ -161,6 +163,31 @@ public class WorkerController {
}
}
+ private void syncWorkerRegionCache(String oldRegion, Worker worker) {
+ if (worker == null || StrUtil.isBlank(worker.getWorkerId())) {
+ return;
+ }
+
+ WorkerRedisVo workerRedisVo = StrUtil.isNotBlank(oldRegion) ? workerRedisCacheUtil.get(oldRegion, worker.getWorkerId()) : null;
+ if (workerRedisVo == null) {
+ if (CommonConstant.ON_LINE.equals(worker.getIsOnLine()) && StrUtil.isNotBlank(worker.getRegion())) {
+ workerRedisVo = new WorkerRedisVo();
+ workerRedisVo.setWorkerId(worker.getWorkerId());
+ } else {
+ return;
+ }
+ }
+
+ workerRedisVo.setWorker(worker);
+ workerRedisVo.setWorkerRelaPriceList(workerRelaPriceService.selectByWorkerIdAndRegionId(worker.getWorkerId(), worker.getRegion()));
+ if (StrUtil.isNotBlank(oldRegion) && !Objects.equals(oldRegion, worker.getRegion())) {
+ workerRedisCacheUtil.remove(oldRegion, worker.getWorkerId());
+ }
+ if (StrUtil.isNotBlank(worker.getRegion())) {
+ workerRedisCacheUtil.put(worker.getRegion(), workerRedisVo);
+ }
+ }
+
@RequestMapping(value = "/admin/edit", method = RequestMethod.POST)
@ApiOperation(value = "淇敼閰嶉佸憳淇℃伅", notes = "闇瑕侀氳繃涓嬪崟缂栧彿鑾峰彇璁㈠崟淇℃伅")
public Result edit(@RequestBody Worker u) {
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/fishmarket/service/impl/FishMarketServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/fishmarket/service/impl/FishMarketServiceImpl.java
index 080552c2..1e99bdf7 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/fishmarket/service/impl/FishMarketServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/fishmarket/service/impl/FishMarketServiceImpl.java
@@ -1128,10 +1128,17 @@ public class FishMarketServiceImpl implements FishMarketService {
@Override
public IPage adminPageComplaints(FishPageQuery query) {
query = normalizeQuery(query);
+ final String regionId = query.getRegionId();
IPage page = complaintMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()),
new LambdaQueryWrapper()
.eq(query.getStatus() != null, FishComplaint::getStatus, query.getStatus())
.eq(StringUtils.isNotBlank(query.getType()), FishComplaint::getComplaintType, query.getType())
+ .and(StringUtils.isNotBlank(regionId), w -> w
+ .exists("select 1 from fish_goods fg where fg.id = goods_id and fg.region_id = {0}", regionId)
+ .or()
+ .exists("select 1 from fish_chat_session fcs join fish_goods fg on fg.id = fcs.goods_id where fcs.id = room_id and fg.region_id = {0}", regionId)
+ .or()
+ .exists("select 1 from fish_chat_session fcs join fish_want fw on fw.id = fcs.want_id where fcs.id = room_id and fw.region_id = {0}", regionId))
.orderByDesc(FishComplaint::getCreateTime));
fillComplaintDisplayInfo(page.getRecords());
return page;
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
index aa39d3cc..146c388a 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
@@ -612,6 +612,17 @@ public class MallOrderServiceImpl extends ServiceImpl