From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 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 8c63aa1..f8b0ccc 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
@@ -72,6 +72,7 @@
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.OrderCountVO;
import com.yeshi.fanli.vo.order.WeiQuanInfo;
import net.sf.json.JSONObject;
@@ -212,9 +213,9 @@
* @param list
* @param signList
*/
- public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon,
- Integer hongBaoState, Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList,
- AcceptData acceptData) {
+ public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,
+ Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList,
+ Long uid, AcceptData acceptData) {
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
@@ -261,21 +262,6 @@
// 璁㈠崟鏍囪瘑
order.setSignList(signList);
- // 1.6.5 鏄惁瀛樺湪鏂板厬鎹㈢殑鍒�
- if (!hasRewardCoupon && exchangeCoupon) {
- try {
- Date thirdCreateTime = order.getThirdCreateTime();
- if (thirdCreateTime != null) {
- long downOrderTime = thirdCreateTime.getTime();
- long limitDate = TimeUtil.convertDateToTemp("2019-09-10");
- if (downOrderTime > limitDate)
- hasRewardCoupon = true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
boolean rewardOrder = false;
int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
if (rewardSuccess) {
@@ -283,10 +269,11 @@
rewardOrder = true; // 濂栧姳鎴愬姛 2.0.2 娑堝け
}
} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
- && HongBaoV2.STATE_YILINGQU == hongBaoState) {
- // 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
- type = 2;
- rewardOrder = true;
+ && HongBaoV2.STATE_YILINGQU == hongBaoState) { // 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
+ if (!userVIPInfoService.isVIP(uid)) { // 闈炰細鍛樺彲浣跨敤濂栧姳鍒�
+ type = 2;
+ rewardOrder = true;
+ }
}
if (rewardOrder) {
@@ -468,8 +455,7 @@
Date august = TimeUtil.parse("2019-08-01");
// 鏄惁瀛樺湪濂栧姳鍒�
- boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);
- boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);
+ boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
// 闇�瑕佹煡璇㈡槸鍚︿负VIP鐨勭敤鎴稩D,鍙湁閭�璇疯鍗曟墠闇�瑕佹煡璇�
List<Long> needSelectVIPUidList = new ArrayList<>();
@@ -494,6 +480,9 @@
order.setVipOrder(false);
} else
order.setVipOrder(false);
+
+ if(order.isVipOrder())
+ order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
}
for (CommonOrderVO order : listOrder) {
@@ -611,7 +600,7 @@
} else if (CommonOrder.STATE_SX == orderState) {
orderStateContent = "鏈粯娆�/宸查��娆�";
} else if (CommonOrder.STATE_WQ == orderState) {
- orderStateContent = "宸茬淮鏉�";
+ orderStateContent = "宸插敭鍚�";
if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
/* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
@@ -629,11 +618,11 @@
} else {
// 2019.8.1 杩斿洖缁存潈淇℃伅
if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {
- orderStateContent = "缁存潈鎴愬姛";
+ orderStateContent = "鍞悗鎴愬姛";
WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
weiQuanInfo
- .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ .setWqHongBao("鍞悗锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
order.setWeiQuanInfo(weiQuanInfo);
}
@@ -767,17 +756,17 @@
} else {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null,
- signList, acceptData);
+ setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null,
+ signList, uid, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordTB, signList, acceptData);
+ setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType,
+ listRecordTB, signList, uid, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordJD, signList, acceptData);
+ setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType,
+ listRecordJD, signList, uid, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordPDD, signList, acceptData);
+ setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType,
+ listRecordPDD, signList, uid, acceptData);
}
}
@@ -795,6 +784,11 @@
public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
return commonOrderMapper.countHistoryOrder(uid, day, source);
}
+
+ @Override
+ public OrderCountVO getOrderCount(Long uid, Integer day, Integer source) {
+ return commonOrderMapper.getOrderCount(uid, day, source);
+ }
@Override
public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime,
--
Gitblit v1.8.0