From 16fdf754104f0d38fd80e49936dc91cf90505af9 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 17 Jan 2021 19:34:47 +0800
Subject: [PATCH] 消息提醒

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
index 2fbc032..1aeb371 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
@@ -86,6 +86,7 @@
         }
 
         //获取订单归属门店
+        order.setCompanyId(bizUser.getCompanyId());
         order.setShopId(Long.parseLong(orderDto.getStoreId()+""));
         //同步的订单订单编号保持一致
         order.setOrderNo(orderDto.getOrderNo());
@@ -131,11 +132,6 @@
             orderItem.setPrice(orderItemDto.getPrice().doubleValue());
             orderItem.setZkPrice(orderItemDto.getPrice().doubleValue());
             orderItem.setGoodsId(shoppingGoods.getId());
-            if (shoppingGoods.getGoodType().equals(Dictionary.SHOPPING_GOODS_TYPE_JJCP)) {
-                orderItem.setAssembleId(shoppingGoods.getAssembleGoods().get(0).getId());
-            } else if (shoppingGoods.getGoodType().equals(Dictionary.SHOPPING_GOODS_TYPE_XM)) {
-                orderItem.setAssembleId(shoppingGoods.getAssembleProj().get(0).getId());
-            }
 
             // 设置对应产品的id
             switch (shoppingGoods.getGoodType()) {

--
Gitblit v1.9.1