系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

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

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

@@ -102,7 +104,7 @@
      long count = banLiShopGoodsService.countGoods(null, BanLiShopGoods.STATE_ONLINE);

      // 获取banner

      List<BannerVO> pictureList = swiperPictureService.getByBannerCardAndVersion("hongbao_exchange_goods_list",

            acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

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