From 60de92280e4cd66a914f41b0681656a62cde346d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 14:50:52 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 0c5b27d..4ac605c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.QRCodeGenerator;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.enums.OrderStatus;
@@ -41,6 +42,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
@@ -157,9 +159,8 @@
// 收货地址
String addressJson = order.getAddressJson();
UserAddress userAddress = new UserAddress();
- if (StringUtils.isNotEmpty(addressJson)){
+ if (2 == order.getDistributionMode()){
userAddress = JSONObject.parseObject(addressJson, UserAddress.class);
-
}
// 优惠券
String couponJson = order.getCouponJson();
@@ -175,13 +176,7 @@
orderActivityInfo = JSONObject.parseObject(activityJson, OrderActivityInfo.class);
}
OrderDetailVO orderDetailVO = new OrderDetailVO();
-
- if (CollectionUtil.isNotEmpty(orderGoods)){
- String goodJson = orderGoods.get(0).getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
- orderDetailVO.setDistributionMode(goods.getDistributionMode());
- }
-
+ orderDetailVO.setDistributionMode(order.getDistributionMode());
Technician technician = new Technician();
if (order.getTechnicianId() != null){
R<Technician> shopdetail = technicianClient.shopdetail(order.getTechnicianId());
@@ -215,6 +210,22 @@
orderDetailVO.setLatitude(shop.getLatitude());
orderDetailVO.setShopId(shop.getId());
orderDetailVO.setTechnicianName(technician.getName());
+ orderDetailVO.setTechnicianId(technician.getId());
+ if(order.getOrderType() == 1){
+ List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
+ if(data.size() > 0){
+ Long id = data.get(0).getId();
+ orderDetailVO.setTechnicianSubscribeId(id.toString());
+ }
+ }
+ // 生成核销码BASE64
+ try {
+ String base64 = QRCodeGenerator.generateQRCodeBase64(order.getOrderNumber(), 124, 124);
+ orderDetailVO.setWriteOffCode(base64);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ServiceException("生成核销码失败");
+ }
return orderDetailVO;
}
@@ -438,17 +449,19 @@
appUser.setBalance(balance.add(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
appUser.setShopAmount(appUser.getShopAmount().subtract(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
//查询最后一次的消费订单
- Order order1 = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, order.getAppUserId()).eq(Order::getPayStatus, 2).eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(2, 3, 4, 8)).ne(Order::getId, order.getId()).last(" order by create_time desc limit 0, 1"));
+ Order order1 = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, order.getAppUserId()).eq(Order::getPayStatus, 2)
+ .eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 8)).ne(Order::getId, order.getId()).last(" order by create_time desc limit 0, 1"));
if(null != order1){
appUser.setLastShopTime(order1.getCreateTime());
}else{
- appUser.setLastShopTime(LocalDateTime.MIN);
+ appUser.setLastShopTime(null);
}
//构建账户余额流水明细
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setChangeType(6);
balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(paymentAmount);
@@ -529,6 +542,7 @@
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setChangeType(6);
balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(expressAmount);
@@ -757,18 +771,13 @@
orderInfo.setExpressAmount(order.getExpressAmount());
orderInfo.setPaymentAmount(order.getPaymentAmount());
orderInfo.setGetPoint(order.getGetPoint());
- if(StringUtils.isNotEmpty(order.getAddressJson())){
+ if(2 == order.getDistributionMode()){
UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone());
userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
orderInfo.setAddress(userAddress.getRecieveAddress());
- }
- if(StringUtils.isNotEmpty(order.getExpressJson()) && !"NULL".equals(order.getExpressJson())){
- JSONObject jsonObject = JSON.parseObject(order.getExpressJson());
- String com = jsonObject.getString("com");
- String num = jsonObject.getString("num");
- QueryKD100Vo queryKD100Vo = ExpressDeliveryUtil.kd100QueryTrack(com, num);
- orderInfo.setExpress(queryKD100Vo);
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(order.getExpressResult(), MapTrackKD100Vo.class);
+ orderInfo.setExpress(mapTrackKD100Vo);
}
List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0));
int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum();
--
Gitblit v1.7.1