|
@@ -333,11 +333,17 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
//能否线上判断付供应商是否大于订单金额
|
|
|
// orderCommonService.getDiscernReceiptAndSetOrder(order);
|
|
|
// boolean payButton = order.isPayButton();
|
|
|
- // 总成本>应付 不能线上 B2B<10块
|
|
|
+ // 总成本>应付 不能线上
|
|
|
//todo 判断线上/线下余额
|
|
|
-// log.info("成本: " + totalCostPrice + "================== 实付: " + order.getPayableAmount());
|
|
|
+ Double userMoney = orderCommonMapper.findUserMoney(orderId);
|
|
|
+ Double onlineMoney = orderCommonMapper.findOnlineMoney(orderId);
|
|
|
+ userMoney = userMoney == null ? 0 : userMoney;
|
|
|
+ onlineMoney = onlineMoney == null ? 0 : onlineMoney;
|
|
|
if (MathUtil.compare(totalCostPrice, order.getPayableAmount()) > 0 || order.getPayableAmount() <= 0.01) {
|
|
|
map.put("onlinePay", 2);
|
|
|
+ } else if (userMoney > 0 && onlineMoney > 0 && !"31".equals(order.getStatus())) {
|
|
|
+ //当线上余额和线下余额两者都抵扣了但只抵扣了部分订单金额,订单只能走线下支付,点击提交订单,跳转到线下支付页面
|
|
|
+ map.put("onlinePay", 2);
|
|
|
} else {
|
|
|
map.put("onlinePay", 1);
|
|
|
}
|
|
@@ -1120,7 +1126,8 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /**todo 佣金要改进入采美网络
|
|
|
+ /**
|
|
|
+ * todo 佣金要改进入采美网络
|
|
|
* 分账详情
|
|
|
*/
|
|
|
private List<SplitAccountPo> setSplitAccountDetail(OrderVo order, PayParamBo payParam) {
|