other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改3-18问题

Browse Source
This commit is contained in:
dimengzhe
2023-03-21 13:35:42 +08:00
parent 1bbb4a183f
commit f7ba13eed9
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java
View File

@@ -22,7 +22,8 @@ public class OrderParam {
//使用的积分数 //使用的积分数
private Integer useIntegration; private Integer useIntegration;
//支付方式 //支付方式
private Integer payType = 1; // private Integer payType = 1;
private Integer payType = 0;
private Integer offline;// 0 送货 1 自取 private Integer offline;// 0 送货 1 自取
private String lading_mobile; //自取人电话 private String lading_mobile; //自取人电话
private String lading_name; //自取人姓名 private String lading_name; //自取人姓名

6
mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
View File

@@ -2196,10 +2196,10 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
//总金额+运费-促销优惠-优惠券优惠-积分抵扣 //总金额+运费-促销优惠-优惠券优惠-积分抵扣
BigDecimal payAmount = order.getTotalAmount() BigDecimal payAmount = order.getTotalAmount()
.add(order.getFreightAmount()) .add(order.getFreightAmount())
.subtract(order.getPromotionAmount()) /*.subtract(order.getPromotionAmount())*/
.subtract(order.getCouponAmount()) .subtract(order.getCouponAmount())
.subtract(order.getIntegrationAmount()) /*.subtract(order.getIntegrationAmount())*/;
.subtract(order.getVipAmount()); // .subtract(order.getVipAmount());
return payAmount; return payAmount;
} }