From 9585a2de57cdca59da0c45a66e2931d0a5f1b0b4 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Mon, 3 Nov 2025 10:58:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=94=AF=E4=BB=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../co/yixiang/yshop/module/order/enums/PayTypeEnum.java | 1 +
 .../service/storeorder/AppStoreOrderServiceImpl.java     | 2 ++
 .../order/service/storeorder/StoreOrderServiceImpl.java  | 9 ++-------
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/yshop-drink-boot3/yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/PayTypeEnum.java b/yshop-drink-boot3/yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/PayTypeEnum.java
index d68f4aa..a2a73cc 100644
--- a/yshop-drink-boot3/yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/PayTypeEnum.java
+++ b/yshop-drink-boot3/yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/PayTypeEnum.java
@@ -18,6 +18,7 @@ import java.util.stream.Stream;
 @AllArgsConstructor
 public enum PayTypeEnum {
 
+	CASH("cash","现金支付"),
 	ALI("alipay","支付宝支付"),
 	WEIXIN("weixin","微信支付"),
 	YUE("yue","余额支付"),
diff --git a/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/AppStoreOrderServiceImpl.java b/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/AppStoreOrderServiceImpl.java
index d8a1594..23a3363 100644
--- a/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/AppStoreOrderServiceImpl.java
+++ b/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/AppStoreOrderServiceImpl.java
@@ -521,6 +521,8 @@ public class AppStoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper,Store
             payTypeMsg = PayTypeEnum.YUE.getDesc();
         }else if (PayTypeEnum.ALI.getValue().equals(payType)) {
             payTypeMsg = PayTypeEnum.ALI.getDesc();
+        }else if(PayTypeEnum.CASH.getValue().equals(payType)){
+            payTypeMsg = PayTypeEnum.CASH.getDesc();
         }
         billService.expend(userInfo.getId(), "购买商品",
                 BillDetailEnum.CATEGORY_1.getValue(),
diff --git a/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/StoreOrderServiceImpl.java b/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/StoreOrderServiceImpl.java
index c03137f..56a2125 100644
--- a/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/StoreOrderServiceImpl.java
+++ b/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/StoreOrderServiceImpl.java
@@ -190,13 +190,8 @@ public class StoreOrderServiceImpl implements StoreOrderService {
         // 校验存在
         validateStoreOrderExists(id);
         StoreOrderDO storeOrderDO = storeOrderMapper.selectById(id);
-        storeOrderDO.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue());
-        storeOrderDO.setPayTime(LocalDateTime.now());
-        storeOrderMapper.updateById(storeOrderDO);
-
-        //增加状态
-        storeOrderStatusService.create(storeOrderDO.getUid(),storeOrderDO.getId(), OrderLogEnum.OFFLINE_PAY.getValue(),
-                OrderLogEnum.OFFLINE_PAY.getDesc());
+        //下线支付
+        appStoreOrderService.paySuccess(storeOrderDO.getOrderId(),PayTypeEnum.CASH.getValue());
     }
 
     @Override