From 4f5ddc24c9ce9004f14e06ef7416aaa1e3e784c5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 08 Mar 2021 16:55:28 +0800
Subject: [PATCH] 1
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 2fbc032..25caa4d 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
@@ -9,9 +9,7 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
-import com.matrix.system.hive.dao.SysOrderDao;
-import com.matrix.system.hive.dao.SysOrderItemDao;
-import com.matrix.system.hive.dao.SysVipInfoDao;
+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;
@@ -24,16 +22,17 @@
import com.rabbitmq.client.DeliverCallback;
import com.rabbitmq.client.Delivery;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 微商城订单同步到erp系统
*/
+@Component
public class OrderTask implements DeliverCallback {
@@ -73,6 +72,12 @@
@Autowired
BusParameterSettingsDao parameterSettingsDao;
+ @Autowired
+ private SysOrderFlowDao sysOrderFlowDao;
+
+ @Autowired
+ private ShoppingGoodsDao shoppingGoodsDao;
+
@Transactional(rollbackFor = Exception.class)
public void createOrder(ShopOrder orderDto) {
@@ -86,6 +91,7 @@
}
//获取订单归属门店
+ order.setCompanyId(vipInfo.getCompanyId());
order.setShopId(Long.parseLong(orderDto.getStoreId()+""));
//同步的订单订单编号保持一致
order.setOrderNo(orderDto.getOrderNo());
@@ -99,7 +105,8 @@
order.setCashPay(orderDto.getOrderMoney().doubleValue());
order.setTotal(orderDto.getOrderMoney().doubleValue());
order.setZkTotal(orderDto.getOrderMoney().doubleValue());
- order.setArrears(0);
+ order.setPayTime(new Date());
+ order.setArrears(0D);
int i = sysOrderDao.insert(order);
// 创建订单明细,并计算总价与折扣总价
// 总价
@@ -131,11 +138,6 @@
orderItem.setPrice(orderItemDto.getPrice().doubleValue());
orderItem.setZkPrice(orderItemDto.getPrice().doubleValue());
orderItem.setGoodsId(shoppingGoods.getId());
- if (shoppingGoods.getGoodType().equals(Dictionary.SHOPPING_GOODS_TYPE_JJCP)) {
- orderItem.setAssembleId(shoppingGoods.getAssembleGoods().get(0).getId());
- } else if (shoppingGoods.getGoodType().equals(Dictionary.SHOPPING_GOODS_TYPE_XM)) {
- orderItem.setAssembleId(shoppingGoods.getAssembleProj().get(0).getId());
- }
// 设置对应产品的id
switch (shoppingGoods.getGoodType()) {
@@ -192,13 +194,21 @@
orderService.setShopSelCount(sourceOrder);
SysOrderFlow flow = new SysOrderFlow();
+ flow.setFlowNo(codeService.getFlowCode() + "-" + i);
+ Long goodsId = sourceOrder.getItems().get(0).getGoodsId();
+ ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
+ flow.setFlowContent(goods.getName() + "等" + sourceOrder.getItems().size() + "件产品");
+
+ flow.setOrderId(sourceOrder.getId());
+ flow.setVipId(sourceOrder.getVipId());
+ flow.setFlowType(SysOrderFlow.FLOW_TYPE_BUY);
+
flow.setAmount(orderDto.getOrderMoney());
flow.setPayMethod("微信");
- List<SysOrderFlow> flows = new ArrayList<>();
- flows.add(flow);
- sourceOrder.setFlows(flows);
- orderService.updateAfterMoney(sourceOrder);
+ flow.setShopId(sourceOrder.getShopId());
+ flow.setCompanyId(sourceOrder.getCompanyId());
+ sysOrderFlowDao.insert(flow);
}
--
Gitblit v1.9.1