From 4705f9b4084d9ccddb601569b223f0fb41778a94 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 Aug 2021 15:28:46 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java | 56 +++-----------------------------------------------------
1 files changed, 3 insertions(+), 53 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 ddcf865..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
@@ -11,6 +11,7 @@
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.*;
@@ -25,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;
@@ -127,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;
@@ -249,59 +251,7 @@
order.setDetails(orderDetails);
//同步订单到erp
synchronizationOrderToErp(order);
- //处理分销订单
- handleExtensionOrder(order);
}
- /**
- * 处理分销订单
- * @param order
- */
- @Transactional
- void handleExtensionOrder(ShopOrder order) {
- //判读客户是否存在上级，存在则产生上级的收益
- BizUser bizUser = bizUserService.findByOpenId(order.getUserId());
- if(StringUtils.isNotBlank(bizUser.getParentOpenId())){
- LogUtil.debug("处理分销订单userOpid={}",bizUser.getOpenId());
- //存在上级
- ShopSalesmanOrder shopSalesmanOrder=new ShopSalesmanOrder();
- shopSalesmanOrder.setCompanyId(order.getCompanyId());
- shopSalesmanOrder.setCreateBy(MatrixConstance.SYSTEM_USER);
- shopSalesmanOrder.setUpdateBy(MatrixConstance.SYSTEM_USER);
- shopSalesmanOrder.setCreateTime(new Date());
- shopSalesmanOrder.setUpdateTime(new Date());
- shopSalesmanOrder.setOrderId(Long.parseLong(order.getId()+""));
- shopSalesmanOrder.setUserId(order.getUserId());
- shopSalesmanOrder.setSalesUserId(bizUser.getParentOpenId());
- shopSalesmanOrder.setRevenueType(ShopSalesmanOrder.REVENUE_TYPE_SALES);
- shopSalesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_DJS);
- Double amount=0D;
- for (ShopOrderDetails item:order.getDetails() ){
- if(StringUtils.isNotBlank(item.getShopProduct().getAttrValues())
- && item.getShopProduct().getAttrValues().contains("分销商城")){
- if(item.getShopSku().getSealesPrice()==null
- ||item.getShopSku().getSealesPrice().doubleValue()==0){
- //按分销等级计算
- BizUser salesMan=bizUserService.findByOpenId(bizUser.getParentOpenId());
- shopSalesmanGradeDao.selectById(salesMan.getSalesmanGrade())
-
- }else{
- //按产品设置的金额计算
- amount+=item.getShopSku().getSealesPrice().doubleValue();
- }
-
- }
- }
-
-
-
-
-
- }else{
- LogUtil.debug("不存在父级userOpid={}",bizUser.getOpenId());
- }
-
-
- }
}
--
Gitblit v1.9.1