|
@@ -440,6 +440,8 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
throw new SqxException("当前订单已支付,请勿重复支付!");
|
|
throw new SqxException("当前订单已支付,请勿重复支付!");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ log.info("preOrder==>[{}],开始订单准备工作...", parentOrder.getOrderId());
|
|
|
|
|
+
|
|
|
// 获取店铺信息
|
|
// 获取店铺信息
|
|
|
// 注意:调用shopMessageService获取店铺信息,这个service对店铺的抽成比例有特殊处理(历史代码就是如此/(ㄒoㄒ)/~~)
|
|
// 注意:调用shopMessageService获取店铺信息,这个service对店铺的抽成比例有特殊处理(历史代码就是如此/(ㄒoㄒ)/~~)
|
|
|
GoodsShop goodsShop = shopMessageService.selectShopId(parentOrder.getShopId());
|
|
GoodsShop goodsShop = shopMessageService.selectShopId(parentOrder.getShopId());
|
|
@@ -470,6 +472,8 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
// 计算店铺收益
|
|
// 计算店铺收益
|
|
|
calcShopIncome(parentOrder, goodsShop);
|
|
calcShopIncome(parentOrder, goodsShop);
|
|
|
|
|
|
|
|
|
|
+ log.info("preOrder==>[{}],订单准备工作运行完成...", parentOrder.getOrderId());
|
|
|
|
|
+
|
|
|
return parentOrder;
|
|
return parentOrder;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -562,6 +566,11 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
// 支付金额减去活动优惠金额
|
|
// 支付金额减去活动优惠金额
|
|
|
parentOrder.setPayMoney(parentOrder.getPayMoney().subtract(new BigDecimal(orderBestActivity.getDiscountAmount())));
|
|
parentOrder.setPayMoney(parentOrder.getPayMoney().subtract(new BigDecimal(orderBestActivity.getDiscountAmount())));
|
|
|
|
|
|
|
|
|
|
+ log.info("preOrder==>[{}],订单匹配到优惠活动,活动名称[{}],活动优惠金额[{}]",
|
|
|
|
|
+ parentOrder.getOrderId(), orderBestActivity.getActivityTitle(), orderBestActivity.getDiscountAmount());
|
|
|
|
|
+ log.info("preOrder==>[{}],订单参加优惠活动,优惠后应付金额[{}]",
|
|
|
|
|
+ parentOrder.getOrderId(), parentOrder.getPayMoney());
|
|
|
|
|
+
|
|
|
// 保存活动参与信息
|
|
// 保存活动参与信息
|
|
|
activityPartRecordService.saveByOrderAndSuitActivityVO(parentOrder, orderBestActivity);
|
|
activityPartRecordService.saveByOrderAndSuitActivityVO(parentOrder, orderBestActivity);
|
|
|
}
|
|
}
|
|
@@ -959,8 +968,11 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
sumMoney = sumMoney.subtract(goodsShop.getErrandMoney());
|
|
sumMoney = sumMoney.subtract(goodsShop.getErrandMoney());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- BigDecimal shopMoney = sumMoney .multiply(shopRate);
|
|
|
|
|
|
|
+ BigDecimal shopMoney = sumMoney.multiply(shopRate);
|
|
|
order.setShopIncomeMoney(shopMoney.setScale(2, BigDecimal.ROUND_DOWN));
|
|
order.setShopIncomeMoney(shopMoney.setScale(2, BigDecimal.ROUND_DOWN));
|
|
|
|
|
+
|
|
|
|
|
+ log.info("preOrder==>[{}],订单计算店铺预计收益,商家佣金比例[{}],本单用户应付金额[{}],本单店铺预计收益[{}]",
|
|
|
|
|
+ order.getOrderId(), shopRate, sumMoney, order.getShopIncomeMoney());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1003,6 +1015,11 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
order.setPayMoney(payMoney);
|
|
order.setPayMoney(payMoney);
|
|
|
|
|
|
|
|
order.setCouponMoney(couponUserMoney);
|
|
order.setCouponMoney(couponUserMoney);
|
|
|
|
|
+
|
|
|
|
|
+ log.info("preOrder==>[{}],订单匹配到优惠券,优惠券ID[{}],优惠卷金额[{}]",
|
|
|
|
|
+ order.getOrderId(), order.getCouponId(), couponUserMoney);
|
|
|
|
|
+ log.info("preOrder==>[{}],订单使用优惠券后应付金额[{}]",
|
|
|
|
|
+ order.getOrderId(), order.getPayMoney());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1081,6 +1098,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
// 跑腿费设置为0
|
|
// 跑腿费设置为0
|
|
|
order.setErrandMoney(BigDecimal.ZERO);
|
|
order.setErrandMoney(BigDecimal.ZERO);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ log.info("preOrder==>[{}],订单跑腿费计算结束,跑腿费[{}],当前订单应付总价[{}]",
|
|
|
|
|
+ order.getOrderId(), order.getErrandMoney(), order.getPayMoney());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1088,6 +1108,8 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
* @param parentOrder 订单信息
|
|
* @param parentOrder 订单信息
|
|
|
*/
|
|
*/
|
|
|
private void calcOrderPriceAndPack(TbOrder parentOrder) {
|
|
private void calcOrderPriceAndPack(TbOrder parentOrder) {
|
|
|
|
|
+ log.info("preOrder==>[{}],开始计算订单金额", parentOrder.getOrderId());
|
|
|
|
|
+
|
|
|
// 商品总打包费 初始为0
|
|
// 商品总打包费 初始为0
|
|
|
BigDecimal goodsPack = BigDecimal.valueOf(0);
|
|
BigDecimal goodsPack = BigDecimal.valueOf(0);
|
|
|
// 商品总价格 初始为0,商品总价格包含总打包费
|
|
// 商品总价格 初始为0,商品总价格包含总打包费
|
|
@@ -1102,9 +1124,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
new QueryWrapper<OrderGoods>()
|
|
new QueryWrapper<OrderGoods>()
|
|
|
.eq("order_id", orderId));
|
|
.eq("order_id", orderId));
|
|
|
for (int a = 0; a < orderGoodsList.size(); a++) {
|
|
for (int a = 0; a < orderGoodsList.size(); a++) {
|
|
|
- BigDecimal goodsNum = new BigDecimal(orderGoodsList.get(a).getGoodsNum());
|
|
|
|
|
- BigDecimal goodsPrice = orderGoodsList.get(a).getGoodsPrice();
|
|
|
|
|
- BigDecimal goodsPacks = orderGoodsList.get(a).getGoodsPack();
|
|
|
|
|
|
|
+ OrderGoods orderGoods = orderGoodsList.get(a);
|
|
|
|
|
+ BigDecimal goodsNum = new BigDecimal(orderGoods.getGoodsNum());
|
|
|
|
|
+ BigDecimal goodsPrice = orderGoods.getGoodsPrice();
|
|
|
|
|
+ BigDecimal goodsPacks = orderGoods.getGoodsPack();
|
|
|
|
|
|
|
|
// 当前子订单总打包费
|
|
// 当前子订单总打包费
|
|
|
BigDecimal sumGoodsPack = goodsNum.multiply(goodsPacks);
|
|
BigDecimal sumGoodsPack = goodsNum.multiply(goodsPacks);
|
|
@@ -1116,12 +1139,22 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
payMoney = payMoney.add(multiply1);
|
|
payMoney = payMoney.add(multiply1);
|
|
|
// 当前子订单总打包费计入入父订单总商品价格
|
|
// 当前子订单总打包费计入入父订单总商品价格
|
|
|
payMoney = payMoney.add(sumGoodsPack);
|
|
payMoney = payMoney.add(sumGoodsPack);
|
|
|
|
|
+
|
|
|
|
|
+ log.info("preOrder==>[{}],订单商品[{}],单价[{}],打包价[{}],数量[{}]",
|
|
|
|
|
+ parentOrder.getOrderId(), orderGoods.getGoodsName(), goodsPrice, goodsPacks, goodsNum);
|
|
|
|
|
+ log.info("preOrder==>[{}],订单商品[{}]小计,商品小计[{}],打包价小计[{}]",
|
|
|
|
|
+ parentOrder.getOrderId(), orderGoods.getGoodsName(), multiply1, sumGoodsPack);
|
|
|
|
|
+ log.info("preOrder==>[{}],订单累计,当前商品[{}]加入后,订单总价[{}],其中打包总价[{}]",
|
|
|
|
|
+ parentOrder.getOrderId(), orderGoods.getGoodsName(), payMoney, goodsPack);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 订单设置订单总金额
|
|
// 订单设置订单总金额
|
|
|
parentOrder.setPayMoney(payMoney);
|
|
parentOrder.setPayMoney(payMoney);
|
|
|
parentOrder.setPackMoney(goodsPack);
|
|
parentOrder.setPackMoney(goodsPack);
|
|
|
|
|
+
|
|
|
|
|
+ log.info("preOrder==>[{}],订单价格计算结束,订单总价[{}],其中打包总价[{}]",
|
|
|
|
|
+ parentOrder.getOrderId(), payMoney, goodsPack);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void checkOrderGoods(TbOrder order) {
|
|
private void checkOrderGoods(TbOrder order) {
|