From a0cd34acf14a149cc3c08b41ca4dde6938a29ecc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Wed, 07 Jul 2021 22:31:34 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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..0e20288 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
@@ -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,14 @@
@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;
@@ -93,6 +105,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 +114,7 @@
}
//获取订单归属门店
- order.setCompanyId(vipInfo.getCompanyId());
+ order.setCompanyId(orderDto.getCompanyId());
order.setShopId(Long.parseLong(orderDto.getStoreId()+""));
//同步的订单订单编号保持一致
order.setOrderNo(orderDto.getOrderNo());
@@ -116,7 +129,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;
@@ -236,7 +249,9 @@
//获取订单详情
List<ShopOrderDetails> orderDetails = shopOrderDetailsDao.selectByOrderId(Integer.valueOf(orderId));
order.setDetails(orderDetails);
- createOrder(order);
+ //同步订单到erp
+ synchronizationOrderToErp(order);
}
+
}
--
Gitblit v1.9.1