fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -311,7 +311,7 @@ String tearcherLink = configService.getByVersion(ConfigKeyEnum.tearcherLink.getKey(), acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())); if (userActivedRecordService.canNotifyAddTearcher(uid)) { if (userActivedRecordService.canNotifyAddTearcher(uid) && !StringUtil.isNullOrEmpty(tearcherLink)) { UserInfo userInfo = userInfoService.selectAvailableByPrimaryKey(uid); if (userInfo != null) { JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web", fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -247,8 +247,7 @@ list.add(map.get(TYPE_FAQUAN)); list.add(map.get(TYPE_HUODONG)); // list.add(map.get(TYPE_XUEYUAN)); list.add(map.get(TYPE_SUCAI)); // list.add(map.get(TYPE_SUCAI)); } else if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) { // 2.0.6返回热销+活动+推荐+学院+邀请 list.add(map.get(TYPE_REXIAO)); @@ -973,7 +972,7 @@ } } String newText = text; String newText = text; try { newText = convertLinkManager.convertLinkFromText(text, uid, true); } catch (ConvertLinkExceptionException e) { fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java
@@ -1,7 +1,15 @@ package com.yeshi.fanli.controller.devops; import java.io.PrintWriter; import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException; import com.yeshi.fanli.service.inter.order.OrderProcessService; /** * 运维订单接口 @@ -13,8 +21,25 @@ @RequestMapping("devops/order") public class OrderDevOpsController { @Resource private OrderProcessService orderProcessService; /** * 返利 * @param hongBaoId * @param out */ @RequestMapping("fanliByHongBaoId") public void fanli(Long hongBaoId, PrintWriter out) { try { orderProcessService.fanli(new HongBaoV2(hongBaoId)); out.print("success"); } catch (TaoBaoWeiQuanException e) { e.printStackTrace(); out.print(e.getMessage()); } catch (Exception e) { out.print(e.getMessage()); } } } fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -64,9 +64,9 @@ @Resource private GoodsEvaluateService goodsEvaluateService; /** * 每10分钟 晚上00:00~06:00不下发任何一个商品 * 每10分钟 晚上00:00~06:00不下发任何一个商品 */ @Scheduled(cron = "0 0/10 6-23 * * ?") public void insetDynamicInfo() { @@ -203,7 +203,7 @@ } /** * 后台编辑动态： 每3分钟检索 * 后台编辑动态： 每3分钟检索 */ @Scheduled(cron = "0 0/3 * * * ?") public void activityNeedPublish() { @@ -272,13 +272,8 @@ /** * * @Title: demoJobHandler * @Description: 更新小程序动态商品 * @param param * @return * @throws Exception * ReturnT<String> 返回类型 * @throws * @Title: demoJobHandler @Description: 更新小程序动态商品 @param * param @return @throws Exception ReturnT<String> 返回类型 @throws */ @XxlJob("dynamic-updateWXMPDynamicInfo") public ReturnT<String> updateWXMPDynamicInfoHandler(String param) throws Exception { @@ -287,11 +282,7 @@ } /** * 添加内优惠相关商品 * @Title: addJDNYHInfo * @Description: * void 返回类型 * @throws * 添加内优惠相关商品 @Title: addJDNYHInfo @Description: void 返回类型 @throws */ private void addJDNYHInfo() throws Exception { @@ -356,18 +347,17 @@ wxmpDynamicInfoService.addWXMPDynamicInfo(info); } } /** * 自动生成发圈 * 早上6,7,15,16,21,22,23点更新1次 */ @Scheduled(cron = "0 0 6,7,15,16,21,22,23 * * ? ") public void insetEvaluate() { if (!Constant.IS_TASK) { return; } /** * 动态发圈 * * @param param * @return * @throws Exception */ // @Scheduled(cron = "0 0 6,7,15,16,21,22,23 * * ? ") @XxlJob("dynamic-insertEvaluate") public ReturnT<String> insertEvaluate(String param) throws Exception { try { goodsEvaluateService.addGoodsEvaluateByDaTaoKe(); } catch (Exception e) { @@ -377,6 +367,7 @@ e1.printStackTrace(); } } return ReturnT.SUCCESS; } }
