From 2e9ffc16415f560a1bb7aa2dc576014521869325 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 10 十二月 2019 17:32:55 +0800
Subject: [PATCH] 维权
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 b4ee853..fff6d9e 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
@@ -262,22 +262,28 @@
// 璁㈠崟鏍囪瘑
order.setSignList(signList);
- boolean rewardOrder = false;
int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
- if (rewardSuccess) {
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- rewardOrder = true; // 濂栧姳鎴愬姛 2.0.2 娑堝け
+ boolean rewardOrder = false;
+
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (rewardSuccess) {
+ rewardOrder = true; // 浠ュ墠鐗堟湰濂栧姳鎴愬姛 鐨勬樉绀哄叆鍙�
}
- } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
- && HongBaoV2.STATE_YILINGQU == hongBaoState) { // 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
- if (!userVIPInfoService.isVIP(uid)) { // 闈炰細鍛樺彲浣跨敤濂栧姳鍒�
+
+ // 宸插埌璐︾殑杩斿埄璁㈠崟銆侀潪浼氬憳鍙娇鐢ㄥ鍔卞埜
+ if (!freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState
+ && !userVIPInfoService.isVIP(uid)) {
type = 2;
rewardOrder = true;
}
+ } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
+ && HongBaoV2.STATE_YILINGQU == hongBaoState && !userVIPInfoService.isVIP(uid)) {
+ // 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗曘�� 闈炶秴绾т細鍛�
+ type = 2;
+ rewardOrder = true;
}
-
- // 缁存潈璁㈠崟 涓嶅彲浣跨敤濂栧姳鍒�
+ // 缁存潈璁㈠崟 涓嶅彲浣跨敤
Integer orderState = order.getState();
if(CommonOrder.STATE_WQ == orderState) {
rewardOrder = false;
--
Gitblit v1.8.0