fanli-server.git

			@@ -10,6 +10,7 @@
			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;

			import com.yeshi.fanli.entity.accept.AdminAcceptData;
			import org.springframework.stereotype.Controller;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.yeshi.utils.JsonUtil;
			@@ -27,12 +28,14 @@
			import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
			import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
			import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
			import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
			import com.yeshi.fanli.service.inter.goods.GoodsClassService;
			import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;
			import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
			import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
			import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
			import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
			import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
			import com.yeshi.fanli.tag.PageEntity;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.MoneyBigDecimalUtil;
			@@ -62,6 +65,9 @@

			@Resource
			private TaoBaoClassService taoBaoClassService;

			@Resource
			private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;

			/**
			*
			@@ -82,11 +88,11 @@
			* @param out
			*/
			@RequestMapping(value = "queryOnSale")
			public void queryOnSale(String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
			Integer startPrice, Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall,
			Integer hasCoupon, Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay,
			Integer includePayRate30, Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel, String cid,
			PrintWriter out) {
			public void queryOnSale(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
			Integer startPrice, Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall,
			Integer hasCoupon, Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay,
			Integer includePayRate30, Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel, String cid,
			PrintWriter out) {

			try {
			// 查询物料
			@@ -238,7 +244,7 @@
			* @param out
			*/
			@RequestMapping(value = "addTBGoodsFactory")
			public void addTBGoodsFactory(String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
			public void addTBGoodsFactory(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
			Integer startPrice, Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall,
			Integer hasCoupon, Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay,
			Integer includePayRate30, Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel,
			@@ -487,7 +493,7 @@
			* @param out
			*/
			@RequestMapping(value = "searchAlimamaWeb")
			public void searchAlimamaWeb(String callback, Integer pageIndex, Integer pageSize, String key, Integer startPrice,
			public void searchAlimamaWeb(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer startPrice,
			Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall, Integer hasCoupon,
			Integer searchType, Integer baoYou, String startBiz30day, String catIds, PrintWriter out) {

			@@ -705,7 +711,7 @@
			* @param out
			*/
			@RequestMapping(value = "getNavList")
			public void getNavList(String callback, PrintWriter out) {
			public void getNavList(AdminAcceptData acceptData,String callback, PrintWriter out) {

			try {

			@@ -764,7 +770,7 @@
			* @param out
			*/
			@RequestMapping(value = "searchMaterial")
			public void searchMaterial(String callback, Integer pageIndex, Integer pageSize, String subName, String superName,
			public void searchMaterial(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String subName, String superName,
			PrintWriter out) {

			try {
			@@ -896,9 +902,115 @@
			}

			}


			private List<Map<String, Object>> filterTaoBaoGoodsWithQulity(List<TaoBaoGoodsBrief> goodsList) {

			// 插入商品集合
			List<Long> listAuctionId = new ArrayList<Long>();
			for (TaoBaoGoodsBrief goodsBrief : goodsList) {
			listAuctionId.add(goodsBrief.getAuctionId());
			}

			// 验证是否存在数据库
			List<QualityFactory> listHas = qualityFactoryService.listQueryByAuctionId(listAuctionId);

			List<Map<String, Object>> listmap = new ArrayList<Map<String, Object>>();

			for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
			taoBaoGoodsBrief.setId(null);

			Map<String, Object> map = new HashMap<String, Object>();

			map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());
			map.put("title", taoBaoGoodsBrief.getTitle());
			map.put("auctionId", taoBaoGoodsBrief.getAuctionId());
			map.put("auctionUrl", taoBaoGoodsBrief.getAuctionUrl());
			map.put("zkPrice", taoBaoGoodsBrief.getZkPrice());
			map.put("biz30day", taoBaoGoodsBrief.getBiz30day());
			map.put("couponInfo", taoBaoGoodsBrief.getCouponInfo());
			map.put("couponTotalCount", taoBaoGoodsBrief.getCouponTotalCount());
			map.put("couponLeftCount", taoBaoGoodsBrief.getCouponLeftCount());
			map.put("couponEffectiveEndTime", taoBaoGoodsBrief.getCouponEffectiveEndTime());
			map.put("tkRate", taoBaoGoodsBrief.getTkRate());

			// 来源 0 无 1淘宝 2 京东
			map.put("goodsSource", 1);

			/* 券后价--计算 */
			BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
			map.put("couponPrice", couponPrice);

			/* 预计收益：公司、用户 */
			BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();
			BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
			BigDecimal profit = MoneyBigDecimalUtil.mul(tkRate, zkPrice);
			// 计算结果
			BigDecimal estimateProfit = MoneyBigDecimalUtil.div(profit, new BigDecimal("100"));

			// 预计收益
			map.put("estimateProfit", estimateProfit);

			int existence = 0;

			/* 查询商品是否已存在商品精选库中 */
			Long localAuctionId = taoBaoGoodsBrief.getAuctionId();
			if (localAuctionId != null) {
			if (listHas != null && listHas.size() > 0) {
			for (QualityFactory selectionGoods : listHas) {
			TaoBaoGoodsBrief hasgoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
			Long hasId = hasgoodsBrief.getAuctionId();
			if (localAuctionId.equals(hasId) \|\| localAuctionId == hasId) {
			existence = 1; // 存在商品中
			}
			}
			}
			}

			map.put("isExistence", existence);

			listmap.add(map);
			}

			return listmap;

			}


			@RequestMapping(value = "searchDaTaoKe")
			public void searchDaTaoKe(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
			PrintWriter out) {
			try {
			key = StringUtil.isNullOrEmpty(key) ? "" : key;
			List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listSearchByTitleWithCid(key, cid, pageIndex,
			pageSize);
			long count = daTaoKeGoodsDetailV2Service.countSearchByTitleWithCid(key, cid);
			List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
			for (DaTaoKeDetailV2 detail : list) {
			goodsList.add(TaoBaoUtil.convert(detail));
			}

			List<Map<String, Object>> listmap = filterTaoBaoGoodsWithQulity(goodsList);

			PageEntity pe = new PageEntity(pageIndex, pageSize, (int) count,(int)(count%pageSize==0?count/pageSize:count/pageSize+1));
			JSONObject data = new JSONObject();
			GsonBuilder gsonBuilder = new GsonBuilder();
			gsonBuilder.serializeNulls(); // 重点
			Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd").create();

			data.put("pe", pe);
			data.put("listGoods", gson.toJson(listmap));

			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

			} catch (Exception e) {
			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询异常"));
			e.printStackTrace();
			}
			}

			@RequestMapping(value = "getQiangGou")
			public void getQiangGou(String callback, Integer pageIndex, PrintWriter out) {
			public void getQiangGou(AdminAcceptData acceptData,String callback, Integer pageIndex, PrintWriter out) {

			try {