xhxu пре 5 година
родитељ
комит
9662388fbb
3 измењених фајлова са 16 додато и 0 уклоњено
  1. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java
  3. +9
    -0
      mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java

+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java Прегледај датотеку

@@ -62,6 +62,9 @@ public class BaseEntity implements Serializable {
for (Field field : fieldList) { for (Field field : fieldList) {
SortColumn sortColumnField = field.getAnnotation(SortColumn.class); SortColumn sortColumnField = field.getAnnotation(SortColumn.class);
if (sortColumnField != null && field.getName().equals(sortColumn)) { if (sortColumnField != null && field.getName().equals(sortColumn)) {
if(StringUtils.isBlank(sortOrder)){
return sortColumnField.column();
}
return sortColumnField.column() + " "+sortOrder; return sortColumnField.column() + " "+sortOrder;
} }
} }
@@ -79,6 +82,9 @@ public class BaseEntity implements Serializable {
} }


//默认驼峰解析 //默认驼峰解析
if(StringUtils.isBlank(sortOrder)){
return underscoreName(sortColumn);
}
return underscoreName(sortColumn) +" "+sortOrder; return underscoreName(sortColumn) +" "+sortOrder;
} }
} catch (Exception e) { } catch (Exception e) {


+ 1
- 0
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",createSign(map, secrect));
map.put("sign",getSign(map)); map.put("sign",getSign(map));
String response = doPost("https://developer.toutiao.com/api/apps/ecpay/v1/query_order", 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 jsonObject = JSON.parseObject(response);
JSONObject info = jsonObject.getJSONObject("payment_info"); JSONObject info = jsonObject.getJSONObject("payment_info");
if (null != info) { if (null != info) {


+ 9
- 0
mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java Прегледај датотеку

@@ -1,5 +1,6 @@
package com.iformall.schedule; package com.iformall.schedule;


import com.iformall.domain.po.WxMerchant;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -20,6 +21,9 @@ public class TtOrderExpiringSchedule {
@Autowired @Autowired
TtOrderMapper ttOrderMapper; TtOrderMapper ttOrderMapper;


@Autowired
WxMerchantMapper wxMerchantMapper;

@Scheduled(cron = "0 */1 * * * *?") // 每1分钟检查一次 @Scheduled(cron = "0 */1 * * * *?") // 每1分钟检查一次
public void orderExpireSchedule() { public void orderExpireSchedule() {
Date now = new Date(); Date now = new Date();
@@ -28,7 +32,12 @@ public class TtOrderExpiringSchedule {
if(count > 0){ if(count > 0){
logger.info("订单过期"+count+"个"); logger.info("订单过期"+count+"个");
} }
}


@Scheduled(cron = "0 0 4 * * ?") //每天四点入账
public void orderRecordedSchedule() {
WxMerchant merchant = new WxMerchant();
wxMerchantMapper.findList(merchant);
} }


} }

Loading…
Откажи
Сачувај