Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java

@@ -7,39 +7,33 @@


import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.controller.client.SearchController;

import com.yeshi.fanli.controller.client.v1.SearchController;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.clazz.ClassRecommendGoods;

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;

import com.yeshi.fanli.entity.bus.su.clazz.SuperGoodsClass;

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

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

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

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.Utils;

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

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

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/xcx/v1/XcxClass")

@@ -50,9 +44,6 @@


   @Resource

   private GoodsSecondClassService goodsSecondClassService;



   @Resource

   private ClassRecommendGoodsService classRecommendGoodsService;



   @Resource

   private GoodsClassService goodsClassService;

@@ -114,7 +105,7 @@
    */

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

   public void getGoodsClass(AcceptData acceptData, PrintWriter out) {

      System system = xcxMiniControllerUtil.getSystem(acceptData);

      BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));

         return;

@@ -161,30 +152,6 @@
      out.print(result);

   }



   /**

    * 
    * 方法说明: 推荐商品获取

    * 
    * @author mawurui createTime 2018年4月25日 下午5:25:34

    * @param acceptData

    * @param goodsClassId

    * @param out

    */

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

   public void getClassRecommendGoods(AcceptData acceptData, long goodsClassId, PrintWriter out) {

      List<ClassRecommendGoods> classRecommendGoodsList = classRecommendGoodsService

            .getClassRecommendGoodsByGoodsClassId(goodsClassId);

      if (classRecommendGoodsList == null) {

         out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NODATA));

         return;

      }

      JSONObject data = new JSONObject();

      data.put("count", classRecommendGoodsList.size());

      Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();

      data.put("classRecommendGoodsList", gson.toJson(classRecommendGoodsList));

      String result = JsonUtil.loadTrueResult(data);

      out.print(result);

   }



   /**

    * 

@@ -226,7 +193,7 @@
   @RequestMapping(value = "getgoods", method = RequestMethod.POST)

   public void getGoods(AcceptData acceptData, int page, long scid, String filter, String order, String startprice,

         String endprice, String fastFilter, PrintWriter out) {

      System system = xcxMiniControllerUtil.getSystem(acceptData);

      BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));

         return;

@@ -327,9 +294,9 @@
    */

   private void setTaoBaoCouponHongBao(List<TaoBaoCoupon> taoBaoCoupons) {

      if (taoBaoCoupons.size() > 0) {

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

         BigDecimal proportion = hongBaoManageService.getFanLiRate();

         for (TaoBaoCoupon taoBaoCoupon : taoBaoCoupons) {

            BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, new BigDecimal(proportion));

            BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, proportion);

            taoBaoCoupon.setHongbao(hb);

         }

      }