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 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; }