From 81da61b828e29b7745e1382dfbbaeb685dc083ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 一月 2024 17:17:55 +0800
Subject: [PATCH] 抖音转链修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index 1100abc..be906fd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -319,7 +319,7 @@
long count = 0L;
List<CommonOrderVO> list = null;
- if (acceptData.getSystem() == SystemEnum.yhqjx) {
+ if (acceptData.getSystem() == SystemEnum.yhqjx||acceptData.getSystem() == SystemEnum.hsb) {
list = commonOrderService.getOrderList(acceptData, page, uid, state, orderType, orderState, orderNo,
startTime, endTime, dateType, listSource);
count = commonOrderService.countOrderList(uid, state, orderType, orderState, orderNo, startTime,
@@ -771,7 +771,7 @@
orderRebateVO.setCouponText("濂栧姳鎴愬姛");
orderRebateVO.setCouponDesc("宸插啀杩斅�" + couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
orderRebateVO.setCouponParams(params.toString());
- orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+ orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail",acceptData.getSystem()));
} else if (freeState > 0) { // 宸蹭娇鐢ㄥ厤鍗曞埜
JSONObject params = new JSONObject();
params.put("orderNo", orderNo);
@@ -779,7 +779,7 @@
orderRebateVO.setCouponType(2);
orderRebateVO.setCouponUse(true);
orderRebateVO.setCouponParams(params.toString());
- orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
+ orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("freeCouponDetail",acceptData.getSystem()));
if (UserSystemCouponRecord.STATE_FREE_ON == freeState) {
orderRebateVO.setCouponText("鍏嶅崟涓�");
} else if (UserSystemCouponRecord.STATE_SUCCESS == freeState) {
--
Gitblit v1.8.0