|
@@ -166,6 +166,7 @@ public class SubmitOrderListener {
|
|
|
} else {
|
|
|
mergerOrder.setNextPay(Boolean.TRUE);
|
|
|
}
|
|
|
+ Double sumItemA = 0.0;
|
|
|
// 订单商品名称
|
|
|
StringBuilder orderProdName = new StringBuilder(100);
|
|
|
List<OrderItem> orderItems = new ArrayList<>();
|
|
@@ -208,6 +209,8 @@ public class SubmitOrderListener {
|
|
|
actualItem = Arith.div(actualItem, 100);
|
|
|
}
|
|
|
}
|
|
|
+ //用于判定是否需要微信支付
|
|
|
+ sumItemA = Arith.add(sumItemA, actualItem);
|
|
|
// 实际订单项支付金额
|
|
|
// 根据platform来计算是否优先扣减积分抵扣
|
|
|
orderItem.setActualTotal(actualItem);
|
|
@@ -232,7 +235,6 @@ public class SubmitOrderListener {
|
|
|
orderProdName.deleteCharAt(orderProdName.length() - 1);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
order.setShopId(shopId);
|
|
|
order.setOrderNumber(orderNumber);
|
|
|
// 订单商品名称
|
|
@@ -243,7 +245,7 @@ public class SubmitOrderListener {
|
|
|
order.setTotal(shopCartOrderDto.getTotal());
|
|
|
// 实际总额
|
|
|
order.setActualTotal(actualTotal);
|
|
|
-
|
|
|
+ order.setNextPay(sumItemA > 0);//true是需要微信支付
|
|
|
order.setChannelId(Long.valueOf(mergerOrder.getPlatform()));
|
|
|
order.setUpdateTime(now);
|
|
|
order.setCreateTime(now);
|