正式数据库修改

admin

2019-03-13 69bee82b81626b82b7f39f0e459e4f56b1699b51

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -21,6 +21,10 @@
import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.wx.WXUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -31,9 +35,7 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendSectionDetail;

import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.InviteUser;

import com.yeshi.fanli.entity.bus.user.ThreeSaleRank;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.system.CustomerContent;

import com.yeshi.fanli.entity.system.CustomerName;

@@ -64,8 +66,6 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

@@ -82,10 +82,6 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.wx.WXUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -140,13 +136,7 @@
   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private UserInfoService userInfoService;



   @Resource

   private HongBaoMessageService hongBaoMessageService;



   @Resource

   private ThreeSaleRankService threeSaleRankService;

@@ -213,18 +203,6 @@
      return "coupon";

   }



   @RequestMapping("findThreeSaleInfo")

   public void findThreeSaleInfo(long id, PrintWriter out) {

      int count = threeSaleSerivce.findInviteCount(id);

      double money = hongBaoService.findThreeSaleMoney(id);

      List<ThreeSaleRank> list = threeSaleRankService.rank(5);

      JSONObject data = new JSONObject();

      data.put("count", count);

      data.put("money", money);

      data.put("list", list);

      out.print(JsonUtil.loadTrueResult(data));

   }



   @RequestMapping("findThreeFriendsCount")

   public void findThreeFriendsCount(long id, String callback, PrintWriter out) {

      int count1 = userInfoService.findFriendsCount(id, 1);

@@ -261,15 +239,6 @@
      } else {

         out.print(JsonUtil.loadTrueResult(data));

      }

   }



   @RequestMapping("findThreeSales")

   public void findThreeSales(long id, PrintWriter out) {

      List<HongBao> list = hongBaoService.findThreeSaleHongBao(id);

      String json = JsonUtil.getApiCommonGson().toJson(list);

      JSONObject data = new JSONObject();

      data.put("list", json);

      out.print(JsonUtil.loadTrueResult(data));

   }



   @RequestMapping(value = "getConpon", method = RequestMethod.POST)

@@ -618,7 +587,8 @@
      List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

      for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {

         list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(), proportion.toString(), ""));

         list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(),

               proportion.toString(), ""));

      }



      Gson gson = JsonUtil.getApiCommonGson();