联合丽格

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

@@ -90,7 +90,10 @@ public class OrderCommonService {
             }
             orderProductList.forEach(orderProduct -> {
                 // 不含税可开票商品,单价/折后单价在原基础上加上税费
-                boolean taxFlag = (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && (Integer.valueOf(1).equals(orderProduct.getInvoiceType()) || Integer.valueOf(2).equals(orderProduct.getInvoiceType())));
+                boolean taxFlag = false;
+                if (0 == order.getOrganizeId()) {
+                    taxFlag = (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && (Integer.valueOf(1).equals(orderProduct.getInvoiceType()) || Integer.valueOf(2).equals(orderProduct.getInvoiceType())));
+                }
                 if (taxFlag) {
                     Double valueTax = MathUtil.div(MathUtil.mul(orderProduct.getPrice(), orderProduct.getTaxRate()), 100).doubleValue();
                     orderProduct.setPrice(MathUtil.add(orderProduct.getPrice(), valueTax).doubleValue());

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

@@ -14,6 +14,7 @@ import com.caimei365.order.model.po.CartPo;
 import com.caimei365.order.model.vo.*;
 import com.caimei365.order.service.CartClubService;
 import com.caimei365.order.service.RemoteCallService;
+import com.caimei365.order.utils.ImageUtil;
 import com.caimei365.order.utils.MathUtil;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.AtomicDouble;
@@ -1030,7 +1031,14 @@ public class CartClubServiceImpl implements CartClubService {
                         // 迭代器设置商品信息
                         for (CartItemVo cartItemVo : productList) {
                             // 设置商品图片及税费
-                            boolean taxFlag = productService.setCartItemImgAndTax(cartItemVo);
+                            boolean taxFlag = false;
+                            if (0 == organizeId) {
+                                taxFlag = productService.setCartItemImgAndTax(cartItemVo);
+                            } else {
+                                // 图片路径
+                                String image = ImageUtil.getImageUrl("product", cartItemVo.getImage(), domain);
+                                cartItemVo.setImage(image);
+                            }
                             // 是否充值商品
                             boolean recharge = productService.isRechargeProduct(cartItemVo.getProductId());
                             if (recharge) {
@@ -1787,7 +1795,13 @@ public class CartClubServiceImpl implements CartClubService {
         shopIds.add(shop.getShopId());
         List<CartShopVo> shopList = new ArrayList<>();
         // 设置商品图片及税费
-        boolean taxFlag = productService.setCartItemImgAndTax(cartItemVo);
+        boolean taxFlag = false;
+        if (0 == organizeId) {
+            taxFlag = productService.setCartItemImgAndTax(cartItemVo);
+        } else {
+            String image = ImageUtil.getImageUrl("product", cartItemVo.getImage(), domain);
+            cartItemVo.setImage(image);
+        }
         // 促销活动（总）
         List<PromotionsVo> totalPromotions = new ArrayList<>();
         // 统计商品总金额

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

@@ -375,6 +375,11 @@ public class OrderClubServiceImpl implements OrderClubService {
                     voucherImageDto.setImg(str);
                     orderClubMapper.insertVoucherImage(voucherImageDto);
                 }
+            } else {
+                VoucherImageDto voucherImageDto = new VoucherImageDto();
+                voucherImageDto.setVoucherId(voucherDto.getId());
+                voucherImageDto.setImg(voucherDto.getVoucherImgs());
+                orderClubMapper.insertVoucherImage(voucherImageDto);
             }
         } else {
             return ResponseJson.error(-1,"请上传支付凭证",null);

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

@@ -580,7 +580,10 @@ public class SubmitServiceImpl implements SubmitService {
                     secondHandOrderFlag = true;
                 }
                 // 是否添加税费，不含税商品 开票需添加税费
-                boolean taxFlag = (Integer.valueOf(0).equals(product.getIncludedTax()) && (Integer.valueOf(1).equals(product.getInvoiceType()) || Integer.valueOf(2).equals(product.getInvoiceType())));
+                boolean taxFlag = false;
+                if (0 == organizeId) {
+                    taxFlag = (Integer.valueOf(0).equals(product.getIncludedTax()) && (Integer.valueOf(1).equals(product.getInvoiceType()) || Integer.valueOf(2).equals(product.getInvoiceType())));
+                }
                 Double shopTax = 0d;
                 // 图片路径
                 String image = ImageUtil.getImageUrl("product", product.getImage(), domain);
@@ -842,7 +845,12 @@ public class SubmitServiceImpl implements SubmitService {
                 // 单个商品付供应商总税费
                 product.setShouldPayTotalTax(MathUtil.mul(shopTax, productNum).doubleValue());
                 // 付供应商 商品费=成本价*(购买数量  + 赠品数量)
-                Double costAmount = MathUtil.mul(costPrice, MathUtil.add(productNum, presentNum)).doubleValue();
+                Double costAmount = null;
+                if (0 == organizeId) {
+                    costAmount = MathUtil.mul(costPrice, MathUtil.add(productNum, presentNum)).doubleValue();
+                } else {
+                    costAmount = MathUtil.mul(product.getPrice(), MathUtil.add(productNum, presentNum)).doubleValue();
+                }
                 product.setShopProductAmount(costAmount);
                 log.info("product.getShopProductAmount()***"+product.getShopProductAmount());
                 //应付供应商(单)=成本价+供应商税费(单)
@@ -1379,6 +1387,9 @@ public class SubmitServiceImpl implements SubmitService {
             });
             // 设置组织Id
             shopOrder.setOrganizeId(organizeId);
+            if (0 != organizeId) {
+                shopOrder.setRealPay(shopOrder.getNeedPayAmount());
+            }
             /*
              * 保存子订单
              */

src/main/resources/mapper/CartClubMapper.xml

@@ -468,9 +468,10 @@
                p.productType,
                p.returnGoodsStutas
         FROM cm_mall_product_sku cmps
+                 LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cmps.mallProductId
                  LEFT JOIN cm_sku cs ON cmps.skuId = cs.skuId
                  LEFT JOIN product p ON p.productID = cs.productId
-        WHERE p.validFlag = '2'
+        WHERE cmop.validFlag = '1'
           AND cs.skuId = #{skuId}
     </select>