|
|
@@ -1,5 +1,6 @@
|
|
|
package com.book.server.service.impl;
|
|
|
|
|
|
+import com.alibaba.druid.support.json.JSONUtils;
|
|
|
import com.book.dao.VO.SunVO;
|
|
|
import com.book.dao.polardb.entity.SunChannel;
|
|
|
import com.book.dao.polardb.entity.SunOrder;
|
|
|
@@ -53,7 +54,7 @@ public class SunDataServiceImpl implements SunDataService {
|
|
|
private static final String TOKEN = "PKp2HD39ze3CdzizqH";
|
|
|
private static final String VIP_ID = "36637";
|
|
|
private static final String URL = "https://data.yifengaf.cn";
|
|
|
-
|
|
|
+ public static final boolean debug = false;
|
|
|
|
|
|
private Map<Integer, SunRequest> taskMap = new ConcurrentHashMap<>();
|
|
|
@Autowired
|
|
|
@@ -71,7 +72,6 @@ public class SunDataServiceImpl implements SunDataService {
|
|
|
|
|
|
String url = URL + sunTypeEnum.getPath();
|
|
|
request.setClient_id(CLIENT_ID);
|
|
|
-// request.setToken(TOKEN);
|
|
|
request.setNonce(UUID.randomUUID().toString().replace("-", ""));
|
|
|
request.setTimestamp(System.currentTimeMillis() + "");
|
|
|
request.setVip_id(VIP_ID);
|
|
|
@@ -103,6 +103,11 @@ public class SunDataServiceImpl implements SunDataService {
|
|
|
|
|
|
@Override
|
|
|
public void pullData(SunNotifyRequest request) {
|
|
|
+ if (debug) {
|
|
|
+ SunRequest object = JsonUtils.getObject("{\"client_id\":\"10005818\",\"nonce\":\"e1f1209a83e44dd1bbc6119d3d6386d7\",\"timestamp\":\"1632970800073\",\"signaure\":\"ba63fa6b6f1305ba0d29a759dad30a3dd70337a6\",\"vip_id\":\"36637\",\"start_time\":\"2021-9-30 10:00:00\",\"end_time\":\"2021-9-30 11:00:00\",\"is_finish\":\"1\"}\n", SunRequest.class);
|
|
|
+ taskMap.put(request.getTaskId(), object);
|
|
|
+ }
|
|
|
+
|
|
|
try {
|
|
|
|
|
|
|
|
|
@@ -181,7 +186,7 @@ public class SunDataServiceImpl implements SunDataService {
|
|
|
long l = sunChannelMapper.countByExample(example);
|
|
|
example.page(sunVO.getPage(), sunVO.getSize());
|
|
|
|
|
|
- return new PageResult<>(l,sunChannelMapper.selectByExample(example));
|
|
|
+ return new PageResult<>(l, sunChannelMapper.selectByExample(example));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -190,7 +195,7 @@ public class SunDataServiceImpl implements SunDataService {
|
|
|
long l = sunOrderMapper.countByExample(example);
|
|
|
example.page(sunVO.getPage(), sunVO.getSize());
|
|
|
example.orderBy(SunOrder.Column.createTime.desc());
|
|
|
- return new PageResult<>(l,sunOrderMapper.selectByExample(example));
|
|
|
+ return new PageResult<>(l, sunOrderMapper.selectByExample(example));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -199,7 +204,7 @@ public class SunDataServiceImpl implements SunDataService {
|
|
|
long l = sunOrderCollectMapper.countByExample(example);
|
|
|
example.page(sunVO.getPage(), sunVO.getSize());
|
|
|
example.orderBy(SunOrderCollect.Column.createTime.desc());
|
|
|
- return new PageResult<>(l,sunOrderCollectMapper.selectByExample(example));
|
|
|
+ return new PageResult<>(l, sunOrderCollectMapper.selectByExample(example));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -208,7 +213,7 @@ public class SunDataServiceImpl implements SunDataService {
|
|
|
long l = sunUserCollectMapper.countByExample(example);
|
|
|
example.page(sunVO.getPage(), sunVO.getSize());
|
|
|
example.orderBy(SunUserCollect.Column.createTime.desc());
|
|
|
- return new PageResult<>(l,sunUserCollectMapper.selectByExample(example));
|
|
|
+ return new PageResult<>(l, sunUserCollectMapper.selectByExample(example));
|
|
|
}
|
|
|
|
|
|
private void handleOrder(List<String> list, Integer taskId) {
|
|
|
@@ -327,4 +332,13 @@ public class SunDataServiceImpl implements SunDataService {
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
+ public static void main(String[] args) {
|
|
|
+ String line = "{\"merchant_id\":\"20210930105902_643505930_Sbjp\",\"transaction_id\":null,\"type\":\"书币充值\",\"money\":\"66.0\",\"state\":\"未完成\",\"create_time\":\"2021-09-30 10:59:03\",\"finish_time\":null,\"book_id\":null,\"book_name\":null,\"book_tags\":null,\"referral_id\":\"11539446\",\"referral_url\":\"https://wx6ba3406d7a8bddbd.yifengab.cn/t/11539446\",\"user_id\":\"643505930\",\"channel_id\":\"36648\",\"subscribe_time\":\"2021-09-30 09:16:08\",\"user_createtime\":\"2021-09-30 09:16:08\",\"openid\":\"ogjqN5g2cQlvpJPwtupxIq7NPXf8\",\"ip\":\"171.104.15.31\",\"user_agent\":\"Mozilla/5.0 (iPhone; CPU iPhone OS 14_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 MicroMessenger/8.0.7(0x18000733) NetType/4G Language/zh_CN\",\"activity_id\":\"7574690\",\"register_ip\":\"171.104.15.31\",\"recharge_money\":null,\"recharge_count\":null}\n";
|
|
|
+ GsonBuilder gsonBuilder = new GsonBuilder();
|
|
|
+ gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
|
|
|
+ Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
|
|
|
+ SunOrder sunOrder = gson.fromJson(line, SunOrder.class);
|
|
|
+ System.out.println(sunOrder);
|
|
|
+ }
|
|
|
}
|
