From 28a0efc6ec16f3f82eb8e16e87269300d6744fd4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 25 九月 2019 19:18:17 +0800
Subject: [PATCH] 金币版本拦截与频率拦截bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 27fc39c..d70907d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -46,9 +46,9 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
@@ -217,9 +217,9 @@
}
@Override
- public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
- Integer day, Integer source) {
- return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day, source);
+ public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime,
+ Integer day, Integer source, Integer state, Integer stateOrder) {
+ return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
}
private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
@@ -649,7 +649,7 @@
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
long downOrderTime = thirdCreateTime.getTime();
- long limitDate = TimeUtil.convertDateToTemp("2019-09-05");
+ long limitDate = TimeUtil.convertDateToTemp("2019-09-10");
if (downOrderTime > limitDate)
hasRewardCoupon = true;
}
@@ -681,7 +681,7 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
- jumpLink.put("goodsType", order.getSourceType());
+ jumpLink.put("goodsType", order.getSourceType()+"");
}
Map<String, Object> jump = new HashMap<String, Object>();
@@ -706,7 +706,7 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
- jumpLink.put("goodsType", order.getSourceType());
+ jumpLink.put("goodsType", order.getSourceType()+"");
}
Map<String, Object> jump = new HashMap<String, Object>();
@@ -1372,7 +1372,7 @@
}
@Override
- public JSONObject getRewardJumpInfo(String orderNo) {
+ public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {
JSONObject map = new JSONObject();
// 璁㈠崟鏍囪瘑
@@ -1389,6 +1389,7 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", orderNo);
+ jumpLink.put("goodsType", goodsType == null? goodsType: goodsType +"");
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1);
--
Gitblit v1.8.0