~jiangyouyao/beauty-erp.git

			@@ -3,11 +3,16 @@

			import com.matrix.biz.bean.BizUser;
			import com.matrix.biz.service.BizUserService;
			import com.matrix.core.constance.MatrixConstance;
			import com.matrix.core.tools.LogUtil;
			import com.matrix.core.tools.StringUtils;
			import com.matrix.system.common.constance.AppConstance;
			import com.matrix.system.common.dao.BusParameterSettingsDao;
			import com.matrix.system.constance.Dictionary;
			import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
			import com.matrix.system.fenxiao.dao.ShopSalesmanOrderDao;
			import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;
			import com.matrix.system.fenxiao.entity.ShopSalesmanOrder;
			import com.matrix.system.hive.bean.*;
			import com.matrix.system.hive.dao.*;
			import com.matrix.system.hive.service.CodeService;
			@@ -21,6 +26,7 @@
			import com.matrix.system.shopXcx.dao.ShopSkuDao;
			import com.rabbitmq.client.DeliverCallback;
			import com.rabbitmq.client.Delivery;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Component;
			import org.springframework.transaction.annotation.Transactional;
			@@ -78,8 +84,15 @@
			@Autowired
			private ShoppingGoodsDao shoppingGoodsDao;

			@Autowired
			private ShopSalesmanOrderDao shopSalesmanOrderDao;

			@Autowired
			private ShopSalesmanGradeDao shopSalesmanGradeDao;

			@Transactional(rollbackFor = Exception.class)
			public void createOrder(ShopOrder orderDto) {
			public void synchronizationOrderToErp(ShopOrder orderDto) {

			//判断是否存在需要同步的产品，只有绑定了erp中产品的才同步
			boolean needTb=false;
			for (ShopOrderDetails orderItemDto : orderDto.getDetails()) {
			@@ -236,7 +249,9 @@
			//获取订单详情
			List<ShopOrderDetails> orderDetails = shopOrderDetailsDao.selectByOrderId(Integer.valueOf(orderId));
			order.setDetails(orderDetails);
			createOrder(order);
			//同步订单到erp
			synchronizationOrderToErp(order);

			}

			}