From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java | 66 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 18 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 fecef80..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,22 +8,28 @@
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.redpack.RedPackBalance;
+import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.shop.BanLiShopGoods;
import com.yeshi.fanli.entity.shop.BanLiShopGoodsSets;
import com.yeshi.fanli.entity.shop.BanLiShopGoodsSetsPay;
import com.yeshi.fanli.entity.shop.BanLiShopOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.redpack.RedPackBalanceException;
import com.yeshi.fanli.exception.shop.BanLiShopOrderException;
+import com.yeshi.fanli.service.AdminUserService;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
+import com.yeshi.fanli.service.inter.redpack.RedPackForbidService;
import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsService;
import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsSetPayService;
import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsSetService;
@@ -31,8 +37,11 @@
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.ThreadUtil;
+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;
@@ -68,6 +77,16 @@
@Resource
private BanLiShopGoodsSetService banLiShopGoodsSetService;
+ @Resource
+ private RedPackForbidService redPackForbidService;
+
+ @Resource
+ private ConfigService configService;
+
+
+ @Resource
+ private AdminUserService adminUserService;
+
/**
* 鍟嗗搧鍒楄〃
*
@@ -77,14 +96,15 @@
* @param out
*/
@RequestMapping(value = "goodsList")
- public void goodsList(AcceptData acceptData, int page,Long uid, String callback, PrintWriter out) {
+ public void goodsList(AcceptData acceptData, int page, Long uid, String callback, PrintWriter out) {
if (page <= 0)
page = 1;
List<BanLiShopGoods> goodsList = banLiShopGoodsService.listGoods(null, BanLiShopGoods.STATE_ONLINE, page,
Constant.PAGE_SIZE);
long count = banLiShopGoodsService.countGoods(null, BanLiShopGoods.STATE_ONLINE);
// 鑾峰彇banner
- List<SwiperPicture> pictureList = swiperPictureService.getByBannerCard("hongbao_exchange_goods_list");
+ 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) {
@@ -92,14 +112,8 @@
}
data.put("data", goodsList);
data.put("count", count);
-
- RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);
- if (redPackBalance != null && redPackBalance.getState() == RedPackBalance.STATE_LOCKED) {
- data.put("redPackLock", true);
- } else {
- data.put("redPackLock", false);
- }
-
+ data.put("redPackLock", redPackForbidService.verifyForbid(uid));
+
if (!StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
else
@@ -183,12 +197,9 @@
pay.setName(getPayName(pay.getPayType()));
}
}
- BigDecimal money = new BigDecimal(0);
- try {
- money = redPackBalanceService.getBalance(uid);
- } catch (RedPackBalanceException e) {
- e.printStackTrace();
- }
+ BigDecimal money = redPackBalanceService.getBalance(uid);
+
+
JSONObject data = new JSONObject();
data.put("goods", goods);
data.put("hongBaoBalance", money);
@@ -210,6 +221,8 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
+
+ SystemEnum system= SystemInfoUtil.getSystem(acceptData);
try {
BanLiShopOrder order = banLiShopOrderService.createOrder(payId, account, uid);
@@ -252,6 +265,23 @@
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
else
out.print(JsonUtil.loadTrueResult(data));
+
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ long[] targetUids = new long[] { 3L, 4L };
+ Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey(),system);
+ String[] sts = config.getValue().split(",");
+ String account = sts[0];
+ String pwd = sts[1];
+ for (long adminId : targetUids) {
+ AdminUser adminUser = adminUserService.selectByPrimaryKey(adminId);
+ String msg = "绾㈠寘鍟嗗煄鏈夋柊鐨勮鍗曪紝璇峰墠寰�瀹℃牳";
+ boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "绾㈠寘鍟嗗煄鏂拌鍗曟彁閱�", msg);
+ }
+ }
+ });
+
}
} catch (BanLiShopOrderException e) {
--
Gitblit v1.8.0