From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 98 insertions(+), 12 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
index 82885bb..be09c2c 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
@@ -9,15 +9,14 @@
import com.oying.modules.pc.product.service.ProductService;
import com.oying.modules.pc.store.domain.Store;
import com.oying.modules.pc.store.service.StoreService;
-import com.oying.modules.sh.domain.Order;
-import com.oying.modules.sh.domain.OrderProductSnapshot;
+import com.oying.modules.sh.domain.*;
import com.oying.modules.sh.domain.request.GeneratorOrder;
import com.oying.modules.sh.domain.request.ProductOrder;
import com.oying.modules.sh.domain.request.SubmitOrder;
import com.oying.modules.sh.domain.vo.OrderInfo;
+import com.oying.modules.sh.domain.vo.OrderResponse;
import com.oying.modules.sh.domain.vo.ProductInfo;
-import com.oying.modules.sh.service.OrderProductSnapshotService;
-import com.oying.modules.sh.service.UserAddressService;
+import com.oying.modules.sh.service.*;
import com.oying.utils.*;
import com.oying.utils.enums.GenerateEnum;
import com.oying.utils.enums.OrderStatusEnum;
@@ -26,7 +25,6 @@
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.sh.service.OrderService;
import com.oying.modules.sh.domain.dto.OrderQueryCriteria;
import com.oying.modules.sh.mapper.OrderMapper;
import org.springframework.stereotype.Service;
@@ -53,25 +51,34 @@
private final ProductService productService;
private final SwiftPassService swiftPassService;
private final OrderProductSnapshotService productSnapshotService;
+ private final OrderAddressSnapshotService addressSnapshotService;
private final RedisUtils redisUtils;
private final StoreService storeService;
+ private final OrderOperationLogService operationLogService;
private final static String DESCRIBE = "哦应：";
@Override
public PageResult<Order> queryAll(OrderQueryCriteria criteria, Page<Object> page) {
- return PageUtil.toPage(orderMapper.findAll(criteria, page));
+ criteria.setOffset(page.offset());
+ List<Order> list = orderMapper.findAll(criteria, criteria.getBlurry());
+ Long total = orderMapper.countAll(criteria, criteria.getBlurry());
+ return PageUtil.toPage(list, total);
}
@Override
public List<Order> queryAll(OrderQueryCriteria criteria) {
- return orderMapper.findAll(criteria);
+ return orderMapper.findAll(criteria, criteria.getBlurry());
}
@Override
@Transactional(rollbackFor = Exception.class)
public synchronized Order submitOrder(SubmitOrder submit, HttpServletRequest request) {
- if (!submit.getPayType().equals(PayTypeEnum.HWC)) {
- throw new BadRequestException("支付类型暂未开放");
+ switch (submit.getPayType()) {
+ case HWC:
+ case HWC2:
+ break;
+ default:
+ throw new BadRequestException("支付类型暂未开放");
}
String orderNum = redisUtils.generateOrderSn(GenerateEnum.ORDER.getKey());
// 总金额
@@ -82,7 +89,6 @@
OrderInfo info = generatorOrder(generator);
// 商品快照
List<OrderProductSnapshot> snapshots = new ArrayList<>();
-
for (ProductInfo productInfo : info.getProducts()) {
Product product = productInfo.getProduct();
OrderProductSnapshot snapshot = new OrderProductSnapshot();
@@ -112,17 +118,26 @@
if (openid == null || openid.isEmpty()) {
throw new BadRequestException("OPENID错误");
}
+
+ // 门店信息
+ Store store = storeService.getById(submit.getStoreId());
+ if (amount.compareTo(store.getDeliveryMinimum()) >= 0) {
+ throw new BadRequestException("起送金额：" + store.getDeliveryMinimum());
+ }
// 订单信息
Order order = new Order();
order.setOrderNum(orderNum);
+ order.setOrderStoreNum(redisUtils.generateOrderSn(Math.toIntExact(submit.getStoreId())).substring(orderNum.length() - 4));
order.setOrderStatus(OrderStatusEnum.ZERO.getKey());
order.setOrderStatusDescribe(OrderStatusEnum.ZERO.getValue());
+ order.setOrderRemark(submit.getRemark() != null ? submit.getRemark() : "");
+ order.setOrderTime(submit.getDateTime());
order.setUserId(SecurityUtils.getCurrentUserId());
order.setUsername(SecurityUtils.getCurrentUsername());
- Store store = storeService.getMerchantStore(submit.getStoreId());
order.setStoreId(submit.getStoreId());
order.setStoreName(store.getStoreName());
order.setStoreLogo(store.getLogoImageUrl());
+ order.setSendPrice(store.getDeliveryFee());
order.setOrderDescribe(DESCRIBE + submit.getStoreId());
order.setOriginalPrice(amount);
order.setPaidPrice(amount);
@@ -150,9 +165,33 @@
order.setPayMessage(PayStateEnum.SUCCESS.getValue());
order.setPayTime(DateUtil.localDateTimeFormat(now.toLocalDateTime(), DateUtil.SDF_YMDHMS));
}
+ UserAddress address = userAddressService.getById(submit.getAddressId());
+ OrderAddressSnapshot addressSnapshot = getOrderAddressSnapshot(orderNum, address);
+
+ addressSnapshotService.save(addressSnapshot);
orderMapper.insert(order);
productSnapshotService.saveBatch(snapshots);
+
+ order.setProductSnapshots(new HashSet<>(snapshots));
+ operationLogService.create(order, addressSnapshot);
return order;
+ }
+
+ private static OrderAddressSnapshot getOrderAddressSnapshot(String orderNum, UserAddress address) {
+ OrderAddressSnapshot snapshot = new OrderAddressSnapshot();
+ snapshot.setOrderNum(orderNum);
+ snapshot.setReceiverName(address.getReceiverName());
+ snapshot.setReceiverPhone(address.getReceiverPhone());
+ snapshot.setProvince(address.getProvince() != null ? address.getProvince() : "");
+ snapshot.setCity(address.getCity() != null ? address.getCity() : "");
+ snapshot.setDistrict(address.getDistrict() != null ? address.getDistrict() : "");
+ snapshot.setStreet(address.getStreet() != null ? address.getStreet() : "");
+ snapshot.setShortAddress(address.getShortAddress());
+ snapshot.setDetail(address.getDetail());
+ snapshot.setLongitude(address.getLongitude());
+ snapshot.setLatitude(address.getLatitude());
+ snapshot.setTag(address.getTag());
+ return snapshot;
}
@Override
@@ -165,7 +204,7 @@
if (product == null) {
throw new BadRequestException("商品不存在");
}
- if (product.getStoreId().equals(criteria.getStoreId())) {
+ if (!product.getStoreId().equals(criteria.getStoreId())) {
throw new BadRequestException("不支持跨门店下单");
}
if (!product.getStatus().equals(ProductStatusEnum.AVAILABLE.getValue())) {
@@ -196,8 +235,55 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public OrderResponse getByOrderNum(String orderNum) {
+ OrderResponse response = new OrderResponse();
+ response.setOrder(orderMapper.getByOrderNum(orderNum));
+ response.setAddress(addressSnapshotService.queryByOrderNum(orderNum));
+ response.setOperation(operationLogService.getByOrderNum(orderNum));
+ return response;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void paySuccess(OrderResponse order) {
+ orderMapper.updateOrderStatus(order.getOrder().getOrderNum(), OrderStatusEnum.TWO.getKey(), OrderStatusEnum.TWO.getValue());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePayStatus(String orderNum, PayStateEnum payState, String payMessage, String payTime) {
+ orderMapper.updatePayStatus(orderNum, payState.getKey(), payMessage, payTime);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void closeOrder(String orderNum) {
+ Order order = orderMapper.getByOrderNum(orderNum);
+ if (order == null) {
+ throw new BadRequestException("订单不存在");
+ }
+ PayTypeEnum anEnum = PayTypeEnum.find(order.getPayType());
+ switch (anEnum) {
+ case HWC:
+ case HWC2:
+ JSONObject object = swiftPassService.query(orderNum, anEnum);
+ if (object.getString("trade_state").equals(PayStateEnum.SUCCESS.getKey())) {
+ throw new BadRequestException("订单已支付");
+ }
+ if (object.getString("trade_state").equals(PayStateEnum.CLOSED.getKey())) {
+ throw new BadRequestException("订单已关闭");
+ }
+ swiftPassService.closeOrder(orderNum, anEnum);
+ break;
+ }
+ orderMapper.updateCloseStatus(orderNum, PayStateEnum.CLOSED.getKey());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void create(Order resources) {
orderMapper.insert(resources);
+ throw new BadRequestException("未开放");
}
@Override
--
Gitblit v1.9.3