소스 검색

财务模块获取头条日流水和流水详情接口

zhouzeyu@c-top.com.cn 3 년 전
부모
커밋
bb0d2c8a93

+ 21 - 24
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/agent/controller/AgentManagementController.java

@@ -10,9 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
 
 @RestController
 @RequestMapping("/agent")
@@ -22,9 +19,10 @@ public class AgentManagementController {
     @Autowired
     AgentManagementService agentManagementService;
 
+
     @RequestMapping("/queryAccountTransactionDetails")
-    public void getList(@Param("starDate")String startDate,@Param("endDate")String endDate) {
-        Result recharge = agentManagementService.synchronousAccountTransactionDetails(startDate,endDate);
+    public void getList(@Param("starDate") String startDate, @Param("endDate") String endDate) {
+        Result recharge = agentManagementService.synchronousAccountTransactionDetails(startDate, endDate);
 
     }
 
@@ -35,36 +33,35 @@ public class AgentManagementController {
 
 
     @RequestMapping("/synchronousAccountTransactionDay")
-    public void synchronousAccountTransactionDay(@Param("starDate")String startDate,@Param("endDate")String endDate) {
-        Result recharge = agentManagementService.synchronousAccountTransactionDay(startDate,endDate);
+    public void synchronousAccountTransactionDay(@Param("starDate") String startDate, @Param("endDate") String endDate) {
+        Result recharge = agentManagementService.synchronousAccountTransactionDay(startDate, endDate);
     }
 
 
     @RequestMapping("/synchronous")
     public void synchronous() throws ParseException {
-        String date1="2021-05-01";
-        String date2="2021-05-31";
-        String date3="2021-06-01";
-        String date4="2021-06-30";
-        String date5="2021-07-01";
-        String date6="2021-07-31";
-        String date7="2021-08-01";
-        String date8="2021-08-31";
+        String date1 = "2021-05-01";
+        String date2 = "2021-05-31";
+        String date3 = "2021-06-01";
+        String date4 = "2021-06-30";
+        String date5 = "2021-07-01";
+        String date6 = "2021-07-31";
+        String date7 = "2021-08-01";
+        String date8 = "2021-08-31";
         agentManagementService.synchronousAccount();
         //5月份
-         agentManagementService.synchronousAccountTransactionDetails(date1,date2);
-         agentManagementService.synchronousAccountTransactionDay(date1,date2);
+        agentManagementService.synchronousAccountTransactionDetails(date1, date2);
+        agentManagementService.synchronousAccountTransactionDay(date1, date2);
         //6月份
-         agentManagementService.synchronousAccountTransactionDetails(date3,date4);
-         agentManagementService.synchronousAccountTransactionDay(date3,date4);
+        agentManagementService.synchronousAccountTransactionDetails(date3, date4);
+        agentManagementService.synchronousAccountTransactionDay(date3, date4);
         //7月份
-         agentManagementService.synchronousAccountTransactionDetails(date5,date6);
-         agentManagementService.synchronousAccountTransactionDay(date5,date6);
+        agentManagementService.synchronousAccountTransactionDetails(date5, date6);
+        agentManagementService.synchronousAccountTransactionDay(date5, date6);
         //8月份
-          agentManagementService.synchronousAccountTransactionDetails(date7,date8);
-          agentManagementService.synchronousAccountTransactionDay(date7,date8);
+        agentManagementService.synchronousAccountTransactionDetails(date7, date8);
+        agentManagementService.synchronousAccountTransactionDay(date7, date8);
     }
 
 
-
 }

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/agent/mapper/CtopAccountTransactionDayMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 @Mapper
 public interface CtopAccountTransactionDayMapper {
 
-    List<String> getAdvertiserIdByDate(@Param("date") String date,@Param("advertiserId") String advertiserId);
+    List<String> getAdvertiserIdByDate(@Param("date") String date, @Param("advertiserId") String advertiserId);
 
     void saveAccountTransactionDay(@Param("list") List<TransactionDay> list, @Param("date") String date);
 

+ 4 - 4
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/agent/service/AgentManagementService.java

@@ -12,17 +12,17 @@ public interface AgentManagementService {
 
 
     //查询账号流水
-    public JSONObject queryAccountTransactionDetails(String AccountId, String transaction_type, int pageNum, int pageSize,String startDate,String endDate);
+    public JSONObject queryAccountTransactionDetails(String AccountId, String transaction_type, int pageNum, int pageSize, String startDate, String endDate);
 
     //查询账号流水
-    public JSONObject queryAccountTransactionDay(String AccountId, int pageNum, int pageSize,String startDate,String endDate);
+    public JSONObject queryAccountTransactionDay(String AccountId, int pageNum, int pageSize, String startDate, String endDate);
 
     //同步代理商账户入库
     public Result synchronousAccount();
 
     //同步账户交易流水
-    public Result synchronousAccountTransactionDetails(String startDate,String endDate);
+    public Result synchronousAccountTransactionDetails(String startDate, String endDate);
 
     //同步账户日流水
-    public Result synchronousAccountTransactionDay(String startDate,String endDate);
+    public Result synchronousAccountTransactionDay(String startDate, String endDate);
 }

+ 35 - 35
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/agent/service/impl/AgentManagementServiceImpl.java

@@ -124,7 +124,7 @@ public class AgentManagementServiceImpl implements AgentManagementService {
      * @create: 2021-07-15
      */
     @Override
-    public Result synchronousAccountTransactionDetails(String startDate,String endDate) {
+    public Result synchronousAccountTransactionDetails(String startDate, String endDate) {
         log.info("开始同步账号交易流水");
         Result result = new Result();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
@@ -136,9 +136,9 @@ public class AgentManagementServiceImpl implements AgentManagementService {
                 accountIdList.stream().forEach(str -> {
                     if (!str.isEmpty()) {
                         //查询账号下充值的交易流水
-                        JSONObject jsonObject = queryAccountTransactionDetails(str, RECHARGE, 1, 1000, startDate,endDate);
+                        JSONObject jsonObject = queryAccountTransactionDetails(str, RECHARGE, 1, 1000, startDate, endDate);
                         int code = (int) jsonObject.get("code");
-                        if(code!=0){
+                        if (code != 0) {
                             result.setMessage((String) jsonObject.get("message"));
                             log.info((String) jsonObject.get("message"));
                             return;
@@ -162,7 +162,7 @@ public class AgentManagementServiceImpl implements AgentManagementService {
                                 //查询其他页数据
                                 if (total_page > 1) {
                                     for (int i = 2; i <= total_page; i++) {
-                                        JSONObject jo = queryAccountTransactionDetails(str, RECHARGE, i, 1000, startDate,endDate);
+                                        JSONObject jo = queryAccountTransactionDetails(str, RECHARGE, i, 1000, startDate, endDate);
                                         JSONObject accountData = (JSONObject) jo.get("data");
                                         List<Object> rechargeList = (List<Object>) accountData.get("list");
                                         rechargeList.stream().forEach(transactionDetails -> {
@@ -178,10 +178,10 @@ public class AgentManagementServiceImpl implements AgentManagementService {
                         }
 
                         //查询账号下转账的交易流水
-                        JSONObject transferJsonObject = queryAccountTransactionDetails(str, TRANSFER, 1, 1000, startDate,endDate);
+                        JSONObject transferJsonObject = queryAccountTransactionDetails(str, TRANSFER, 1, 1000, startDate, endDate);
                         JSONObject transferData = (JSONObject) transferJsonObject.get("data");
                         int code1 = (int) jsonObject.get("code");
-                        if(code1!=0){
+                        if (code1 != 0) {
                             result.setMessage((String) jsonObject.get("message"));
                             log.info((String) jsonObject.get("message"));
                             return;
@@ -203,7 +203,7 @@ public class AgentManagementServiceImpl implements AgentManagementService {
                                 //查询其他页数据
                                 if (transferTotalPage > 1) {
                                     for (int i = 2; i <= transferTotalPage; i++) {
-                                        JSONObject jo = queryAccountTransactionDetails(str, TRANSFER, i, 1000, startDate,endDate);
+                                        JSONObject jo = queryAccountTransactionDetails(str, TRANSFER, i, 1000, startDate, endDate);
                                         JSONObject accountData = (JSONObject) jo.get("data");
                                         List<Object> rechargeList = (List<Object>) accountData.get("list");
                                         rechargeList.stream().forEach(transactionDetails -> {
@@ -246,7 +246,7 @@ public class AgentManagementServiceImpl implements AgentManagementService {
      * @create: 2021-07-15
      */
     @Override
-    public Result synchronousAccountTransactionDay(String startDate,String endDate) {
+    public Result synchronousAccountTransactionDay(String startDate, String endDate) {
         log.info("开始同步账号日流水");
         Result result = new Result();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
@@ -260,18 +260,18 @@ public class AgentManagementServiceImpl implements AgentManagementService {
                 accountIdList.stream().forEach(str -> {
                     if (!str.isEmpty()) {
                         //查询账号下充值的交易流水
-                        JSONObject jsonObject = queryAccountTransactionDay(str, 1, 1000, startDate,endDate);
-                        JSONObject data=null;
-                        int code=1;
-                        if(jsonObject!=null){
-                             data = (JSONObject) jsonObject.get("data");
-                             code = (int) jsonObject.get("code");
-                        }else {
+                        JSONObject jsonObject = queryAccountTransactionDay(str, 1, 1000, startDate, endDate);
+                        JSONObject data = null;
+                        int code = 1;
+                        if (jsonObject != null) {
+                            data = (JSONObject) jsonObject.get("data");
+                            code = (int) jsonObject.get("code");
+                        } else {
                             log.info("返回数据jsonObject为null:");
                         }
-                        if(code!=0){
+                        if (code != 0) {
                             result.setMessage((String) jsonObject.get("message"));
-                            log.info("返回数据:"+jsonObject.toJSONString()+":"+str);
+                            log.info("返回数据:" + jsonObject.toJSONString() + ":" + str);
                         }
                         if (data != null) {
                             List<Object> dataList = (List<Object>) data.get("list");
@@ -280,9 +280,9 @@ public class AgentManagementServiceImpl implements AgentManagementService {
                                 //保存第一页数据
                                 dataList.stream().forEach(ob -> {
                                     TransactionDay transactionDay = JSONObject.toJavaObject((JSON) ob, TransactionDay.class);
-                                    List<String> advertiserIdList = ctopAccountTransactionDayMapper.getAdvertiserIdByDate(transactionDay.getDate(),transactionDay.getAdvertiserId());
+                                    List<String> advertiserIdList = ctopAccountTransactionDayMapper.getAdvertiserIdByDate(transactionDay.getDate(), transactionDay.getAdvertiserId());
                                     //订单号不存在
-                                    if (advertiserIdList.isEmpty() || advertiserIdList.size()<=0) {
+                                    if (advertiserIdList.isEmpty() || advertiserIdList.size() <= 0) {
                                         transactionDetailsList.add(transactionDay);
                                     }
 
@@ -292,15 +292,15 @@ public class AgentManagementServiceImpl implements AgentManagementService {
                                 //查询其他页数据
                                 if (total_page > 1) {
                                     for (int i = 2; i <= total_page; i++) {
-                                        JSONObject jo = queryAccountTransactionDay(str, i, 1000, startDate,endDate);
+                                        JSONObject jo = queryAccountTransactionDay(str, i, 1000, startDate, endDate);
                                         JSONObject accountData = (JSONObject) jo.get("data");
                                         List<Object> rechargeList = (List<Object>) accountData.get("list");
                                         rechargeList.stream().forEach(obj -> {
                                             TransactionDay transactionDay = JSONObject.toJavaObject((JSON) obj, TransactionDay.class);
-                                            List<String> advertiserIdList = ctopAccountTransactionDayMapper.getAdvertiserIdByDate(transactionDay.getDate(),transactionDay.getAdvertiserId());
+                                            List<String> advertiserIdList = ctopAccountTransactionDayMapper.getAdvertiserIdByDate(transactionDay.getDate(), transactionDay.getAdvertiserId());
 
                                             //订单号不存在
-                                            if (advertiserIdList.isEmpty() || advertiserIdList.size()<=0) {
+                                            if (advertiserIdList.isEmpty() || advertiserIdList.size() <= 0) {
                                                 transactionDetailsList.add(transactionDay);
                                             }
                                         });
@@ -338,7 +338,7 @@ public class AgentManagementServiceImpl implements AgentManagementService {
      * @create: 2021-07-14
      */
     @Override
-    public JSONObject queryAccountTransactionDetails(String AccountId, String transaction_type, int pageNum, int pageSize, String startDate,String endDate) {
+    public JSONObject queryAccountTransactionDetails(String AccountId, String transaction_type, int pageNum, int pageSize, String startDate, String endDate) {
         // 请求参数
         Map data = new HashMap() {
             {
@@ -362,22 +362,22 @@ public class AgentManagementServiceImpl implements AgentManagementService {
      * @create: 2021-07-14
      */
     @Override
-    public JSONObject queryAccountTransactionDay(String AccountId, int pageNum, int pageSize,String startDate,String endDate) {
+    public JSONObject queryAccountTransactionDay(String AccountId, int pageNum, int pageSize, String startDate, String endDate) {
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
         Calendar ca = Calendar.getInstance();
         ca.setTime(new Date());
         ca.add(Calendar.DATE, -1);
-            // 请求参数
-            Map data = new HashMap() {
-                {
-                    put("advertiser_id", AccountId);
-                    put("start_date", startDate);
-                    put("end_date", endDate);
-                    put("page", pageNum);
-                    put("page_size", pageSize);
-                }
-            };
-            return sendHttpRequest(data, ACCOUNT_TRANSACTION_DAY_URL);
+        // 请求参数
+        Map data = new HashMap() {
+            {
+                put("advertiser_id", AccountId);
+                put("start_date", startDate);
+                put("end_date", endDate);
+                put("page", pageNum);
+                put("page_size", pageSize);
+            }
+        };
+        return sendHttpRequest(data, ACCOUNT_TRANSACTION_DAY_URL);
 
 
     }