~jiangyouyao/beauty-erp.git

			@@ -26,7 +26,6 @@
			import org.springframework.transaction.annotation.Transactional;

			import java.io.IOException;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			@@ -82,8 +81,19 @@
			@Transactional(rollbackFor = Exception.class)
			public void createOrder(ShopOrder orderDto) {

			//判断是否存在需要同步的产品，只有绑定了erp中产品的才同步
			boolean needTb=false;
			for (ShopOrderDetails orderItemDto : orderDto.getDetails()) {
			ShopSku shopSku = shopSkuDao.selectById(orderItemDto.getsId());
			if (StringUtils.isNotBlank(shopSku.getStockCode())) {
			needTb=true;
			}
			}
			if(needTb){

			BizUser bizUser = bizUserService.findByOpenId(orderDto.getUserId());
			SysOrder order = new SysOrder();
			//TODO 根据公司id区分
			SysVipInfo vipInfo = vipDao.selectByPhone(bizUser.getPhoneNumber());
			if(SysVipInfo.UNDEAL_VIP==vipInfo.getIsDeal()){
			//非成交客户下单更新客户为成交客户
			@@ -92,7 +102,7 @@
			}

			//获取订单归属门店
			order.setCompanyId(vipInfo.getCompanyId());
			order.setCompanyId(orderDto.getCompanyId());
			order.setShopId(Long.parseLong(orderDto.getStoreId()+""));
			//同步的订单订单编号保持一致
			order.setOrderNo(orderDto.getOrderNo());
			@@ -110,9 +120,6 @@
			order.setArrears(0);
			int i = sysOrderDao.insert(order);
			// 创建订单明细,并计算总价与折扣总价
			// 总价
			double total = 0;
			double zkTotal = 0;
			int count = 0;
			// 设置订单条目
			for (ShopOrderDetails orderItemDto : orderDto.getDetails()) {
			@@ -210,6 +217,10 @@
			flow.setShopId(sourceOrder.getShopId());
			flow.setCompanyId(sourceOrder.getCompanyId());
			sysOrderFlowDao.insert(flow);
			}else{
			LogUtil.info("不存在需要同步的产品");
			}


			}