From 62bf99d419e470f5556f21682d0d8ee8b9e20412 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 12 Mar 2021 16:24:04 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 8fd2018..28f98c3 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 @@ -80,7 +80,6 @@ @Transactional(rollbackFor = Exception.class) public void createOrder(ShopOrder orderDto) { - //判断是否存在需要同步的产品,只有绑定了erp中产品的才同步 boolean needTb=false; for (ShopOrderDetails orderItemDto : orderDto.getDetails()) { @@ -93,6 +92,7 @@ BizUser bizUser = bizUserService.findByOpenId(orderDto.getUserId()); SysOrder order = new SysOrder(); + //TODO 根据公司id区分 SysVipInfo vipInfo = vipDao.selectByPhone(bizUser.getPhoneNumber()); if(SysVipInfo.UNDEAL_VIP==vipInfo.getIsDeal()){ //非成交客户下单更新客户为成交客户 @@ -101,7 +101,7 @@ } //获取订单归属门店 - order.setCompanyId(vipInfo.getCompanyId()); + order.setCompanyId(orderDto.getCompanyId()); order.setShopId(Long.parseLong(orderDto.getStoreId()+"")); //同步的订单订单编号保持一致 order.setOrderNo(orderDto.getOrderNo()); @@ -116,7 +116,7 @@ order.setTotal(orderDto.getOrderMoney().doubleValue()); order.setZkTotal(orderDto.getOrderMoney().doubleValue()); order.setPayTime(new Date()); - order.setArrears(0); + order.setArrears(0D); int i = sysOrderDao.insert(order); // 创建订单明细,并计算总价与折扣总价 int count = 0; -- Gitblit v1.9.1