diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 4d925ecb..a00a53b3 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -35,7 +35,7 @@ Hiver
  • -五月 09, 2026 15:14:17 +五月 13, 2026 18:10:53
    • @@ -84,7 +84,7 @@

    passTest

    -

    15:14:17 下午 / 0.016 secs

    +

    18:10:53 下午 / 0.017 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -05.09.2026 15:14:17 -05.09.2026 15:14:17 -0.016 secs +05.13.2026 18:10:53 +05.13.2026 18:10:53 +0.017 secs
    @@ -104,7 +104,7 @@ Pass - 15:14:17 + 18:10:53 Test passed @@ -128,13 +128,13 @@

    Started

    -

    五月 09, 2026 15:14:17

    +

    五月 13, 2026 18:10:53

    Ended

    -

    五月 09, 2026 15:14:17

    +

    五月 13, 2026 18:10:53

    diff --git a/hiver-core/src/main/java/cc/hiver/core/entity/User.java b/hiver-core/src/main/java/cc/hiver/core/entity/User.java index 24d921f1..abd50d74 100644 --- a/hiver-core/src/main/java/cc/hiver/core/entity/User.java +++ b/hiver-core/src/main/java/cc/hiver/core/entity/User.java @@ -44,14 +44,13 @@ public class User extends HiverBaseEntity { @ApiModelProperty(value = "鐧诲綍鍚") @Column(unique = true, nullable = false) - @Pattern(regexp = NameUtil.regUsername, message = "鐧诲綍璐﹀彿涓嶈兘鍖呭惈涓枃銆佺壒娈婂瓧绗 闀垮害涓嶈兘>16") private String username; @ApiModelProperty(value = "瀵嗙爜") private String password; @ApiModelProperty(value = "鐢ㄦ埛鍚/鏄电О/濮撳悕") - @Size(max = 20, message = "鏄电О闀垮害涓嶈兘瓒呰繃20") + @Size(max = 50, message = "鏄电О闀垮害涓嶈兘瓒呰繃20") private String nickname; @ApiModelProperty(value = "鎵嬫満") 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 b3480f8b..44de687e 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 @@ -637,8 +637,8 @@ public class UserController { // 鍘绘帀鐗规畩绗﹀彿锛堝彧淇濈暀瀛楁瘝鍜屾暟瀛楋級 String cleanedOpenid = openId.replaceAll("[^a-zA-Z0-9]", ""); // 鎴彇鍓 10 浣,浣滀负username - String username = cleanedOpenid.length() > 10 ? cleanedOpenid.substring(0, 10) : cleanedOpenid; - wechatUser.setUsername(username); + //String username = cleanedOpenid.length() > 10 ? cleanedOpenid.substring(0, 10) : cleanedOpenid; + wechatUser.setUsername(cleanedOpenid); final String encryptPass = new BCryptPasswordEncoder().encode("123456"); wechatUser.setPassword(encryptPass); wechatUser.setType(UserConstant.USER_TYPE_NORMAL); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallDeliveryOrderController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallDeliveryOrderController.java index 1d2514ca..e7d44c64 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallDeliveryOrderController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallDeliveryOrderController.java @@ -8,6 +8,7 @@ import cc.hiver.core.entity.User; import cc.hiver.core.entity.Worker; import cc.hiver.core.service.WorkerService; import cc.hiver.core.serviceimpl.JPushServiceImpl; +import cc.hiver.mall.entity.MallAdPosition; import cc.hiver.mall.entity.MallDeliveryOrder; import cc.hiver.mall.entity.MallOrder; import cc.hiver.mall.pojo.query.MallDeliveryOrderPageQuery; @@ -85,67 +86,64 @@ public class MallDeliveryOrderController { //棣栧厛浠庣紦瀛樹腑鏌ヨ Map cacheResult = waitOrderCacheUtil.getAll(q); - cacheResult.put("mallAds",mallAdPositionService.getAdsByRegionId(q.getRegionId(),q.getPaths())); + List cathList = mallAdPositionService.getAdsByRegionId(q.getRegionId(),q.getPaths()); if (cacheResult != null) { - return new ResultUtil().setData(cacheResult); - } - - //缂撳瓨鏈懡涓紝鏌ヨ鏁版嵁搴 - Map result = new HashMap<>(); - result.put("mallAds",mallAdPositionService.getAdsByRegionId(q.getRegionId(),q.getPaths())); - if (q.getDeliveryType() == 4 && StrUtil.isNotBlank(q.getWorkerId())) { - //鍏堟煡褰撳墠鐢ㄦ埛鎸囨淳鍗曟湭纭鎺ュ崟鏁伴噺 涓嶇敤鍒嗛〉 - q.setHallOnly(false); - q.setGetAreaId(null); - q.setPutAreaId(null); - q.setPageSize(100); - //闅忎究缁欎釜鍊硷紝鎸囨淳鍗曚笉鍖哄垎绫诲瀷 - q.setDeliveryType(null); - IPage page = mallDeliveryOrderService.pageDelivery(q); - result.put("records", page.getRecords()); - result.put("total", page.getTotal()); - result.put("size", page.getSize()); - result.put("current", page.getCurrent()); - result.put("pages", page.getPages()); - result.put("zhipaiCount", page.getTotal()); - //鍐嶆煡澶栧崠銆佸揩閫掋佽窇鑵垮緟鎺ユ暟 - result.put("orderCount", mallDeliveryOrderService.countOrdersByType(q.getRegionId())); - return new ResultUtil().setData(result); + cacheResult.put("mallAds",cathList); }else{ - if (Boolean.TRUE.equals(q.getHallOnly())) { - Integer deliveryType = q.getDeliveryType(); - String getAreaId = q.getGetAreaId(); - String putAreaId = q.getPutAreaId(); - if(StrUtil.isNotBlank(q.getWorkerId())){ - //鍏堟煡褰撳墠鐢ㄦ埛鎸囨淳鍗曟湭纭鎺ュ崟鏁伴噺 - q.setHallOnly(false); - q.setGetAreaId(null); - q.setPutAreaId(null); - //闅忎究缁欎釜鍊硷紝鎸囨淳鍗曚笉鍖哄垎绫诲瀷 - q.setDeliveryType(null); - //涓嶅垎椤 - q.setPageSize(100); - IPage page = mallDeliveryOrderService.pageDelivery(q); - result.put("zhipaiCount", page.getTotal()); + cacheResult = new HashMap<>(); + cacheResult.put("mallAds",cathList); + if (q.getDeliveryType() == 4 && StrUtil.isNotBlank(q.getWorkerId())) { + //鍏堟煡褰撳墠鐢ㄦ埛鎸囨淳鍗曟湭纭鎺ュ崟鏁伴噺 涓嶇敤鍒嗛〉 + q.setHallOnly(false); + q.setGetAreaId(null); + q.setPutAreaId(null); + q.setPageSize(100); + //闅忎究缁欎釜鍊硷紝鎸囨淳鍗曚笉鍖哄垎绫诲瀷 + q.setDeliveryType(null); + IPage page = mallDeliveryOrderService.pageDelivery(q); + cacheResult.put("records", page.getRecords()); + cacheResult.put("total", page.getTotal()); + cacheResult.put("size", page.getSize()); + cacheResult.put("current", page.getCurrent()); + cacheResult.put("pages", page.getPages()); + cacheResult.put("zhipaiCount", page.getTotal()); + //鍐嶆煡澶栧崠銆佸揩閫掋佽窇鑵垮緟鎺ユ暟 + cacheResult.put("orderCount", mallDeliveryOrderService.countOrdersByType(q.getRegionId())); + }else{ + if (Boolean.TRUE.equals(q.getHallOnly())) { + Integer deliveryType = q.getDeliveryType(); + String getAreaId = q.getGetAreaId(); + String putAreaId = q.getPutAreaId(); + if(StrUtil.isNotBlank(q.getWorkerId())){ + //鍏堟煡褰撳墠鐢ㄦ埛鎸囨淳鍗曟湭纭鎺ュ崟鏁伴噺 + q.setHallOnly(false); + q.setGetAreaId(null); + q.setPutAreaId(null); + //闅忎究缁欎釜鍊硷紝鎸囨淳鍗曚笉鍖哄垎绫诲瀷 + q.setDeliveryType(null); + //涓嶅垎椤 + q.setPageSize(100); + IPage page = mallDeliveryOrderService.pageDelivery(q); + cacheResult.put("zhipaiCount", page.getTotal()); + } + //鍏朵粬绫诲瀷澶栧崠銆佸揩閫掋佽窇鑵垮緟鎺ュ崟鏁版嵁 + q.setHallOnly(true); + q.setGetAreaId(getAreaId); + q.setPutAreaId(putAreaId); + q.setDeliveryType(deliveryType); + q.setWorkerId(null); + IPage page1 = mallDeliveryOrderService.pageDelivery(q); + cacheResult.put("records", page1.getRecords()); + cacheResult.put("total", page1.getTotal()); + cacheResult.put("size", page1.getSize()); + cacheResult.put("current", page1.getCurrent()); + cacheResult.put("pages", page1.getPages()); + //澶栧崠銆佸揩閫掋佽窇鑵垮緟鎺ユ暟 + cacheResult.put("orderCount", mallDeliveryOrderService.countOrdersByType(q.getRegionId())); } - //鍏朵粬绫诲瀷澶栧崠銆佸揩閫掋佽窇鑵垮緟鎺ュ崟鏁版嵁 - q.setHallOnly(true); - q.setGetAreaId(getAreaId); - q.setPutAreaId(putAreaId); - q.setDeliveryType(deliveryType); - q.setWorkerId(null); - IPage page1 = mallDeliveryOrderService.pageDelivery(q); - result.put("records", page1.getRecords()); - result.put("total", page1.getTotal()); - result.put("size", page1.getSize()); - result.put("current", page1.getCurrent()); - result.put("pages", page1.getPages()); - //澶栧崠銆佸揩閫掋佽窇鑵垮緟鎺ユ暟 - result.put("orderCount", mallDeliveryOrderService.countOrdersByType(q.getRegionId())); - return new ResultUtil().setData(result); } } - return new ResultUtil().setData(result); + return new ResultUtil().setData(cacheResult); } @PostMapping("/countOrderByStatus") diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WechatPayController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WechatPayController.java index 6e5f244c..563e4889 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WechatPayController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WechatPayController.java @@ -98,6 +98,12 @@ public class WechatPayController { String description = request.get("description"); String outTradeNo = request.get("outTradeNo"); + String userRequireMake = request.get("userRequireMake"); + if(userRequireMake != null && userRequireMake.equals("1")){ + MallOrder order = mallOrderService.getById(outTradeNo); + order.setUserRequireMake(1); + mallOrderService.updateById(order); + } if(description.equals("澧炲姞閰嶉佷剑閲")){ outTradeNo = "ORDERDE_" + outTradeNo; }else{ 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 8fb09ac5..809af027 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 @@ -379,7 +379,7 @@ public class WorkerController { // ---- 浠庤鍗曠紦瀛樿幏鍙栬閰嶉佸憳鐨勫緟瀹屾垚璁㈠崟锛岀粺璁″悇鐘舵佹暟閲 ---- List workerOrders = workerOrderCacheUtil.getAllAsList(w.getWorkerId()); - int orderWaitCount = waitOrderCacheUtil.getAllByWorkerId(w.getWorkerId(),dto.getRegionId()); // status=0 寰呮帴鍗 + int orderWaitCount = waitOrderCacheUtil.getAllByWorkerId(w.getWorkerId(),dto.getRegionId()) == null ? 0 : waitOrderCacheUtil.getAllByWorkerId(w.getWorkerId(),dto.getRegionId()); // status=0 寰呮帴鍗 int orderGetCount = 0; // status=1 寰呭彇璐 int orderPutCount = 0; // status=2 寰呴佽揪 boolean hasSamePutArea = false; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/CreateOrderDTO.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/CreateOrderDTO.java index e0cb333d..5e213796 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/CreateOrderDTO.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/CreateOrderDTO.java @@ -36,6 +36,9 @@ public class CreateOrderDTO { @ApiModelProperty(value = "鍙栬揣鍖哄煙ID(鍟嗘埛)") private String getAreaId; + @ApiModelProperty(value = "鑷彇璁㈠崟鐢ㄦ埛瑕佹眰鍑洪 榛樿mull 1涓虹敤鎴疯姹") + private Integer userRequireMake; + @ApiModelProperty(value = "閫佽揣鍖哄煙ID(鐢ㄦ埛鏀惰揣鍦板潃鍏宠仈鍖哄煙id)") private String putAreaId; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallDeliveryOrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallDeliveryOrderServiceImpl.java index 3e24e6db..4eac0847 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallDeliveryOrderServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallDeliveryOrderServiceImpl.java @@ -141,9 +141,9 @@ public class MallDeliveryOrderServiceImpl extends ServiceImpl pageDelivery(MallDeliveryOrderPageQuery q) { - if (Boolean.TRUE.equals(q.getHallOnly())) { + /*if (Boolean.TRUE.equals(q.getHallOnly())) { q.setPageSize(PAGE_SIZE_TWENTY); - } + }*/ IPage page = new Page<>(q.getPageNum(), q.getPageSize()); page = this.baseMapper.selectPageVO(page, q); @@ -515,6 +515,20 @@ public class MallDeliveryOrderServiceImpl extends ServiceImpl 宸插畬鎴 if (StringUtils.isNotBlank(delivery.getOrderId())) { @@ -579,13 +593,13 @@ public class MallDeliveryOrderServiceImpl extends ServiceImpl workerOrders = workerOrderCacheUtil.getAllAsList(workerId); if(workerOrders != null){ - int orderWaitCount = waitOrderCacheUtil.getAllByWorkerId(workerId,regionId); // status=0 寰呮帴鍗 + int orderWaitCount = waitOrderCacheUtil.getAllByWorkerId(workerId,regionId) == null ? 0 : waitOrderCacheUtil.getAllByWorkerId(workerId,regionId); // status=0 寰呮帴鍗 int orderGetCount = 0; // status=1 寰呭彇璐 int orderPutCount = 0; // status=2 寰呴佽揪 @@ -816,7 +830,7 @@ public class MallDeliveryOrderServiceImpl extends ServiceImpl workerOrders = workerOrderCacheUtil.getAllAsList(workerId); if(workerOrders != null){ - int orderWaitCount = waitOrderCacheUtil.getAllByWorkerId(workerId,regionId); // status=0 寰呮帴鍗 + int orderWaitCount = waitOrderCacheUtil.getAllByWorkerId(workerId,regionId) == null ? 0 : waitOrderCacheUtil.getAllByWorkerId(workerId,regionId); // status=0 寰呮帴鍗 int orderGetCount = 0; // status=1 寰呭彇璐 int orderPutCount = 0; // status=2 寰呴佽揪 diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderGroupServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderGroupServiceImpl.java index 1ca1311d..98291568 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderGroupServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderGroupServiceImpl.java @@ -4,9 +4,11 @@ import cc.hiver.core.common.constant.SettingConstant; import cc.hiver.core.common.sms.SmsUtil; import cc.hiver.core.entity.Worker; import cc.hiver.core.service.WorkerService; +import cc.hiver.core.serviceimpl.JPushServiceImpl; import cc.hiver.mall.dao.mapper.*; import cc.hiver.mall.entity.*; import cc.hiver.mall.pojo.vo.MallOrderVO; +import cc.hiver.mall.service.ShopService; import cc.hiver.mall.service.mybatis.MallOrderGroupService; import cc.hiver.mall.service.mybatis.MallOrderService; import cc.hiver.mall.service.mybatis.MallUserCouponService; @@ -54,9 +56,18 @@ public class MallOrderGroupServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); + qw.eq(cc.hiver.mall.entity.ShopTakeaway::getShopId, order.getShopId()); + List list = shopTakeawayMapper.selectList(qw); + if (list != null && !list.isEmpty() && list.get(0).getCookingTime() != null) { + cookTimeMins = list.get(0).getCookingTime(); + } + } catch (Exception e) { + log.error("鑾峰彇 ShopTakeaway cookingTime 寮傚父: {}", e.getMessage()); + } + orderAsyncProducer.sendDelayMessage(order.getId(), "Shop_Cook_Timeout", cookTimeMins * 60 * 1000L); + } + } + /** * 鏋勫缓杩斿洖 VO */ 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 fc0d2841..0cb3d214 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 @@ -287,10 +287,10 @@ public class MallOrderServiceImpl extends ServiceImpl 鏀逛负寰呮垚鍥 @@ -976,9 +981,6 @@ public class MallOrderServiceImpl extends ServiceImpl= 1) { - applyMerchantRefund(delivery.getWorkerId(),order, "鐢ㄦ埛鐢宠鍙栨秷璁㈠崟閫娆",refundType,refundTypeStatus); - } // 10鍒嗛挓鍐峰嵈鏈 if (group.getSuccessTime() != null) { long diffMs = System.currentTimeMillis() - group.getSuccessTime().getTime(); @@ -986,12 +988,16 @@ public class MallOrderServiceImpl extends ServiceImpl= 1) { + applyMerchantRefund(delivery.getWorkerId(),order, "鐢ㄦ埛鐢宠鍙栨秷璁㈠崟閫娆",refundType,refundTypeStatus); + }else{ + // 鍏佽鍙栨秷 + cancelDeliveryOrderByOrderId(order.getId()); + autoRefund(order, "鎴愬洟鍚庣敤鎴峰彇娑堣鍗曪紝绯荤粺閫娆"); + restoreStock(order.getId()); + //鎶㈠崟澶у巺缂撳瓨鍘绘帀 + waitOrderCacheUtil.remove(delivery.getRegionId(), delivery.getId()); + } } else { // 鑷彇锛堝緟娑堣垂锛夆啋 寰呭晢瀹跺悓鎰忛娆 applyMerchantRefund(null,order, "鐢ㄦ埛鐢宠鍙栨秷璁㈠崟閫娆",refundType,refundTypeStatus); @@ -1173,12 +1179,12 @@ public class MallOrderServiceImpl extends ServiceImpl duw = new LambdaUpdateWrapper<>(); - duw.eq(MallDeliveryOrder::getOrderId, mallRefundRecord.getOrderId()) - .set(MallDeliveryOrder::getStatus, 4); - mallDeliveryOrderMapper.update(null, duw); - //鏇存柊缂撳瓨 - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(MallDeliveryOrder::getOrderId, mallRefundRecord.getOrderId()); - MallDeliveryOrder deliveryOrder = mallDeliveryOrderMapper.selectOne(qw); - workerOrderCacheUtil.remove(deliveryOrder.getWorkerId(),deliveryOrder.getId()); + //闈㈠闈㈡嫾鍥 + if(mallRefundRecord.getOrderType() == STATUS_WAIT_PICKUP){ + MallDeliveryOrder delivery = mallDeliveryOrderMapper.selectByGroupId(mallRefundRecord.getOrderId()); + //鏇存柊閰嶉佸崟 + if(delivery.getStatus() != 4){ + LambdaUpdateWrapper duw = new LambdaUpdateWrapper<>(); + duw.eq(MallDeliveryOrder::getOrderId, delivery.getOrderId()) + .set(MallDeliveryOrder::getStatus, 4); + mallDeliveryOrderMapper.update(null, duw); + //鏇存柊缂撳瓨 + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(MallDeliveryOrder::getOrderId, delivery.getOrderId()); + MallDeliveryOrder deliveryOrder = mallDeliveryOrderMapper.selectOne(qw); + workerOrderCacheUtil.remove(delivery.getWorkerId(),delivery.getId()); + } + }else{ + //鏇存柊閰嶉佸崟 + LambdaUpdateWrapper duw = new LambdaUpdateWrapper<>(); + duw.eq(MallDeliveryOrder::getOrderId, mallRefundRecord.getOrderId()) + .set(MallDeliveryOrder::getStatus, 4); + mallDeliveryOrderMapper.update(null, duw); + //鏇存柊缂撳瓨 + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(MallDeliveryOrder::getOrderId, mallRefundRecord.getOrderId()); + MallDeliveryOrder deliveryOrder = mallDeliveryOrderMapper.selectOne(qw); + workerOrderCacheUtil.remove(deliveryOrder.getWorkerId(),deliveryOrder.getId()); + } } wechatPayUtil.refund(mallRefundRecord.getOrderId(), mallRefundRecord.getRefundAmount().multiply(new BigDecimal(100)).longValue(), mallRefundRecord.getRefundAmount().multiply(new BigDecimal(100)).longValue()); if(mallRefundRecord.getLinkId().toUpperCase().startsWith("W")){ diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WaitOrderCacheUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WaitOrderCacheUtil.java index 47a83cba..db33cc84 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WaitOrderCacheUtil.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WaitOrderCacheUtil.java @@ -318,7 +318,7 @@ public class WaitOrderCacheUtil { filteredList.sort(buildComparator(q)); // 鍒嗛〉锛堟姠鍗曞ぇ鍘呮瘡椤20鏉★級 - int pageSize = 20; + int pageSize = q.getPageSize(); int pageNum = q.getPageNum(); long total = filteredList.size(); long pages = total > 0 ? (total + pageSize - 1) / pageSize : 0; diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/MallDeliveryOrderMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/MallDeliveryOrderMapper.xml index 62888d66..ace3a0d7 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/MallDeliveryOrderMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/MallDeliveryOrderMapper.xml @@ -39,6 +39,7 @@ + @@ -50,7 +51,7 @@ d.receiver_name, d.receiver_phone, d.receiver_address, d.shop_name, d.shop_phone, d.shop_address, d.delivery_type, d.number_code, d.region_id,d.remark, d.all_count, d.phone_number, d.get_codes, d.get_pictures, d.is_big, - d.is_return,d.worker_name, d.arrive_time,d.new_worker + d.is_return,d.worker_name, d.arrive_time,d.new_worker,d.worker_phone FROM mall_delivery_order d @@ -124,7 +125,7 @@ d.receiver_name, d.receiver_phone, d.receiver_address, d.shop_name, d.shop_phone, d.shop_address, d.delivery_type, d.number_code, d.region_id,d.remark, d.all_count, d.phone_number, d.get_codes, d.get_pictures, - d.is_big,d.is_return,d.worker_name,d.arrive_time,d.new_worker + d.is_big,d.is_return,d.worker_name,d.arrive_time,d.new_worker,d.worker_phone FROM mall_delivery_order d d.status not in (-1,4) @@ -173,7 +174,8 @@ d.status, d.create_time, d.accept_time, d.get_time, d.must_finish_time, d.finish_time, d.receiver_name, d.receiver_phone, d.receiver_address, d.shop_name, d.shop_phone, d.shop_address, d.delivery_type, d.number_code, - d.region_id,d.remark, d.all_count, d.phone_number, d.get_codes, d.get_pictures, d.is_big,d.is_return,d.worker_name,d.arrive_time,d.new_worker + d.region_id,d.remark, d.all_count, d.phone_number, d.get_codes, d.get_pictures, + d.is_big,d.is_return,d.worker_name,d.arrive_time,d.new_worker,d.worker_phone FROM mall_delivery_order d where d.group_id = (select id from mall_order_group where 1 = 1 diff --git a/hiver-modules/hiver-social/src/main/java/cc/hiver/social/controller/WechatController.java b/hiver-modules/hiver-social/src/main/java/cc/hiver/social/controller/WechatController.java index 0ce25149..3fa341db 100644 --- a/hiver-modules/hiver-social/src/main/java/cc/hiver/social/controller/WechatController.java +++ b/hiver-modules/hiver-social/src/main/java/cc/hiver/social/controller/WechatController.java @@ -151,16 +151,15 @@ public class WechatController { final User u = securityUtil.getCurrUser(); String key = "username::" + u.getUsername(); u.setMobile(phoneNumber); - u.setUsername(phoneNumber); userService.update(u); // 鍒犻櫎缂撳瓨 redisTemplate.delete(key); - User newUser = userService.findByMobile(phoneNumber); - final String keyNew = "username::" + newUser.getUsername(); + //User newUser = userService.findByMobile(phoneNumber); + final String keyNew = "username::" + u.getUsername(); // 缂撳瓨 final Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd hh:mm:ss").create(); - redisTemplateHelper.set(keyNew, gson.toJson(newUser), tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); - final String accessToken = securityUtil.getToken(userService.userToDTO(newUser), true); + redisTemplateHelper.set(keyNew, gson.toJson(u), tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); + final String accessToken = securityUtil.getToken(userService.userToDTO(u), true); Map map = new HashMap<>(); map.put("mobile",phoneNumber); map.put("accessToken",accessToken);