From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5PullNewController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5PullNewController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5PullNewController.java
index 4865bc4..21e550e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5PullNewController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5PullNewController.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.util.SystemInfoUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.DateUtil;
@@ -79,13 +80,15 @@
*/
@RequestMapping("getGoodsList")
public void getGoodsList(AcceptData acceptData, String callback, Long uid, Integer page, PrintWriter out) {
+ if (acceptData.getSystem() == null)
+ acceptData.setSystem(SystemInfoUtil.getSystem(acceptData));
JSONArray array = new JSONArray();
List<PullNewGoods> list = pullNewGoodsService.listQuery((page-1)*Constant.PAGE_SIZE, Constant.PAGE_SIZE);
if (list != null && list.size() > 0) {
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ acceptData.getVersion(),acceptData.getSystem());
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
for (PullNewGoods goods : list) {
array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(TaoBaoGoodsFactory.create(goods),paramsDTO)));
@@ -121,6 +124,8 @@
*/
@RequestMapping("getRankList")
public void getRankList(AcceptData acceptData, String callback, Long uid, PrintWriter out) {
+ if (acceptData.getSystem() == null)
+ acceptData.setSystem(SystemInfoUtil.getSystem(acceptData));
JSONArray array = new JSONArray();
List<UserRankings> list = userRankingsService.getRankList(0, 10);
if (list != null && list.size() > 0) {
@@ -148,6 +153,8 @@
*/
@RequestMapping("getShareImg")
public void getShareImg(AcceptData acceptData, String callback, Long uid, PrintWriter out) {
+ if (acceptData.getSystem() == null)
+ acceptData.setSystem(SystemInfoUtil.getSystem(acceptData));
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
--
Gitblit v1.8.0