|
@@ -42,6 +42,8 @@ import java.util.*;
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
|
|
|
|
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.o;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* Description
|
|
* Description
|
|
*
|
|
*
|
|
@@ -1156,6 +1158,7 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
splitAmount = MathUtil.sub(splitAmount, procedureFee).doubleValue();
|
|
splitAmount = MathUtil.sub(splitAmount, procedureFee).doubleValue();
|
|
// 商品数据
|
|
// 商品数据
|
|
List<OrderProductVo> orderProductList = orderCommonMapper.getOrderProductByOrderId(order.getOrderId());
|
|
List<OrderProductVo> orderProductList = orderCommonMapper.getOrderProductByOrderId(order.getOrderId());
|
|
|
|
+ orderProductList.removeIf(o -> 998 == o.getShopId() && orderCommonMapper.finduserBean(o.getOrderId()) > 0);
|
|
for (OrderProductVo orderProduct : orderProductList) {
|
|
for (OrderProductVo orderProduct : orderProductList) {
|
|
double costPrice = MathUtil.mul(orderProduct.getCostPrice(), orderProduct.getNum()).doubleValue();
|
|
double costPrice = MathUtil.mul(orderProduct.getCostPrice(), orderProduct.getNum()).doubleValue();
|
|
// 不含税能开发票
|
|
// 不含税能开发票
|