From d085ca89e39b4cda025a9a53d3797fbe8b242ae7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 21 十月 2019 17:11:30 +0800
Subject: [PATCH] 订单补偿 + 奖励券使用倒计时
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 c7f92e5..8d2ea35 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
@@ -16,11 +16,13 @@
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.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
+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.util.factory.goods.GoodsDetailVOFactory;
@@ -46,6 +48,9 @@
@Resource
private UserSystemCouponService userSystemCouponService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
@RequestMapping("getMianDanGoodsList")
public void getMianDanGoodsList(AcceptData acceptData, PrintWriter out, int page, int pageSize, String callback) {
@@ -165,7 +170,9 @@
return;
}
// 鑾峰彇鍏嶅崟鍒告暟閲�
- long couponCount = userSystemCouponService.count
+ long couponCount = userSystemCouponService.countUsableRewardCoupon(uid);
+ 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());
@@ -174,6 +181,7 @@
JSONObject data = new JSONObject();
data.put("user", userJson);
data.put("couponCount", couponCount);
+ data.put("integralCount", integralCount);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0