对接拼团数据1

hiver-admin/test-output/test-report.html

@@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">八月 10, 2026 18:10:46</span></a>
+<a href="#"><span class="badge badge-primary">八月 11, 2026 15:27:11</span></a>
 </li>
 </ul>
 </div>
@@ -84,7 +84,7 @@
           <div class="test-detail">
             <span class="meta text-white badge badge-sm"></span>
             <p class="name">passTest</p>
-            <p class="text-sm"><span>18:10:46 下午</span> / <span>0.017 secs</span></p>
+            <p class="text-sm"><span>15:27:11 下午</span> / <span>0.038 secs</span></p>
           </div>
           <div class="test-contents d-none">
 <div class="detail-head">
@@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>08.10.2026 18:10:46</span>
-<span class='badge badge-danger'>08.10.2026 18:10:46</span>
-<span class='badge badge-default'>0.017 secs</span>
+<span class='badge badge-success'>08.11.2026 15:27:11</span>
+<span class='badge badge-danger'>08.11.2026 15:27:11</span>
+<span class='badge badge-default'>0.038 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@@ -104,7 +104,7 @@
   <tbody>
       <tr class="event-row">
         <td><span class="badge log pass-bg">Pass</span></td>
-        <td>18:10:46</td>
+        <td>15:27:11</td>
         <td>
           Test passed
         </td>
@@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>八月 10, 2026 18:10:46</h3>
+<h3>八月 11, 2026 15:27:11</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>八月 10, 2026 18:10:46</h3>
+<h3>八月 11, 2026 15:27:11</h3>
 </div></div>
 </div>
 <div class="col-md-3">

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);
         // 返回当前登录人的信息

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);

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<Worker>().setData(worker);
             }else{
+                String oldRegion = worker.getRegion();
                 worker.setRegion(u.getRegion());
                 workerService.update(worker);
+                syncWorkerRegionCache(oldRegion, worker);
                 return new ResultUtil<Worker>().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) {

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<FishComplaint> adminPageComplaints(FishPageQuery query) {
         query = normalizeQuery(query);
+        final String regionId = query.getRegionId();
         IPage<FishComplaint> page = complaintMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()),
                 new LambdaQueryWrapper<FishComplaint>()
                         .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;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java

@@ -612,6 +612,17 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         order.setStatus(STATUS_WAIT_PAY);
         order.setRegionId(dto.getRegionId());
 
+        if (isFace2Face && DELIVERY_TYPE_EXPRESS == dto.getDeliveryType()) {
+            MallOrder headOrder = this.getById(group.getHeadOrderId());
+            if (headOrder == null) {
+                throw new RuntimeException("团长订单不存在");
+            }
+            order.setGetAreaId(headOrder.getGetAreaId());
+            order.setPutAreaId(headOrder.getPutAreaId());
+            order.setReceiverName(headOrder.getReceiverName());
+            order.setReceiverAddress(headOrder.getReceiverAddress());
+        }
+
         boolean isFreeOrder = canFreeOrder(order);
         order.setIsFreeOrder(isFreeOrder ? 1 : 0);
         if(isFreeOrder){