From 2ec42a5aacea35d2918f0e17f07685cf5b4d25c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:20:41 +0800
Subject: [PATCH] 包名引用路径更改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java
index 8d2ea35..318bb4d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java
@@ -13,18 +13,22 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -41,16 +45,19 @@
private QualityGoodsService qualityGoodsService;
@Resource
- private HongBaoManageService hongBaoManageService;
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private UserInfoService userInfoService;
@Resource
private UserSystemCouponService userSystemCouponService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
@RequestMapping("getMianDanGoodsList")
public void getMianDanGoodsList(AcceptData acceptData, PrintWriter out, int page, int pageSize, String callback) {
@@ -85,8 +92,8 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion(),UserLevelEnum.daRen);
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (QualityFactory selectionGoods : listQuery) {
@@ -116,7 +123,7 @@
if (couplePrice.compareTo(new BigDecimal("9.9")) == 1) {
continue; // 鍒稿悗浠峰ぇ浜�10
}
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, configParamsDTO);
array.add(gson.toJson(detailVO));
}
JSONObject data = new JSONObject();
@@ -171,12 +178,13 @@
}
// 鑾峰彇鍏嶅崟鍒告暟閲�
long couponCount = userSystemCouponService.countUsableRewardCoupon(uid);
- UserInfoExtra extraInfo=userInfoExtraService.getUserInfoExtra(uid);
- long integralCount=extraInfo!=null?extraInfo.getGoldCoin():0L;
+ UserInfoExtra extraInfo = userInfoExtraService.getUserInfoExtra(uid);
+ long integralCount = extraInfo != null ? extraInfo.getGoldCoin() : 0L;
JSONObject userJson = new JSONObject();
userJson.put("nickName", user.getNickName());
userJson.put("portrait", user.getPortrait());
userJson.put("id", user.getId());
+ userJson.put("vip", userVIPInfoService.isVIP(user.getId()));
JSONObject data = new JSONObject();
data.put("user", userJson);
@@ -185,4 +193,4 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0