diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java index f8bd4830b..0a0babbce 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java @@ -62,6 +62,9 @@ public class BaseEntity implements Serializable { for (Field field : fieldList) { SortColumn sortColumnField = field.getAnnotation(SortColumn.class); if (sortColumnField != null && field.getName().equals(sortColumn)) { + if(StringUtils.isBlank(sortOrder)){ + return sortColumnField.column(); + } return sortColumnField.column() + " "+sortOrder; } } @@ -79,6 +82,9 @@ public class BaseEntity implements Serializable { } //默认驼峰解析 + if(StringUtils.isBlank(sortOrder)){ + return underscoreName(sortColumn); + } return underscoreName(sortColumn) +" "+sortOrder; } } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java b/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java index 6cbc6e72a..fe2532071 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java @@ -157,6 +157,7 @@ public class DouYinPayHelper { // map.put("sign",createSign(map, secrect)); map.put("sign",getSign(map)); String response = doPost("https://developer.toutiao.com/api/apps/ecpay/v1/query_order", map); + log.info("查询订单结果 response:"+response); JSONObject jsonObject = JSON.parseObject(response); JSONObject info = jsonObject.getJSONObject("payment_info"); if (null != info) { diff --git a/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java b/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java index 1618a8cff..a19f421d3 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java +++ b/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java @@ -1,5 +1,6 @@ package com.iformall.schedule; +import com.iformall.domain.po.WxMerchant; import com.iformall.enums.*; import com.iformall.mapper.*; import org.slf4j.Logger; @@ -20,6 +21,9 @@ public class TtOrderExpiringSchedule { @Autowired TtOrderMapper ttOrderMapper; + @Autowired + WxMerchantMapper wxMerchantMapper; + @Scheduled(cron = "0 */1 * * * *?") // 每1分钟检查一次 public void orderExpireSchedule() { Date now = new Date(); @@ -28,7 +32,12 @@ public class TtOrderExpiringSchedule { if(count > 0){ logger.info("订单过期"+count+"个"); } + } + @Scheduled(cron = "0 0 4 * * ?") //每天四点入账 + public void orderRecordedSchedule() { + WxMerchant merchant = new WxMerchant(); + wxMerchantMapper.findList(merchant); } } \ No newline at end of file