From 6d47ae98e2cc860299bfb976bec226d99a0bcd1b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 11:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java | 3 +--
1 files changed, 1 insertions(+), 2 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 2c9ff6d..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()) {
@@ -117,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