From e892ea04b56194b6208b5a902f1622f40d4c56a7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 09:10:08 +0800
Subject: [PATCH] 新增美度正式环境配置
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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..a8bb1a0 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
@@ -1,18 +1,19 @@
package com.matrix.system.shopXcx.mqTask;
-import com.matrix.biz.bean.BizUser;
-import com.matrix.biz.service.BizUserService;
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.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.ShoppingGoodsService;
import com.matrix.system.hive.service.SysOrderService;
+import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.shopXcx.bean.ShopOrder;
import com.matrix.system.shopXcx.bean.ShopOrderDetails;
import com.matrix.system.shopXcx.bean.ShopSku;
@@ -42,7 +43,7 @@
ShopOrderDetailsDao shopOrderDetailsDao;
@Autowired
- BizUserService bizUserService;
+ SysVipInfoService sysVipInfoService;
@Autowired
@@ -78,8 +79,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;
@@ -91,9 +98,8 @@
}
if(needTb){
- BizUser bizUser = bizUserService.findByOpenId(orderDto.getUserId());
+ SysVipInfo vipInfo = sysVipInfoService.findById(orderDto.getUserId());
SysOrder order = new SysOrder();
- SysVipInfo vipInfo = vipDao.selectByPhone(bizUser.getPhoneNumber());
if(SysVipInfo.UNDEAL_VIP==vipInfo.getIsDeal()){
//非成交客户下单更新客户为成交客户
vipInfo.setIsDeal(SysVipInfo.DEAL_VIP);
@@ -101,7 +107,7 @@
}
//获取订单归属门店
- order.setCompanyId(vipInfo.getCompanyId());
+ order.setCompanyId(orderDto.getCompanyId());
order.setShopId(Long.parseLong(orderDto.getStoreId()+""));
//同步的订单订单编号保持一致
order.setOrderNo(orderDto.getOrderNo());
@@ -116,7 +122,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 +242,9 @@
//获取订单详情
List<ShopOrderDetails> orderDetails = shopOrderDetailsDao.selectByOrderId(Integer.valueOf(orderId));
order.setDetails(orderDetails);
- createOrder(order);
+ //同步订单到erp
+ synchronizationOrderToErp(order);
}
+
}
--
Gitblit v1.9.1