zhijiezhao 3 anos atrás
pai
commit
bf2787c1da

+ 2 - 0
src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -154,4 +154,6 @@ public interface OrderCommonMapper {
     Double findUserMoney(Integer orderId);
 
     Double findOnlineMoney(Integer orderId);
+
+    Integer finduserBean(Integer orderId);
 }

+ 3 - 0
src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

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

+ 3 - 0
src/main/resources/mapper/OrderCommonMapper.xml

@@ -504,4 +504,7 @@
           AND balanceType = 10
           AND delflag = 0
     </select>
+    <select id="finduserBean" resultType="java.lang.Integer">
+        select userBeans from cm_order where orderID = #{orderId}
+    </select>
 </mapper>