From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 13 +++++--------
1 files changed, 5 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 8f77d93..5f72b8a 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
@@ -226,7 +226,7 @@
@Override
public void fanli() {
// 鑾峰彇涓荤孩鍖�
- List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 100);
+ List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 1000);
//
// /**
// * 闇�瑕佸疄鏃舵洿鏂板緟杩斿埄鐨勮鍗�
@@ -457,7 +457,7 @@
public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {
if (orderList != null)
for (TaoBaoWeiQuanOrder order : orderList) {
- if (order.getState().equalsIgnoreCase("缁存潈鎴愬姛")) {
+ if (order.getState().contains("缁存潈鎴愬姛")) {
CMQManager.getInstance().addWeiQuanOrderMsg(order);
}
}
@@ -753,12 +753,9 @@
Date minDate = new Date(TimeUtil
.convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));
- long validCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
- CommonOrder.STATE_JS, minDate, maxDate);
- long weiQuanCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
- CommonOrder.STATE_WQ, minDate, maxDate);
- long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
- CommonOrder.STATE_SX, minDate, maxDate);
+ long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS, minDate, maxDate);
+ long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ, minDate, maxDate);
+ long invalidCount =hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX, minDate, maxDate);
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,
(int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
--
Gitblit v1.8.0