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..5086823c3 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java @@ -210,27 +210,27 @@ public class TtPayController extends BaseController { status = (String) pMap.get("status"); 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/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java index 60244500a..c7a08b83e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java @@ -13,6 +13,7 @@ import com.iformall.utils.MaUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -42,7 +43,7 @@ public class OrderRefundAuditSchedule { MaUtil maUtil; @Async - @Scheduled(cron = "0 0 */1 * * ?")// + @Scheduled(cron = "0 40 */1 * * ?")// //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void orderQueryRefund() { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java index 4f131831c..e69d31c83 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java @@ -7,6 +7,7 @@ import com.iformall.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component;