|
|
@@ -140,8 +140,7 @@ public class SubmitOrderListener {
|
|
|
com.yami.shop.bean.model.Order order = new com.yami.shop.bean.model.Order();
|
|
|
order.setIsPayed(0);
|
|
|
order.setStatus(OrderStatus.UNPAY.value());
|
|
|
- double actualTotal = Arith.add(shopCartOrderDto.getActualTotal(), shopCartOrderDto.getTransfee());
|
|
|
- boolean isUseTransfee = false;
|
|
|
+ double actualTotal = shopCartOrderDto.getActualTotal();
|
|
|
//企业用户才进这个判断,并且该用户的积分必须大于0
|
|
|
if (1 == mergerOrder.getPlatform() && null != point && point > 0) {
|
|
|
// 计算商品金额和积分
|
|
|
@@ -161,16 +160,16 @@ public class SubmitOrderListener {
|
|
|
order.setOffsetPoints(Long.valueOf(String.valueOf(sub).split("\\.")[0]));
|
|
|
actualTotal = sub / 100;
|
|
|
mergerOrder.setNextPay(Boolean.TRUE);
|
|
|
-
|
|
|
}
|
|
|
} else {
|
|
|
mergerOrder.setNextPay(Boolean.TRUE);
|
|
|
}
|
|
|
- Double sumItemA = 0.0;
|
|
|
+ double sumItemA = 0.0;
|
|
|
// 订单商品名称
|
|
|
StringBuilder orderProdName = new StringBuilder(100);
|
|
|
List<OrderItem> orderItems = new ArrayList<>();
|
|
|
List<ShopCartItemDiscountDto> shopCartItemDiscounts = shopCartOrderDto.getShopCartItemDiscounts();
|
|
|
+ boolean isUseTransfee = false;
|
|
|
for (ShopCartItemDiscountDto shopCartItemDiscount : shopCartItemDiscounts) {
|
|
|
List<ShopCartItemDto> shopCartItems = shopCartItemDiscount.getShopCartItems();
|
|
|
for (ShopCartItemDto shopCartItem : shopCartItems) {
|
wang