联合丽格

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -64,6 +64,7 @@ public class OrderCommonService {
         if (StringUtils.isEmpty(order.getShopOrderIds())) {
             return;
         }
+        Integer organizeId = orderCommonMapper.getOrganizeId(order.getOrderId());
         String[] shopOrderIdArr = order.getShopOrderIds().split(",");
         List<String> shopOrderIds = Arrays.asList(shopOrderIdArr);
         List<ShopOrderVo> shopOrderList = orderCommonMapper.getShopOrderList(shopOrderIds);
@@ -91,7 +92,7 @@ public class OrderCommonService {
             orderProductList.forEach(orderProduct -> {
                 // 不含税可开票商品,单价/折后单价在原基础上加上税费
                 boolean taxFlag = false;
-                if (0 == order.getOrganizeId()) {
+                if (0 == organizeId) {
                     taxFlag = (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && (Integer.valueOf(1).equals(orderProduct.getInvoiceType()) || Integer.valueOf(2).equals(orderProduct.getInvoiceType())));
                 }
                 if (taxFlag) {

src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -20,6 +20,13 @@ public interface OrderCommonMapper {
      * @param orderId 订单Id
      */
     int countLogisticsBatch(Integer orderId);
+
+    /**
+     * 组织
+     * @param orderId
+     * @return
+     */
+    Integer getOrganizeId(Integer orderId);
     /**
      * 根据子订单Id查询子订单列表
      * @param shopOrderIds 子订单Ids

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -973,7 +973,7 @@ public class SubmitServiceImpl implements SubmitService {
             // 总价(含税) = totalFee
             shopOrder.setTotalAmount(shopProductFee.get());
             // 联合丽格无折扣
-            if (1 == organizeId) {
+            if (0 == organizeId) {
                 // 总价(含税) = totalFee
                 shopOrder.setTotalAmount(shopAmount.get());
             }

src/main/resources/mapper/OrderCommonMapper.xml

@@ -6,6 +6,9 @@
         FROM cm_logistics_batch
         WHERE orderID = #{orderId}
     </select>
+    <select id="getOrganizeId" resultType="java.lang.Integer">
+        select organizeID as organizeId from cm_order where orderId = #{orderId}
+    </select>
     <select id="getShopOrderList" resultType="com.caimei365.order.model.vo.ShopOrderVo">
         SELECT
         cso.shopOrderID AS shopOrderId,