From 31d40dd7320db9a6fa7bd88bda546bcb195b2147 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 21 十二月 2019 18:26:49 +0800
Subject: [PATCH] xxl-job任务管理接入
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 fe2047f..4d4deae 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
@@ -27,6 +27,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -50,7 +51,7 @@
@Resource
private UserSystemCouponService userSystemCouponService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
@@ -87,9 +88,8 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (QualityFactory selectionGoods : listQuery) {
@@ -174,8 +174,8 @@
}
// 鑾峰彇鍏嶅崟鍒告暟閲�
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());
--
Gitblit v1.8.0