diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java index 5e7a1c499..ad4c3ebcf 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java @@ -211,26 +211,27 @@ public class TtPayController extends BaseController { refund_amount = (Integer) pMap.get("refund_amount"); } - Map map = new HashMap<>(); - map.put("tenantId",tenantId); - map.put("appid",appid); - map.put("cp_refundno",cp_refundno); - map.put("status",status); - map.put("refund_amount",refund_amount.toString()); -// wxRefundOrderService.notify(map, EnumPayWay.PAY_WAY_TT); - - String jsonMsg = JSON.toJSONString(map); - - FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg(); - refundSuccessMsg.setTenantId(tenantId); - refundSuccessMsg.setMsgType(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode()); - refundSuccessMsg.setDelayTimeLevel(3); - refundSuccessMsg.setPayWay(EnumPayWay.PAY_WAY_TT.getCode()); - refundSuccessMsg.setPayVersion(EnumPayVersion.DY_PAY_V2.getCode()); - refundSuccessMsg.setJsonMsg(jsonMsg); - - // response = wxRefundOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); - mqBaseProducer.sendMessage(refundSuccessMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + //todo 抖音退款不通过回调处理,通过定时处理 +// Map map = new HashMap<>(); +// map.put("tenantId",tenantId); +// map.put("appid",appid); +// map.put("cp_refundno",cp_refundno); +// map.put("status",status); +// map.put("refund_amount",refund_amount.toString()); +//// wxRefundOrderService.notify(map, EnumPayWay.PAY_WAY_TT); +// +// String jsonMsg = JSON.toJSONString(map); +// +// FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg(); +// refundSuccessMsg.setTenantId(tenantId); +// refundSuccessMsg.setMsgType(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode()); +// refundSuccessMsg.setDelayTimeLevel(3); +// refundSuccessMsg.setPayWay(EnumPayWay.PAY_WAY_TT.getCode()); +// refundSuccessMsg.setPayVersion(EnumPayVersion.DY_PAY_V2.getCode()); +// refundSuccessMsg.setJsonMsg(jsonMsg); +// +// // response = wxRefundOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); +// mqBaseProducer.sendMessage(refundSuccessMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); resultMap.put("err_no",0); resultMap.put("err_tips","success"); diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java index 060905998..8814c4099 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java @@ -154,6 +154,7 @@ public class WxPayController extends BaseController { xml = IOUtils.toString(request.getInputStream(), Charset.forName("UTF-8")); logger.info(xml); paramMap = WxPayment.xmlToMap(xml); + paramMap.put("tenantId", tenantId); String jsonMsg = JSON.toJSONString(paramMap); FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index 61449f833..11fe0d039 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -60,8 +60,8 @@ public class InvestSchedule { private static final String TAG_REMIND = "招商定时任务-提醒"; - @Async - @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 +// @Async +// @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 //@Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行 public void messageSchedule() { log.info("{}: 开始", TAG_MESSAGE); @@ -72,8 +72,8 @@ public class InvestSchedule { log.info("{}: 结束", TAG_MESSAGE); } - @Async - @Scheduled(cron = "0 */5 * * * *?") +// @Async +// @Scheduled(cron = "0 */5 * * * *?") public void remindSchedule() { log.info("{}: 开始", TAG_REMIND); // 提醒新 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java index d64d5b359..c7a08b83e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java @@ -43,7 +43,7 @@ public class OrderRefundAuditSchedule { MaUtil maUtil; @Async - @Scheduled(cron = "0 */5 * * * ?")// + @Scheduled(cron = "0 40 */1 * * ?")// //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void orderQueryRefund() { @@ -131,7 +131,7 @@ public class OrderRefundAuditSchedule { return wxAppinfoMapper.findList(appinfo); } - @Async + @Scheduled(cron = "0 30 */1 * * ?")// 每个小时的30分钟 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void merchantAuditCallback() { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index 5eefd5672..9d6de280e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -61,8 +61,8 @@ public class PowerBillAutoBuildSchedule { /** * 每天5点执行 */ - @Async - @Scheduled(cron = "0 0 5 * * ?") +// @Async +// @Scheduled(cron = "0 0 5 * * ?") public void powerBillAutoConfigStart() { logger.info("自动生成电费账单开始...."); int dayOfMonth = LocalDate.now().getDayOfMonth(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java index 095de9480..8b9478372 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java @@ -48,8 +48,8 @@ public class SharingOrderRedoSchedule { } @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 * * * ?") // 测试 public void sharingOrderRedoSchedule() { List malls = getMalls(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java index 44aa62f43..c6972f08c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java @@ -35,8 +35,8 @@ public class SharingOrderResultSchedule { } @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秒中一次 public void sharingOrderResultSchedule() { List malls = getMalls(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java index 9beffb158..e69d31c83 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java @@ -44,7 +44,7 @@ public class TtMerchantReciverSchedule { * 每半小时 */ @Async - @Scheduled(cron = "0 */30 * * * ?") + @Scheduled(cron = "0 33 */1 * * ?") // @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行 public void updateMerchantReciverSchedule() { List ttAppInfos = getTTAppInfos(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java index ba5a76232..0b96e3975 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java @@ -38,7 +38,7 @@ public class WxCUserTagsSchedule { @Async // TODO 先不执行打标签操作了, 数据量太大,导致数据库CPU 100% //@Scheduled(cron = "0 0 0 25 * ?") // 每月25日凌晨01:00对会员列表扫描补录标签 - @Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次 +// @Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次 public void wxCUserTagsSchedule() { WxMall wxMall = new WxMall(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java index 878a8bcce..e3484125a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java @@ -46,7 +46,7 @@ public class WxMsgModelSchedule { WxMsgConfigMapper wxMsgConfigMapper; @Async - @Scheduled(cron = "0 0 */1 * * ?") // + @Scheduled(cron = "0 25 */2 * * ?") // public void querySmsTemplate() { WxMsgModel msgModel = new WxMsgModel(); msgModel.setStatus(EnumMsgModelStatus.AUDITING.getCode()); @@ -91,7 +91,7 @@ public class WxMsgModelSchedule { } @Async - @Scheduled(cron = "30 */10 * * * ?") // + @Scheduled(cron = "0 20 */2 * * ?") // public void querySendDetails() { WxMsgCallback msgCallback = new WxMsgCallback(); msgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java index 4cce1f0b7..e74c4e115 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java @@ -88,10 +88,10 @@ public class WxQuestionOneselfServiceImpl implements WxQuestionOneselfService { record.setCreateDate(now); wxQuestionOneselfMapper.insert(record); } else { - WxQuestionOneself byId = this.getById(record.getId()); - if(!byId.getStatus().equals(EnumQuestionOneselfStatus.STATUS_THROW_IN.getCode())){ - throw new MallinkException(ErrorCode.QUESTION_UPUP_LINE); - } +// WxQuestionOneself byId = this.getById(record.getId()); +// if(!byId.getStatus().equals(EnumQuestionOneselfStatus.STATUS_THROW_IN.getCode())){ +// throw new MallinkException(ErrorCode.QUESTION_UPUP_LINE); +// } WxQuestionOneselfTopic wxQuestionOneselfTopic = new WxQuestionOneselfTopic(); wxQuestionOneselfTopic.updateTenantInfo(record); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java index 1cc113fc1..0422b27a7 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java @@ -208,10 +208,11 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{ } 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")))); }