From f7ba13eed9729fef5046dc7572e061d275d7d3b0 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 21 Mar 2023 13:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B93-18=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java | 3 ++-
 .../mallplus/oms/service/impl/OmsOrderServiceImpl.java      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java
index 8a7a15e..b0537be 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java
@@ -22,7 +22,8 @@ public class OrderParam {
     //使用的积分数
     private Integer useIntegration;
     //支付方式
-    private Integer payType = 1;
+//    private Integer payType = 1;
+    private Integer payType = 0;
     private Integer offline;// 0 送货 1 自取
     private String lading_mobile; //自取人电话
     private String lading_name; //自取人姓名
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
index 21e8b45..d8e7da1 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
@@ -2196,10 +2196,10 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         //总金额+运费-促销优惠-优惠券优惠-积分抵扣
         BigDecimal payAmount = order.getTotalAmount()
                 .add(order.getFreightAmount())
-                .subtract(order.getPromotionAmount())
+                /*.subtract(order.getPromotionAmount())*/
                 .subtract(order.getCouponAmount())
-                .subtract(order.getIntegrationAmount())
-                .subtract(order.getVipAmount());
+                /*.subtract(order.getIntegrationAmount())*/;
+//                .subtract(order.getVipAmount());
         return payAmount;
     }