ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -385,6 +385,20 @@ //添加快递号和修改订单状态 order.setExpressJson(code); order.setOrderStatus(2); //添加查询快递信息队列 //一小时后定时查询快递信息 SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData(); JSONObject jsonObject = JSON.parseObject(systemConfig.getContent()); Integer waitTime = jsonObject.getInteger("waitTime"); redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC)); JSONObject jsonObject1 = JSON.parseObject(code); String com = jsonObject1.getString("com"); String num = jsonObject1.getString("num"); UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class); MapTrackKD100Vo mapTrackKD100Vo = ExpressDeliveryUtil.kd100MapTrack(com, num, order.getDeliverProvince() + order.getDeliverCity(), userAddress.getProvince() + userAddress.getCity()); order.setExpressResult(JSON.toJSONString(mapTrackKD100Vo)); this.updateById(order); return R.ok(); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -418,12 +418,14 @@ BigDecimal bigDecimal = BigDecimal.ZERO; for (MyShoppingCartVo myShoppingCartVo : goodsList) { bigDecimal = bigDecimal.add(myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber()))); myShoppingCartVo.setEarnSpendingPoints(myShoppingCartVo.getEarnSpendingPoints() * myShoppingCartVo.getNumber()); } confirmOrderVo.setOrderMoney(bigDecimal); }else{ int sum = 0; for (MyShoppingCartVo myShoppingCartVo : goodsList) { sum += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber()); myShoppingCartVo.setEarnSpendingPoints(myShoppingCartVo.getEarnSpendingPoints() * myShoppingCartVo.getNumber()); } confirmOrderVo.setOrderPoint(sum); } @@ -1148,11 +1150,7 @@ userCouponClient.editUserCoupon(userCoupon); } } //添加查询快递信息队列 if(StringUtils.isNotEmpty(order.getExpressJson())){ //一小时后定时查询快递信息 redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(1).toEpochSecond(ZoneOffset.UTC)); } //删除购物车数据 userid = tokenService.getLoginUserApplet().getUserid(); @@ -1265,11 +1263,7 @@ userCouponClient.editUserCoupon(userCoupon); } } //添加查询快递信息队列 if(StringUtils.isNotEmpty(order.getExpressJson())){ //一小时后定时查询快递信息 redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(1).toEpochSecond(ZoneOffset.UTC)); } } //积分支付 if(3 == shoppingCartPayment.getPaymentType()){ @@ -1392,14 +1386,7 @@ //删除购物车数据 this.removeBatchByIds(ids); } //添加查询快递信息队列 if(StringUtils.isNotEmpty(order.getExpressJson())){ //一小时后定时查询快递信息 SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData(); JSONObject jsonObject = JSON.parseObject(systemConfig.getContent()); Integer waitTime = jsonObject.getInteger("waitTime"); redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC)); } } //添加账户余额支付明细 @@ -1491,11 +1478,6 @@ userCoupon.setUseTime(LocalDateTime.now()); userCouponClient.editUserCoupon(userCoupon); } } //添加查询快递信息队列 if(StringUtils.isNotEmpty(order.getExpressJson())){ //一小时后定时查询快递信息 redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(1).toEpochSecond(ZoneOffset.UTC)); } //删除购物车数据 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
@@ -41,9 +41,9 @@ List<Region> list = regionService.list(); List<Region> collect = list.stream().filter(s -> s.getParentId() == 0).collect(Collectors.toList()); for (Region region : collect) { List<Region> collect1 = list.stream().filter(s -> s.getParentId() == region.getId()).collect(Collectors.toList()); List<Region> collect1 = list.stream().filter(s -> s.getParentId().equals(region.getId())).collect(Collectors.toList()); for (Region region1 : collect1) { List<Region> collect2 = list.stream().filter(s -> s.getParentId() == region1.getId()).collect(Collectors.toList()); List<Region> collect2 = list.stream().filter(s -> s.getParentId().equals(region1.getId())).collect(Collectors.toList()); region1.setChilds(collect2); } region.setChilds(collect1); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -114,6 +114,9 @@ shop.setCustomOrderNumber(0); shop.setAppUserId(appUser.getId()); String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false); if(!StringUtils.hasLength(city)){ city = "510100"; } shop.setProvinceCode(city.substring(0, 2) + "0000"); shop.setCityCode(city.substring(0, 4) + "00"); shop.setDistrictCode(city); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java
@@ -1,5 +1,6 @@ package com.ruoyi.other.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -50,7 +51,8 @@ Long userid = tokenService.getLoginUser().getUserid(); SysUser sysUser = sysUserClient.getSysUser(userid).getData(); List<Shop> shopList = shopService.list(); List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>() .eq(Shop::getAppUserId,sysUser.getAppUserId())); Integer sPoint = 0; Integer shopCommissionPoint = 0; Integer subShopCommissionPoint = 0; ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -72,9 +72,11 @@ if(first.isPresent()){ AppUserShop appUserShop = first.get(); Technician technician = technicianService.getOne(new LambdaQueryWrapper<Technician>().eq(Technician::getAppUserId, appUserShop.getAppUserId()) .eq(Technician::getShopId, appUserShop.getShopId()).eq(Technician::getDelFlag, 0).eq(Technician::getStatus, 1)); .eq(Technician::getShopId, appUserShop.getShopId()).eq(Technician::getDelFlag, 0).eq(Technician::getStatus, 2)); if(null != technician){ technicianId = technician.getId(); } } List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(pageInfo, shopId, status, technicianId); for (TechnicianSubscribeVO technicianSubscribeVO : list) { String id = technicianSubscribeVO.getId();
