From 26f7accb815f55f18f8eedfca4324700a96884ec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 八月 2020 18:23:49 +0800
Subject: [PATCH] 资金验证优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
index 3a75bfa..34582c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
@@ -8,13 +8,14 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.util.SystemInfoUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.exception.WXOrderException;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.shop.BanLiShopGoods;
@@ -40,6 +41,7 @@
import com.yeshi.fanli.util.email.MailSenderUtil;
import com.yeshi.fanli.util.factory.shop.BanLiShopOrderGoodsVOFactory;
import com.yeshi.fanli.util.wx.BanLiShopWXPayUtil;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.shop.BanLiShopOrderVO;
import net.sf.json.JSONObject;
@@ -101,8 +103,8 @@
Constant.PAGE_SIZE);
long count = banLiShopGoodsService.countGoods(null, BanLiShopGoods.STATE_ONLINE);
// 鑾峰彇banner
- List<SwiperPicture> pictureList = swiperPictureService.getByBannerCardAndVersion("hongbao_exchange_goods_list",
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ List<BannerVO> pictureList = swiperPictureService.getByBannerCardAndVersion("hongbao_exchange_goods_list",
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
JSONObject data = new JSONObject();
if (pictureList != null && pictureList.size() > 0) {
@@ -197,6 +199,7 @@
}
BigDecimal money = redPackBalanceService.getBalance(uid);
+
JSONObject data = new JSONObject();
data.put("goods", goods);
data.put("hongBaoBalance", money);
@@ -218,6 +221,8 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
+
+ SystemEnum system= SystemInfoUtil.getSystem(acceptData);
try {
BanLiShopOrder order = banLiShopOrderService.createOrder(payId, account, uid);
@@ -265,7 +270,7 @@
@Override
public void run() {
long[] targetUids = new long[] { 3L, 4L };
- Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey());
+ Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey(),system);
String[] sts = config.getValue().split(",");
String account = sts[0];
String pwd = sts[1];
--
Gitblit v1.8.0