小黄条

yujian

2019-12-10 c8041ec0544bf122e6819e6bf698997ccbf30aaf

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

@@ -15,7 +15,6 @@


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.shop.BanLiShopGoods;

import com.yeshi.fanli.entity.shop.BanLiShopGoodsSets;

import com.yeshi.fanli.entity.shop.BanLiShopGoodsSetsPay;

@@ -24,6 +23,7 @@
import com.yeshi.fanli.exception.shop.BanLiShopOrderException;

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;

@@ -67,6 +67,9 @@


   @Resource

   private BanLiShopGoodsSetService banLiShopGoodsSetService;

	
   @Resource

   private RedPackForbidService redPackForbidService;



   /**

    * 商品列表

@@ -92,13 +95,7 @@
      }

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

@@ -184,6 +181,7 @@
            }

         }

      BigDecimal money = redPackBalanceService.getBalance(uid);

	
      JSONObject data = new JSONObject();

      data.put("goods", goods);

      data.put("hongBaoBalance", money);