System 对象更名为 BusinessSystem

yujian

2019-03-14 4aadf484e193995c23ee1d5bb1971a497d2f9a0d

 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,13 +35,11 @@
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.BusinessSystem;

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

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

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

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

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.RelateGoods;

@@ -49,11 +51,11 @@
import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;

import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

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

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

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

@@ -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,19 +136,13 @@
   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private UserInfoService userInfoService;



   @Resource

   private HongBaoMessageService hongBaoMessageService;



   @Resource

   private ThreeSaleRankService threeSaleRankService;



   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;



   @Resource

   private SystemConfigService systemConfigService;

@@ -204,25 +194,13 @@
   @RequestMapping("coupon")

   public String conpon(Model model) {

      List<TaoBaoCoupon> couponList = taoBaoCouponService.getTaoBaoCouponList("", 1);

      String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

      String jsonArr = Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(couponList));

      JSONArray jsonArray = JSONArray.fromObject(jsonArr);

      List<TaoBaoCoupon> collection = (List<TaoBaoCoupon>) JSONArray.toCollection(jsonArray, TaoBaoCoupon.class);

      model.addAttribute("couponList", collection);

      model.addAttribute("proportion", proportion);

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

@@ -263,19 +241,10 @@
      }

   }



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

   public void getConpon(int page, PrintWriter out) {

      List<TaoBaoCoupon> taoBaoCouponList = taoBaoCouponService.getTaoBaoCouponList("", page);

      String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

      JSONObject data = new JSONObject();

      data.put("taoBaoCouponList", Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(taoBaoCouponList)));

      data.put("proportion", proportion);

@@ -333,7 +302,7 @@
   public String threeShareRep(@PathVariable String uid, String code, String state, String packages, String platform,

         String ios, HttpSession httpSession, HttpServletRequest request) {



      System system = systemService.getSystem(platform, packages);

      BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);

      String wxState = (String) httpSession.getAttribute("wxState");

      // 通过配置参数获取

      String down = DOWNURL2;

@@ -370,7 +339,7 @@
   public String threeShareRepNew(@PathVariable String uid, String code, String state, String packages,

         String platform, String ios, HttpSession httpSession, HttpServletRequest request) {



      System system = systemService.getSystem(platform, packages);

      BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);

      String wxState = (String) httpSession.getAttribute("wxState");

      // 通过配置参数获取

      String down = DOWNURL2;

@@ -616,12 +585,10 @@
      }

      JSONObject data = new JSONObject();

      List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();

      Map<String, String> map = hongBaoManageService.convertMap();

      String proportion = map.get("hongbao_goods_proportion");

      String fcRate = map.get("hongbao_fc_ratio");

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

      for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {

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

               fcRate, ""));

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

               proportion.toString(), ""));

      }



      Gson gson = JsonUtil.getApiCommonGson();

@@ -838,7 +805,7 @@
      JSONObject data = new JSONObject();



      String key = "activityRules";

      com.yeshi.fanli.entity.system.System system = new System();

      com.yeshi.fanli.entity.system.BusinessSystem system = new BusinessSystem();

      system.setCreatetime(java.lang.System.currentTimeMillis());

      system.setPlatform(1);

      system.setId(4L);

@@ -883,7 +850,7 @@
   @RequestMapping("getinviteactivityrules")

   public void getInviteActivityRules(String callback, PrintWriter out) {

      String key = "activityRules"; // key值

      com.yeshi.fanli.entity.system.System system = new System();

      com.yeshi.fanli.entity.system.BusinessSystem system = new BusinessSystem();

      system.setCreatetime(java.lang.System.currentTimeMillis());

      system.setPlatform(1);

      system.setId(4L);