Conflicts: mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.javarelease_toaliyun_real
| @@ -154,6 +154,7 @@ public class WxPayController extends BaseController { | |||||
| xml = IOUtils.toString(request.getInputStream(), Charset.forName("UTF-8")); | xml = IOUtils.toString(request.getInputStream(), Charset.forName("UTF-8")); | ||||
| logger.info(xml); | logger.info(xml); | ||||
| paramMap = WxPayment.xmlToMap(xml); | paramMap = WxPayment.xmlToMap(xml); | ||||
| paramMap.put("tenantId", tenantId); | |||||
| String jsonMsg = JSON.toJSONString(paramMap); | String jsonMsg = JSON.toJSONString(paramMap); | ||||
| FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg(); | FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg(); | ||||
| @@ -60,8 +60,8 @@ public class InvestSchedule { | |||||
| private static final String TAG_REMIND = "招商定时任务-提醒"; | private static final String TAG_REMIND = "招商定时任务-提醒"; | ||||
| @Async | |||||
| @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 | |||||
| // @Async | |||||
| // @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 | |||||
| //@Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行 | //@Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行 | ||||
| public void messageSchedule() { | public void messageSchedule() { | ||||
| log.info("{}: 开始", TAG_MESSAGE); | log.info("{}: 开始", TAG_MESSAGE); | ||||
| @@ -72,8 +72,8 @@ public class InvestSchedule { | |||||
| log.info("{}: 结束", TAG_MESSAGE); | log.info("{}: 结束", TAG_MESSAGE); | ||||
| } | } | ||||
| @Async | |||||
| @Scheduled(cron = "0 */5 * * * *?") | |||||
| // @Async | |||||
| // @Scheduled(cron = "0 */5 * * * *?") | |||||
| public void remindSchedule() { | public void remindSchedule() { | ||||
| log.info("{}: 开始", TAG_REMIND); | log.info("{}: 开始", TAG_REMIND); | ||||
| // 提醒新 | // 提醒新 | ||||
| @@ -13,7 +13,6 @@ import com.iformall.utils.MaUtil; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.scheduling.annotation.Async; | |||||
| import org.springframework.scheduling.annotation.Scheduled; | import org.springframework.scheduling.annotation.Scheduled; | ||||
| import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
| @@ -43,7 +42,7 @@ public class OrderRefundAuditSchedule { | |||||
| MaUtil maUtil; | MaUtil maUtil; | ||||
| @Async | @Async | ||||
| @Scheduled(cron = "0 */5 * * * ?")// | |||||
| @Scheduled(cron = "0 0 */1 * * ?")// | |||||
| //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 | //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 | ||||
| public void orderQueryRefund() { | public void orderQueryRefund() { | ||||
| @@ -131,7 +130,7 @@ public class OrderRefundAuditSchedule { | |||||
| return wxAppinfoMapper.findList(appinfo); | return wxAppinfoMapper.findList(appinfo); | ||||
| } | } | ||||
| @Async | |||||
| @Scheduled(cron = "0 30 */1 * * ?")// 每个小时的30分钟 | @Scheduled(cron = "0 30 */1 * * ?")// 每个小时的30分钟 | ||||
| //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 | //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 | ||||
| public void merchantAuditCallback() { | public void merchantAuditCallback() { | ||||
| @@ -61,8 +61,8 @@ public class PowerBillAutoBuildSchedule { | |||||
| /** | /** | ||||
| * 每天5点执行 | * 每天5点执行 | ||||
| */ | */ | ||||
| @Async | |||||
| @Scheduled(cron = "0 0 5 * * ?") | |||||
| // @Async | |||||
| // @Scheduled(cron = "0 0 5 * * ?") | |||||
| public void powerBillAutoConfigStart() { | public void powerBillAutoConfigStart() { | ||||
| logger.info("自动生成电费账单开始...."); | logger.info("自动生成电费账单开始...."); | ||||
| int dayOfMonth = LocalDate.now().getDayOfMonth(); | int dayOfMonth = LocalDate.now().getDayOfMonth(); | ||||
| @@ -48,8 +48,8 @@ public class SharingOrderRedoSchedule { | |||||
| } | } | ||||
| @Async | @Async | ||||
| // @Scheduled(cron = "0 0 2 * * ?") // 每天凌晨02:00分账重试 | |||||
| @Scheduled(cron = "0 15 */2 * * ?")// 每2个小时的15分钟 | |||||
| @Scheduled(cron = "0 15 2 * * ?") // 每天凌晨02:00分账重试 | |||||
| // @Scheduled(cron = "0 15 */2 * * ?")// 每2个小时的15分钟 | |||||
| // @Scheduled(cron = "0 0/10 * * * ?") // 测试 | // @Scheduled(cron = "0 0/10 * * * ?") // 测试 | ||||
| public void sharingOrderRedoSchedule() { | public void sharingOrderRedoSchedule() { | ||||
| List<WxMall> malls = getMalls(); | List<WxMall> malls = getMalls(); | ||||
| @@ -35,8 +35,8 @@ public class SharingOrderResultSchedule { | |||||
| } | } | ||||
| @Async | @Async | ||||
| // @Scheduled(cron = "0 0 3 * * ?") // 每天凌晨3:00更新分账结果 | |||||
| @Scheduled(cron = "0 30 */2 * * ?")// 每2个小时的30分钟 | |||||
| @Scheduled(cron = "0 15 3 * * ?") // 每天凌晨3:00更新分账结果 | |||||
| // @Scheduled(cron = "0 30 */2 * * ?")// 每2个小时的30分钟 | |||||
| // @Scheduled(cron = "* */15 * * * ?") // 测试10秒中一次 | // @Scheduled(cron = "* */15 * * * ?") // 测试10秒中一次 | ||||
| public void sharingOrderResultSchedule() { | public void sharingOrderResultSchedule() { | ||||
| List<WxMall> malls = getMalls(); | List<WxMall> malls = getMalls(); | ||||
| @@ -7,7 +7,6 @@ import com.iformall.service.*; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.scheduling.annotation.Async; | |||||
| import org.springframework.scheduling.annotation.Scheduled; | import org.springframework.scheduling.annotation.Scheduled; | ||||
| import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
| @@ -44,7 +43,7 @@ public class TtMerchantReciverSchedule { | |||||
| * 每半小时 | * 每半小时 | ||||
| */ | */ | ||||
| @Async | @Async | ||||
| @Scheduled(cron = "0 */30 * * * ?") | |||||
| @Scheduled(cron = "0 33 */1 * * ?") | |||||
| // @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行 | // @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行 | ||||
| public void updateMerchantReciverSchedule() { | public void updateMerchantReciverSchedule() { | ||||
| List<WxAppinfo> ttAppInfos = getTTAppInfos(); | List<WxAppinfo> ttAppInfos = getTTAppInfos(); | ||||
| @@ -38,7 +38,7 @@ public class WxCUserTagsSchedule { | |||||
| @Async | @Async | ||||
| // TODO 先不执行打标签操作了, 数据量太大,导致数据库CPU 100% | // TODO 先不执行打标签操作了, 数据量太大,导致数据库CPU 100% | ||||
| //@Scheduled(cron = "0 0 0 25 * ?") // 每月25日凌晨01:00对会员列表扫描补录标签 | //@Scheduled(cron = "0 0 0 25 * ?") // 每月25日凌晨01:00对会员列表扫描补录标签 | ||||
| @Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次 | |||||
| // @Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次 | |||||
| public void wxCUserTagsSchedule() { | public void wxCUserTagsSchedule() { | ||||
| WxMall wxMall = new WxMall(); | WxMall wxMall = new WxMall(); | ||||
| @@ -46,7 +46,7 @@ public class WxMsgModelSchedule { | |||||
| WxMsgConfigMapper wxMsgConfigMapper; | WxMsgConfigMapper wxMsgConfigMapper; | ||||
| @Async | @Async | ||||
| @Scheduled(cron = "0 0 */1 * * ?") // | |||||
| @Scheduled(cron = "0 25 */2 * * ?") // | |||||
| public void querySmsTemplate() { | public void querySmsTemplate() { | ||||
| WxMsgModel msgModel = new WxMsgModel(); | WxMsgModel msgModel = new WxMsgModel(); | ||||
| msgModel.setStatus(EnumMsgModelStatus.AUDITING.getCode()); | msgModel.setStatus(EnumMsgModelStatus.AUDITING.getCode()); | ||||
| @@ -91,7 +91,7 @@ public class WxMsgModelSchedule { | |||||
| } | } | ||||
| @Async | @Async | ||||
| @Scheduled(cron = "30 */10 * * * ?") // | |||||
| @Scheduled(cron = "0 20 */2 * * ?") // | |||||
| public void querySendDetails() { | public void querySendDetails() { | ||||
| WxMsgCallback msgCallback = new WxMsgCallback(); | WxMsgCallback msgCallback = new WxMsgCallback(); | ||||
| msgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); | msgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); | ||||
| @@ -208,10 +208,11 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{ | |||||
| } | } | ||||
| String out_order_no = result.getString("out_order_no"); | String out_order_no = result.getString("out_order_no"); | ||||
| if (StringUtils.isBlank(out_order_no) || !out_order_no.equals(record.getId().toString())){ | |||||
| throw new MallinkException(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(),"out_order_no:["+out_order_no+"] WxProfitSharingOrder:["+record.getId()+"]"); | |||||
| if (StringUtils.isBlank(out_order_no) || !out_order_no.equals(record.getOrderId().toString())){ | |||||
| throw new MallinkException(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(),"out_order_no:["+out_order_no+"] WxProfitSharingOrder:["+record.getOrderId()+"]"); | |||||
| } | } | ||||
| return new PayShareQueryResult(true, 200, "success",result, this.getReceivers(JSON.toJSONString(result.get("receivers")))); | |||||
| return new PayShareQueryResult(true, EnumProfitSharingOrderStatus.PROFIT_SHARING_DONE.getCode(), "success",result, this.getReceivers(JSON.toJSONString(result.get("receivers")))); | |||||
| } | } | ||||