From c6a6f44907b37efe3f2e21b9d8f9350897fa92c0 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 07 Jul 2025 16:41:20 +0800
Subject: [PATCH] 小程序:提交订单（完善）
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 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 fa8fdea..82885bb 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
@@ -2,10 +2,13 @@
import com.alibaba.fastjson2.JSONObject;
import com.oying.exception.BadRequestException;
+import com.oying.modules.hwc.domain.HwcResponse;
import com.oying.modules.hwc.service.SwiftPassService;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.domain.enums.ProductStatusEnum;
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.request.GeneratorOrder;
@@ -17,6 +20,7 @@
import com.oying.modules.sh.service.UserAddressService;
import com.oying.utils.*;
import com.oying.utils.enums.GenerateEnum;
+import com.oying.utils.enums.OrderStatusEnum;
import com.oying.utils.enums.PayStateEnum;
import com.oying.utils.enums.PayTypeEnum;
import lombok.RequiredArgsConstructor;
@@ -50,6 +54,8 @@
private final SwiftPassService swiftPassService;
private final OrderProductSnapshotService productSnapshotService;
private final RedisUtils redisUtils;
+ private final StoreService storeService;
+ private final static String DESCRIBE = "哦应：";
@Override
public PageResult<Order> queryAll(OrderQueryCriteria criteria, Page<Object> page) {
@@ -98,12 +104,55 @@
snapshot.setPayState(PayStateEnum.NOTPAY.getKey());
snapshots.add(snapshot);
}
+ Timestamp now = DateUtil.getTimeStamp();
// 下单后30分钟失效
- Timestamp time = DateUtil.addMinute(DateUtil.getTimeStamp(), 30);
+ Timestamp time = DateUtil.addMinute(now, 30);
String expire = DateUtil.localDateTimeFormat(time.toLocalDateTime(), DateUtil.SDF_YMDHMS);
- swiftPassService.pay(StringUtils.getIp(request), BigDecimalUtils.yuanToCents(amount).toString(), expire,SecurityUtils.getCurrentUserId());
+ String openid = SecurityUtils.getCurrentOpenid();
+ if (openid == null || openid.isEmpty()) {
+ throw new BadRequestException("OPENID错误");
+ }
+ // 订单信息
+ Order order = new Order();
+ order.setOrderNum(orderNum);
+ order.setOrderStatus(OrderStatusEnum.ZERO.getKey());
+ order.setOrderStatusDescribe(OrderStatusEnum.ZERO.getValue());
+ 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.setOrderDescribe(DESCRIBE + submit.getStoreId());
+ order.setOriginalPrice(amount);
+ order.setPaidPrice(amount);
+ order.setActuallyPayPrice(amount);
+ order.setOpenid(openid);
+ order.setPayType(submit.getPayType().getKey());
+ order.setExpireTime(expire);
+ order.setOpenid(openid);
+ Long total = BigDecimalUtils.yuanToCents(amount);
+ if (total > 0) {
+ HwcResponse response = swiftPassService.pay(StringUtils.getIp(request), total.toString(), expire,
+ DESCRIBE + submit.getStoreId(), openid, orderNum, submit.getPayType());
+ //微信支付下单放回值
+ order.setAppId(response.getAppId());
+ order.setTimestamp(response.getTimeStamp());
+ order.setNonceStr(response.getNonceStr());
+ order.setPackageVal(response.getPackageVal());
+ order.setSignType(response.getSignType());
+ order.setPaySign(response.getPaySign());
+ order.setPayState(PayStateEnum.NOTPAY.getKey());
+ order.setPayMessage(PayStateEnum.NOTPAY.getValue());
+ order.setPayTime(null);
+ } else {
+ order.setPayState(PayStateEnum.SUCCESS.getKey());
+ order.setPayMessage(PayStateEnum.SUCCESS.getValue());
+ order.setPayTime(DateUtil.localDateTimeFormat(now.toLocalDateTime(), DateUtil.SDF_YMDHMS));
+ }
+ orderMapper.insert(order);
productSnapshotService.saveBatch(snapshots);
- return null;
+ return order;
}
@Override
--
Gitblit v1.9.3