java/qijisheng.git

			@@ -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();
			}

			@@ -1150,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();
			@@ -1267,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()){
			@@ -1394,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));
			}

			}

			//添加账户余额支付明细
			@@ -1493,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-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史