From dc30e181a560eae880d31faffdb3d5361b424876 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 17:02:41 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 241 +++---------------------------------------------
1 files changed, 16 insertions(+), 225 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index 22d910b..7f47f06 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -38,17 +38,13 @@
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;
import com.yeshi.fanli.dao.mybatis.help.HelpCenterMapper;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDSearchResult;
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
-import com.yeshi.fanli.entity.dynamic.DynamicInfo;
-import com.yeshi.fanli.entity.dynamic.GoodsPicture;
import com.yeshi.fanli.entity.dynamic.InviteMaterial;
import com.yeshi.fanli.entity.jd.JDGoods;
-import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
-import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
@@ -59,6 +55,7 @@
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
+import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.tag.PageEntity;
@@ -66,13 +63,11 @@
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.db.MongoDBManager;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.push.OPPOPushUtil;
-import com.yeshi.fanli.util.push.VIVOPushUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
@@ -125,52 +120,10 @@
@Resource
private IntegralGetService integralGetService;
- @RequestMapping(value = "testimg")
- public void testImg(HttpServletRequest request, PrintWriter out) {
- long startTime = System.currentTimeMillis();
-
- List<String> list = new ArrayList<>();
- for (int i = 0; i < 10; i++) {
- list.add("i" + i);
- }
-
- try {
- final TaoBaoGoodsBrief goods = redisManager.getTaoBaoGoodsBrief(569823237075L);
- } catch (TaobaoGoodsDownException e1) {
- e1.printStackTrace();
- }
- String url = "http://www.baidu.com";
- list.parallelStream().forEach(ids -> {
- InputStream portrait = HttpUtil.getAsInputStream(
- "https://wwc.alicdn.com/avatar/getAvatar.do?userId=1889722423&width=160&height=160&type=sns");
- System.out.println(ids + "寮�濮嬫椂闂�:" + System.currentTimeMillis());
- String uid = "123";
- String auctionId = "test-" + ids;
-
- String destPath = FileUtil.getCacheDir() + "/" + auctionId + ".jpg";
-
- String shareImgPath = FileUtil.getCacheDir() + "/share_" + uid + "_" + auctionId + ".png";
-
- try {
- QRCodeUtil.getInstance(500).encode(url, destPath);
- } catch (Exception e) {
- e.printStackTrace();
- }
- long startDTime = System.currentTimeMillis();
-
- /*
- * try { //ImageUtil.drawGoodsShareImg(new FileInputStream(new
- * File(destPath)), portrait, goods, shareImgPath); } catch
- * (FileNotFoundException e) { e.printStackTrace(); }
- */
- System.out.println(System.currentTimeMillis() - startDTime);
-
- String shareImgUrl = COSManager.getInstance()
- .uploadFile(new File(shareImgPath), "share_" + uid + "_" + auctionId + ".png").getUrl();
- System.out.println(ids + "缁撴潫鏃堕棿:" + System.currentTimeMillis());
- });
- System.out.println("鏁翠綋鑰楁椂:" + (System.currentTimeMillis() - startTime));
- }
+ @Resource
+ private UserMoneyExtraService userMoneyExtraService;
+
+
@RequestMapping(value = "kefu")
public void kefu(HttpServletRequest request, PrintWriter out) {
@@ -294,76 +247,6 @@
}
}
- @RequestMapping(value = "insertShop")
- public void insertShop(PrintWriter out) {
- try {
- dynamicInfoService.insertShopInfo();
- dynamicInfoService.insertTimeHotSale();
- dynamicInfoService.insertTimeRecommend();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 鎻掑叆閭�璇风礌鏉�
- *
- * @param out
- */
- @RequestMapping(value = "uploadInviteMaterial")
- public void uploadInviteMaterial(PrintWriter out) {
- try {
- List<InviteMaterial> list = new ArrayList<InviteMaterial>();
-
- // 鍥剧墖鏂囦欢
- File file = new File("E:\\Invite\\Picture");
- File[] files = file.listFiles();
- for (File filePic : files) {// 閬嶅巻杩欎釜鏁扮粍
- String name = filePic.getName();
- String prefix = name.substring(name.lastIndexOf(".") + 1);
- // 涓婁紶鏂囦欢鐩稿浣嶇疆
- String filePath = "/resource/invite/everyday/" + UUID.randomUUID().toString().replace("-", "") + "."
- + prefix;
-
- String fileUrl = COSManager.getInstance().uploadFile(filePic, filePath).getUrl();
-
- System.out.println("FileName:" + name);
- System.out.println("url:" + fileUrl);
-
- InviteMaterial inviteMaterial = new InviteMaterial();
- inviteMaterial.setState(0);
- inviteMaterial.setPicture(fileUrl);
- list.add(inviteMaterial);
- }
-
- List<String> listTxt = new ArrayList<String>();
- File textfile = new File("E:\\Invite\\content.txt");// Text鏂囦欢
- BufferedReader br = new BufferedReader(new FileReader(textfile));// 鏋勯�犱竴涓狟ufferedReader绫绘潵璇诲彇鏂囦欢
- String s = "";
- while ((s = br.readLine()) != null) {// 浣跨敤readLine鏂规硶锛屼竴娆¤涓�琛�
- if (StringUtil.isNullOrEmpty(s)) {
- continue;
- }
- listTxt.add(s);
- }
- br.close();
-
- if (list.size() == 0 || listTxt.size() == 0 || listTxt.size() < list.size()) {
- return;
- }
-
- for (int i = 0; i < list.size(); i++) {
- InviteMaterial invite = list.get(i);
- invite.setText(listTxt.get(i));
- inviteMaterialService.insert(invite);
- }
- JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
- } catch (Exception e) {
- JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("涓婁紶澶辫触"));
- e.printStackTrace();
- }
- }
-
/**
* 鎻掑叆閭�璇风礌鏉�
*
@@ -471,10 +354,13 @@
if (goodsList != null && goodsList.size() > 0) {
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate());
+
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
array.add(gson.toJson(goodsDetailVO));
}
}
@@ -485,48 +371,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
- /**
- * 鎻掑叆閭�璇风礌鏉�
- *
- * @param out
- */
- @RequestMapping(value = "queryExistsId")
- public void queryExistsAuctionId(PrintWriter out) {
- try {
- List<DynamicInfo> list = dynamicInfoDao.queryExistsAuctionId();
- for (DynamicInfo dynamicInfo : list) {
- List<GoodsPicture> imgs = dynamicInfo.getImgs();
- if (imgs == null || imgs.size() == 0) {
- continue;
- }
-
- boolean update = false;
- for (GoodsPicture goodsPicture : imgs) {
- TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
- if (goods == null) {
- continue;
- }
-
- if (goods.getAuctionId() == null) {
- update = true;
- goods.setAuctionId(goods.getId());
- }
- }
-
- if (update) {
- dynamicInfo.setImgs(imgs);
- dynamicInfoDao.updateGoodInfo(dynamicInfo);
- }
- }
- JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- // JsonUtil.printMode(out, null,
- // JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(list)));
- } catch (Exception e) {
- JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
@@ -545,7 +389,7 @@
for (Iterator<String> its = sets.iterator(); its.hasNext();)
array.add(its.next());
} finally {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
out.println(array.toString());
}
@@ -585,61 +429,9 @@
out.print("success");
}
- @RequestMapping(value = "testListTLJGoods")
- public void getGoodsList(String callback, PrintWriter out) {
- SearchFilter sf = new SearchFilter();
- sf.setQuan(1);
- sf.setTmall(true);
- // sf.setEndPrice(new BigDecimal(1000));
- sf.setPage(1);
- sf.setPage(100);
- sf.setCateIds("16");
- sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
-
- TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
- Gson gson = new Gson();
- JSONArray array = new JSONArray();
- for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, "100", null)));
- }
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
- }
-
- /**
- * 鎻掑叆閭�璇风礌鏉�
- *
- * @param out
- */
- @RequestMapping(value = "addInviteOrderLevelOne")
- public void addInviteOrderLevelOne(PrintWriter out) {
- try {
- System.out.println("-------------璇锋眰---------------");
- integralGetService.addShareSingleGoods(974767L);
- JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- } catch (Exception e) {
- JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
- @RequestMapping("pushVIVO")
- public void pushVIVO(PrintWriter out) {
- List<String> regList = new ArrayList<>();
- regList.add("15710270630271520610033");
- // regList.add("15711218630321520681531");
- // try {
- // VIVOPushUtil.pushUrl(regList, "鏍囬", "缃戦〉鍐呭", "http://www.baidu.com");
- // } catch (Exception e) {
- // }
-
- try {
- VIVOPushUtil.pushBaiChuanUrl(regList, "鏍囬", "鐧惧窛鍐呭", "http://www.taobao.com");// 鏈塨ug
- // VIVOPushUtil.pushGoods(regList, "鏍囬", "鍟嗗搧鍐呭", 2, 100005625634L);
- // VIVOPushUtil.pushUserSignInNotification(regList, "鏍囬", "绛惧埌");
- // VIVOPushUtil.pushWelfareCenter(regList,"鏍囬", "绂忓埄涓績");
- } catch (PushException e) {
- e.printStackTrace();
- }
+ @RequestMapping("getLocalTime")
+ public void getLocalTime(PrintWriter out) {
+ out.print(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
}
@RequestMapping("getSchedulerList")
@@ -650,6 +442,5 @@
}
} catch (Exception e) {
}
- }
-
+ }
}
--
Gitblit v1.8.0