fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/resource/app.properties | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/resource/system_config.properties | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/resource/wx_gz_config.properties | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/test/java/org/fanli/MyBatisProduce.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/test/java/org/fanli/TaoKeTest.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -183,11 +183,11 @@ data.put("userRank", gson.toJson(userRank)); data.put("dailySign", dailySignVO); } for(int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) { IntegralTaskClassVO taskClassVO = list.get(i); UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey(); // 邀请好友:是否激活邀请码 if (uniqueKey == UniqueKeyEnum.inviteTeam) { UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid); @@ -234,7 +234,6 @@ taskClassVO.setLightUp(true); } int countFinished = 0; Long id = taskClassVO.getId(); // 查询当日 @@ -245,16 +244,17 @@ countFinished = integralTaskRecordService.countFinished(uid, id, 1); } } if (uniqueKey == UniqueKeyEnum.accountMaintain) { countFinished = integralTaskRecordService.countFinished(uid, id, null); // 查询历史 } /* * // 完善信息完成后,列表中消失 if (uniqueKey == UniqueKeyEnum.accountMaintain && taskNum == * countFinished) { list.remove(i); i --; continue; } * // 完善信息完成后,列表中消失 if (uniqueKey == * UniqueKeyEnum.accountMaintain && taskNum == countFinished) { * list.remove(i); i --; continue; } */ progress = progress.replace("{已完成}", countFinished + "").replace("{总任务}", taskNum + ""); if (signState == 0 && uniqueKey == UniqueKeyEnum.dailySign) { @@ -540,46 +540,50 @@ } IntegralTaskRecord record = null; if (TaskUniqueKeyEnum.recommendSearch.name().equalsIgnoreCase(event)) { record = integralGetService.addRecommendSearch(uid); } else if (TaskUniqueKeyEnum.shareInvite.name().equalsIgnoreCase(event)) { record = integralGetService.addShareInvite(uid); } else if (TaskUniqueKeyEnum.inShop.name().equalsIgnoreCase(event)) { JSONObject json = JSONObject.fromObject(data); record = integralGetService.addIntoShop(uid, StringUtil.Md5(json.optString("url"))); } else if (TaskUniqueKeyEnum.scanPush.name().equalsIgnoreCase(event)) { record = integralGetService.addScanPushHistory(uid); } else if (TaskUniqueKeyEnum.scanGoods.name().equalsIgnoreCase(event)) { JSONObject json = JSONObject.fromObject(data); record = integralGetService.addScanGoodsDetail(uid, json.optInt("goodsType"), json.optLong("goodsId")); } else if (TaskUniqueKeyEnum.scanHomeBanner.name().equalsIgnoreCase(event)) { JSONObject json = JSONObject.fromObject(data); record = integralGetService.addScanRecommendBanner(uid, json.optString("id")); } else if (TaskUniqueKeyEnum.scanSpecial.name().equalsIgnoreCase(event)) { JSONObject json = JSONObject.fromObject(data); record = integralGetService.addScanRecommendSpecial(uid, json.optString("id")); } else if (TaskUniqueKeyEnum.scanTBCart.name().equalsIgnoreCase(event)) { record = integralGetService.addScanTaoBaoCart(uid); } if (record != null) { JSONObject notifyData = new JSONObject(); if (TaskUniqueKeyEnum.recommendSearch.name().equalsIgnoreCase(event) || TaskUniqueKeyEnum.scanGoods.name().equalsIgnoreCase(event) || TaskUniqueKeyEnum.scanTBCart.name().equalsIgnoreCase(event)) { JSONObject notify = new JSONObject(); if (TaskUniqueKeyEnum.recommendSearch.name().equalsIgnoreCase(event)) notify.put("name", "完成一次智能搜索"); else if (TaskUniqueKeyEnum.scanGoods.name().equalsIgnoreCase(event)) notify.put("name", "完成一次商品浏览"); else if (TaskUniqueKeyEnum.scanTBCart.name().equalsIgnoreCase(event)) notify.put("name", "完成一次购物车浏览"); notify.put("score", String.format("+%s金币", record.getGoldCoin())); notifyData.put("notify", notify); try { if (TaskUniqueKeyEnum.recommendSearch.name().equalsIgnoreCase(event)) { record = integralGetService.addRecommendSearch(uid); } else if (TaskUniqueKeyEnum.shareInvite.name().equalsIgnoreCase(event)) { record = integralGetService.addShareInvite(uid); } else if (TaskUniqueKeyEnum.inShop.name().equalsIgnoreCase(event)) { JSONObject json = JSONObject.fromObject(data); record = integralGetService.addIntoShop(uid, StringUtil.Md5(json.optString("url"))); } else if (TaskUniqueKeyEnum.scanPush.name().equalsIgnoreCase(event)) { record = integralGetService.addScanPushHistory(uid); } else if (TaskUniqueKeyEnum.scanGoods.name().equalsIgnoreCase(event)) { JSONObject json = JSONObject.fromObject(data); record = integralGetService.addScanGoodsDetail(uid, json.optInt("goodsType"), json.optLong("goodsId")); } else if (TaskUniqueKeyEnum.scanHomeBanner.name().equalsIgnoreCase(event)) { JSONObject json = JSONObject.fromObject(data); record = integralGetService.addScanRecommendBanner(uid, json.optString("id")); } else if (TaskUniqueKeyEnum.scanSpecial.name().equalsIgnoreCase(event)) { JSONObject json = JSONObject.fromObject(data); record = integralGetService.addScanRecommendSpecial(uid, json.optString("id")); } else if (TaskUniqueKeyEnum.scanTBCart.name().equalsIgnoreCase(event)) { record = integralGetService.addScanTaoBaoCart(uid); } out.print(JsonUtil.loadTrueResult(notifyData)); } else { if (record != null) { JSONObject notifyData = new JSONObject(); if (TaskUniqueKeyEnum.recommendSearch.name().equalsIgnoreCase(event) || TaskUniqueKeyEnum.scanGoods.name().equalsIgnoreCase(event) || TaskUniqueKeyEnum.scanTBCart.name().equalsIgnoreCase(event)) { JSONObject notify = new JSONObject(); if (TaskUniqueKeyEnum.recommendSearch.name().equalsIgnoreCase(event)) notify.put("name", "完成一次智能搜索"); else if (TaskUniqueKeyEnum.scanGoods.name().equalsIgnoreCase(event)) notify.put("name", "完成一次商品浏览"); else if (TaskUniqueKeyEnum.scanTBCart.name().equalsIgnoreCase(event)) notify.put("name", "完成一次购物车浏览"); notify.put("score", String.format("+%s金币", record.getGoldCoin())); notifyData.put("notify", notify); } out.print(JsonUtil.loadTrueResult(notifyData)); } else { out.print(JsonUtil.loadFalseResult("")); } } catch (Exception e) { out.print(JsonUtil.loadFalseResult("")); } } fanli/src/main/resource/app.properties
@@ -71,7 +71,7 @@ share_content=来自你的分享赚订单号:{0}的分享提成¥{1}元已经转入到你的余额中 service_title=售后订单扣款提示 service_content=订单号:{0}的订单淘宝已售后退款处理,其订单返利/分享提成¥{1}元,将从你的余额中扣出。因为任何订单出现退款或售后,商家均不会支付相应订单的广告费,所以板栗快省也无法提供返利,非常遗憾。温馨提示:恶意的提交售后申请,淘宝会对该用户做相应的处罚,购物信用将永远有记录;另一方面板栗快省也会做出相应处罚。 service_content=订单号:{0}的订单淘宝已售后退款处理,其订单返利/分享提成¥{1}元,将从你的余额中扣出。因为任何订单出现退款或售后,商家均不会支付相应订单的广告费,所以返利券也无法提供返利,非常遗憾。温馨提示:恶意的提交售后申请,淘宝会对该用户做相应的处罚,购物信用将永远有记录;另一方面返利券也会做出相应处罚。 extract_apply_title=你已成功提交提现申请 extract_apply_content=你已成功提交提现申请,我们会尽快审核,如账目明细无误,我们将在24小时内为您转账。 fanli/src/main/resource/system_config.properties
@@ -3,7 +3,7 @@ #项目名称 project_name=fanli project_chinese_name=板栗快省 project_chinese_name=返利券 #项目域名 project_host=flq.yeshitv.com #公众号appid fanli/src/main/resource/wx_gz_config.properties
@@ -1,7 +1,7 @@ #微信公众号配置 #欢迎语 welcome_msg=你好啊,欢迎来到《板栗快省》官方公众号[爱心][爱心] \n 平时购物领券可是一种生活方式哦,券后价非常给力,下载《板栗快省》APP有返利哦,现在可以购物领券啦![發][發] \n [礼物]你可以回复,例如:衣服,可快速查询优惠券。\n [强]购物领券,绝对超给力 \n\n ↓↓下载APP不光能领券↓↓ \n ↓↓还有返利哦↓↓ \n <a href='http://sj.qq.com/myapp/detail.htm?apkName=com.yeshi.ec.rebate'> >>>戳此下载</a> welcome_msg=你好啊,欢迎来到《返利券》官方公众号[爱心][爱心] \n 平时购物领券可是一种生活方式哦,券后价非常给力,下载《返利券》APP有返利哦,现在可以购物领券啦![發][發] \n [礼物]你可以回复,例如:衣服,可快速查询优惠券。\n [强]购物领券,绝对超给力 \n\n ↓↓下载APP不光能领券↓↓ \n ↓↓还有返利哦↓↓ \n <a href='http://sj.qq.com/myapp/detail.htm?apkName=com.yeshi.ec.rebate'> >>>戳此下载</a> #app下载链接 app_download_link=http://sj.qq.com/myapp/detail.htm?apkName=com.yeshi.ec.rebate fanli/src/test/java/org/fanli/MyBatisProduce.java
@@ -4,23 +4,23 @@ import org.yeshi.utils.mybatis.ColumnParseUtil; import org.yeshi.utils.mybatis.MyBatisMapperUtil; import com.yeshi.fanli.entity.common.Config; import com.yeshi.fanli.entity.jd.JDOrderItem; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; //@Ignore public class MyBatisProduce { @Test public void test3() { // MyBatisMapperUtil.createMapper(JDOrder.class); // MyBatisMapperUtil.createMapper(JDOrder.class); MyBatisMapperUtil.createMapper(JDOrderItem.class); // MyBatisMapperUtil.createMapper(UserMoneyDebtReturnHistory.class); } @Test public void test1() { ColumnParseUtil.parseColumn(TaoBaoOrder.class, "D:\\workspace\\fanli\\fanli-server\\fanli\\src\\main\\java\\com\\yeshi\\fanli\\mapping\\taobao\\TaoBaoOrderMapper.xml"); ColumnParseUtil.parseColumn(Config.class, "D:\\workspace\\fanli\\fanli-server\\fanli\\src\\main\\java\\com\\yeshi\\fanli\\mapping\\ConfigMapper.xml"); } } fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -23,7 +23,6 @@ import com.yeshi.fanli.entity.taobao.TaoBaoLink; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.entity.taobao.TaoKeAppInfo; import com.yeshi.fanli.exception.taobao.TaoKeApiException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.goods.ShareGoodsService; @@ -48,16 +47,35 @@ @Test public void test1() { try { TaoKeAppInfo app = new TaoKeAppInfo("27867727", "781fce83545edbed13af32dc3fa9fc3a", "mm_124933865_865950258_109407350204"); app.setAdzoneId("109407350204"); TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(596441448615L, app); System.out.println(goods); } catch (TaobaoGoodsDownException e) { e.printStackTrace(); } } @Test public void test2() { System.out.println(HttpUtil.getShortLink("http://h5.flq001.com")); System.out.println(HttpUtil.getShortLink("http://h5.flq002.com")); System.out.println(HttpUtil.getShortLink("http://h5.flq003.com")); System.out.println(HttpUtil.getShortLink("http://h5.flq004.com")); System.out.println(HttpUtil.getShortLink("http://h5.flq005.com")); TaoBaoGoodsBrief goods = null; try { goods = TaoKeApiUtil.searchGoodsDetail(601535036423L); // goods = TaoKeApiUtil.searchGoodsDetail(601535036423L, new // TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, // TaoBaoConstant.TAOBAO_AUTH_APPSECRET, // TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT)); } catch (TaobaoGoodsDownException e2) { e2.printStackTrace(); } System.out.println(goods); // goods = TaoKeApiUtil.searchGoodsDetail(auctionId); } @Test @@ -66,13 +84,13 @@ String appKey = "27821872"; String appSecret = "9277b7c40b753e142303eeabc1936c80"; String pid = "mm_491980152_690500060_109327900051"; TaoKeAppInfo app=new TaoKeAppInfo(appKey, appSecret, pid); TaoKeAppInfo app = new TaoKeAppInfo(appKey, appSecret, pid); try { TaoKeApiUtil.createTaoLiJin(auctionId, "淘礼金", new BigDecimal(1), 1, new Date(), new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), new Date(), new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), app); } catch (TaoKeApiException e) { } catch (Exception e) { e.printStackTrace(); } }