From cc88ea25dc395b5d1b9b5ac9ddba7713c667c1c1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 十二月 2019 12:45:38 +0800
Subject: [PATCH] 专题与banner设置版本管理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 951c95d..9b15a02 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -24,8 +24,6 @@
import com.aliyun.openservices.ons.api.transaction.TransactionProducer;
import com.aliyun.openservices.ons.api.transaction.TransactionStatus;
import com.google.gson.Gson;
-import com.opensymphony.xwork2.util.Element;
-import com.sun.org.apache.xml.internal.serializer.ElemDesc;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
@@ -63,6 +61,7 @@
import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;
+import com.yeshi.fanli.service.inter.elme.ElmeOrderProcessService;
import com.yeshi.fanli.service.inter.elme.ElmeOrderService;
import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
@@ -281,10 +280,11 @@
for (TaoBaoOrder taoBaoOrder : orderList) {
ElmeOrder elmeOrder = createElmeOrder(taoBaoOrder);
try {
- elmeOrderService.addOrder(elmeOrder);
+ elmeOrderProcessService.processOrder(elmeOrder);
} catch (ElmeOrderException e) {
e.printStackTrace();
}
+
}
}
}
@@ -583,9 +583,7 @@
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
- if (1 > 0)
- return;
- //
+
try {
orderMoneySettleService.inviteSettleJD(uid);
} catch (OrderMoneySettleException e) {
@@ -1196,6 +1194,9 @@
@Resource
private ElmeOrderService elmeOrderService;
+
+ @Resource
+ private ElmeOrderProcessService elmeOrderProcessService;
/**
* 鑾峰彇楗夸簡涔堝彲浠ヨ繑鍒╃殑绾㈠寘
*
@@ -1261,13 +1262,12 @@
@Transactional
private void addHongBaoWithMQ(List<CommonOrderAddResultDTO> commonOrderList, String orderId, Long uid,
int sourceType, int hongBaoType) {
-
final List<CommonOrder> coList = convertCommonOrder(commonOrderList);
int resultCode = 0;
try {
long time = TimeUtil.convertToTimeTemp("2019-12-06", "yyyy-MM-dd");
if (!Constant.IS_TEST)
- time = TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd");
+ time = TimeUtil.convertToTimeTemp("2019-12-20", "yyyy-MM-dd");
if (coList.get(0).getThirdCreateTime().getTime() < time)
resultCode = hongBaoV2Service.addHongBao(coList, hongBaoType);
--
Gitblit v1.8.0