From 184d1341ae248cf02a8225ca7bfbba463e18496e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 13 四月 2020 17:47:40 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 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 086310d..ddc9f07 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
@@ -20,7 +20,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
@@ -42,6 +41,7 @@
import com.yeshi.fanli.service.inter.order.ESOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
@@ -128,6 +128,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private OrderHongBaoMapService orderHongBaoMapService;
/**
* 璁㈠崟鍒楄〃
@@ -746,7 +749,7 @@
if (userLevel == null)
userLevel = UserLevelEnum.daRen;
UserLevelEnum upperLevel = UserLevelEnum.superVIP;
-
+
BigDecimal upperTotalMoney = new BigDecimal(0);
List<GoodsRebateVO> voList = new ArrayList<>();
for (HongBaoOrder hongBaoOrder : hoList) {
@@ -769,7 +772,6 @@
if (payment == null)
payment = new BigDecimal(0);
goodsVO.setActualPay("楼" + payment.setScale(2));
-
BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);
if (type == 3) { // 濂栭噾
@@ -825,46 +827,67 @@
orderRebateVO.setType(type);
orderRebateVO.setStateDesc(stateDesc);
orderRebateVO.setListGoods(voList);
+ orderRebateVO.setUserLevel(userLevel.name());
// 涓婄骇杩斿埄
if (upperLevel != null) {
orderRebateVO.setUpperFanLi("楼" + upperTotalMoney);
- orderRebateVO.setUserLevel(upperLevel.name());
orderRebateVO.setJumpLink(upperLevel.getDetailLink());
}
-
+ int freeState = 0;
boolean rewardSuccess = false;
List<String> listNo = new ArrayList<String>();
listNo.add(orderNo);
List<UserSystemCouponRecord> useRecord = userSystemCouponRecordService.getRecordByOrderNoList(sourceType, listNo);
if (useRecord != null && useRecord.size() > 0) {
for (UserSystemCouponRecord couponRecord : useRecord) {
- int goodSource = couponRecord.getGoodSource();
- if (goodSource == 0)
- goodSource = 1;
-
Integer state = couponRecord.getState();
- String systemCouponType = couponRecord.getCouponType();
- if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
- && UserSystemCouponRecord.STATE_SUCCESS == state) {
+ String cType = couponRecord.getCouponType();
+ if (CouponTypeEnum.rebatePercentCoupon.name().equals(cType) && UserSystemCouponRecord.STATE_SUCCESS == state) {
rewardSuccess = true;
+ break;
+ } else if (CouponTypeEnum.freeCoupon.name().equals(cType) || CouponTypeEnum.welfareFreeCoupon.name().equals(cType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(cType)) {
+ freeState = state;
break;
}
}
}
-
if (rewardSuccess) { // 宸蹭娇鐢ㄥ鍔卞埜
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("orderNo", orderNo);
- jumpLink.put("goodsType", sourceType + "");
- orderRebateVO.setCouponSuccess(true);
- orderRebateVO.setCouponParams(jumpLink.toString());
+ JSONObject params = new JSONObject();
+ params.put("orderNo", orderNo);
+ params.put("goodsType", sourceType + "");
+ BigDecimal couponMoney = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);
+ if (couponMoney == null) {
+ couponMoney = new BigDecimal(0);
+ }
+ orderRebateVO.setCouponType(1);
+ orderRebateVO.setCouponUse(true);
+ orderRebateVO.setCouponText("濂栧姳鎴愬姛");
+ orderRebateVO.setCouponDesc("宸插啀杩斅�" +couponMoney.setScale(2));
+ orderRebateVO.setCouponParams(params.toString());
orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
- } else { // 鍙娇鐢ㄥ鍔卞埜
- Date accountTime = hongBaoCountVO.getAccountTime();
+ } else if (freeState > 0) { // 宸蹭娇鐢ㄥ厤鍗曞埜
+ JSONObject params = new JSONObject();
+ params.put("orderNo", orderNo);
+ params.put("goodsType", sourceType + "");
+ orderRebateVO.setCouponType(2);
+ orderRebateVO.setCouponUse(true);
+ orderRebateVO.setCouponParams(params.toString());
+ orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
+ if (UserSystemCouponRecord.STATE_FREE_ON == freeState) {
+ orderRebateVO.setCouponText("鍏嶅崟涓�");
+ } else if (UserSystemCouponRecord.STATE_SUCCESS == freeState) {
+ orderRebateVO.setCouponText("鍏嶅崟鎴愬姛");
+ } else if (UserSystemCouponRecord.STATE_FAIL_RULE == freeState
+ || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == freeState) {
+ orderRebateVO.setCouponText("鍏嶅崟澶辫触");
+ }
+ } else {
+ Date accountTime = hongBaoV2.getGetTime();
if (accountTime != null) {
boolean vip = userInviteService.verifyVIP(uid);
Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
@@ -874,6 +897,9 @@
if (couponRecord == null
|| (couponRecord.getCouponType() == CouponTypeEnum.rebatePercentCoupon.name() && couponRecord.getState() != UserSystemCouponRecord.STATE_SUCCESS)) {
orderRebateVO.setCoupon(true);
+ orderRebateVO.setCouponType(1);
+ orderRebateVO.setCouponText("绔嬪嵆浣跨敤");
+ orderRebateVO.setCouponDesc("杩斿埄鍐嶈繑");
}
}
}
--
Gitblit v1.8.0