|
|
@@ -648,9 +648,9 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
String userName = baseMapper.getUserNameByUserId(order.getUserId());
|
|
|
// 支付记录
|
|
|
List<DiscernReceiptVo> discernReceiptList = orderCommonMapper.getShopOrderDiscernReceipt(shopOrderId);
|
|
|
+ AtomicDouble receiptAmount = new AtomicDouble(0d);
|
|
|
+ AtomicBoolean offlineFlag = new AtomicBoolean(false);
|
|
|
if (!discernReceiptList.isEmpty()) {
|
|
|
- AtomicDouble receiptAmount = new AtomicDouble(0d);
|
|
|
- AtomicBoolean offlineFlag = new AtomicBoolean(false);
|
|
|
discernReceiptList.forEach(discernReceipt -> {
|
|
|
if (2 == discernReceipt.getPayWay()) {
|
|
|
offlineFlag.set(true);
|
|
|
@@ -665,8 +665,9 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
if (offlineFlag.get()) {
|
|
|
return ResponseJson.error("已经线下支付过，只能线下支付！", null);
|
|
|
}
|
|
|
- shop.setReceiptAmount(receiptAmount.get());
|
|
|
}
|
|
|
+ shop.setReceiptAmount(receiptAmount.get());
|
|
|
+ shop.setObligation(MathUtil.sub(shop.getRealPay(),receiptAmount.get()).doubleValue());
|
|
|
// 总成本
|
|
|
AtomicDouble totalCostPrice = new AtomicDouble(0d);
|
|
|
// 商品数据
|
