Merge remote-tracking branch 'origin/test' into test

2024-10-14 16:04:59 +08:00
parent b18d98b823 226b37af80
commit 14d88e8a63
1 changed files with 5 additions and 0 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1089,6 +1089,11 @@ public class PayService {

            //修改主单状态
            orderInfo.setStatus("closed");
+            if("alipay".equalsIgnoreCase(payType)){
+                orderInfo.setPayType("ali_lite");
+            }else if("wechat".equalsIgnoreCase(payType)){
+                orderInfo.setPayType("wx_lite");
+            }
            orderInfo.setPayType(payType);
            orderInfo.setPayOrderNo(payOrderNO);
            orderInfo.setPayAmount(orderInfo.getOrderAmount());