系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java

@@ -8,19 +8,25 @@
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;

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;

@@ -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;

@@ -70,6 +79,13 @@


   @Resource

   private RedPackForbidService redPackForbidService;

	
   @Resource

   private ConfigService configService;

	
	
   @Resource

   private AdminUserService adminUserService;



   /**

    * 商品列表

@@ -87,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) {

@@ -183,6 +199,7 @@
         }

      BigDecimal money = redPackBalanceService.getBalance(uid);





      JSONObject data = new JSONObject();

      data.put("goods", goods);

      data.put("hongBaoBalance", money);

@@ -204,6 +221,8 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户未登录"));

         return;

      }



      SystemEnum system= SystemInfoUtil.getSystem(acceptData);



      try {

         BanLiShopOrder order = banLiShopOrderService.createOrder(payId, account, uid);

@@ -246,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) {