diff --git a/xhpc-modules/xhpc-tradebill/pom.xml b/xhpc-modules/xhpc-tradebill/pom.xml
index facfa818..df49c1db 100644
--- a/xhpc-modules/xhpc-tradebill/pom.xml
+++ b/xhpc-modules/xhpc-tradebill/pom.xml
@@ -122,6 +122,10 @@
3.10.2
compile
+
+ com.ruoyi
+ ruoyi-common-log
+
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java
index 51505ba7..1ccf7dc0 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java
+++ b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java
@@ -4,6 +4,8 @@ package com.xhpc.tradebill.controller;
import com.xhpc.common.core.utils.SecurityUtils;
import com.xhpc.common.core.web.controller.BaseController;
import com.xhpc.common.core.web.domain.AjaxResult;
+import com.xhpc.common.log.annotation.Log;
+import com.xhpc.common.log.enums.BusinessType;
import com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain;
import com.xhpc.tradebill.service.CommonService;
import org.springframework.web.bind.annotation.*;
@@ -21,12 +23,13 @@ public class CommonController extends BaseController {
@Resource
CommonService commonService;
+ @Log(title = "上传对账单(OSS方式)", businessType = BusinessType.INSERT)
@PostMapping("/oss/upload")
public AjaxResult OssUpload(@RequestBody XhpcTradebillUploadRecordDomain domain) throws Exception{
return AjaxResult.success(commonService.ossUpload(domain));
}
-
+ @Log(title = "上传对账单(OSS方式)", businessType = BusinessType.INSERT)
@PostMapping("/file/upload")
public AjaxResult fileUpload(MultipartFile file, int type) throws Exception {
if (file ==null || type < 1){
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/InternetBillController.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/InternetBillController.java
index 8d49f917..e1330568 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/InternetBillController.java
+++ b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/InternetBillController.java
@@ -4,6 +4,8 @@ package com.xhpc.tradebill.controller;
import com.xhpc.common.core.web.controller.BaseController;
import com.xhpc.common.core.web.domain.AjaxResult;
import com.xhpc.common.core.web.page.TableDataInfo;
+import com.xhpc.common.log.annotation.Log;
+import com.xhpc.common.log.enums.BusinessType;
import com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain;
import com.xhpc.tradebill.service.InternetBillService;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +23,7 @@ public class InternetBillController extends BaseController {
@Resource
InternetBillService internetBillService;
+
@GetMapping("/checkList/{uploadId}")
public AjaxResult getCheckList(@RequestParam(required = false) Integer uploadId,
@RequestParam(required = false) String orderNumber,
@@ -37,6 +40,7 @@ public class InternetBillController extends BaseController {
}
+
@GetMapping("/checkPage")
public TableDataInfo getCheckPage(@RequestParam(required = false) Integer uploadId,
@RequestParam(required = false) String orderNumber,
@@ -55,6 +59,7 @@ public class InternetBillController extends BaseController {
return getDataTable(internetBillService.getInternetCheckList(params));
}
+
@GetMapping("/statusTotal")
public AjaxResult getStatusTotal(@RequestParam(required = false) Integer uploadId,
@RequestParam(required = false) String orderNumber,
@@ -79,12 +84,15 @@ public class InternetBillController extends BaseController {
}
+ @Log(title = "人工确认流量方对账数据", businessType = BusinessType.UPDATE)
@PostMapping("/checkInfo")
public AjaxResult updateCheckInfo(@RequestBody XhpcTradebillInternetCheckRecordDomain domain){
return AjaxResult.success(internetBillService.updateInfoByDomain(domain));
}
+
+ @Log(title = "导出流量方对账数据", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response,
@RequestParam(required = false) Integer uploadId,
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/PaymentBillController.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/PaymentBillController.java
index 9a140fb9..1000b487 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/PaymentBillController.java
+++ b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/PaymentBillController.java
@@ -4,6 +4,8 @@ package com.xhpc.tradebill.controller;
import com.xhpc.common.core.web.controller.BaseController;
import com.xhpc.common.core.web.domain.AjaxResult;
import com.xhpc.common.core.web.page.TableDataInfo;
+import com.xhpc.common.log.annotation.Log;
+import com.xhpc.common.log.enums.BusinessType;
import com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain;
import com.xhpc.tradebill.service.PaymentBillService;
import org.springframework.web.bind.annotation.*;
@@ -20,6 +22,7 @@ public class PaymentBillController extends BaseController {
@Resource
PaymentBillService paymentBillService;
+
@GetMapping("/checkList/{uploadId}")
public AjaxResult getCheckList(@RequestParam(required = false) Integer uploadId,
@RequestParam(required = false) String orderNumber,
@@ -64,6 +67,7 @@ public class PaymentBillController extends BaseController {
return AjaxResult.success(paymentBillService.getStatusTotal(params));
}
+
@GetMapping("/checkInfo/{id}")
public AjaxResult getCheckInfo(@PathVariable Integer id){
@@ -71,12 +75,14 @@ public class PaymentBillController extends BaseController {
}
+ @Log(title = "人工确认支付平台对账数据", businessType = BusinessType.UPDATE)
@PostMapping("/checkInfo")
public AjaxResult updateCheckInfo(@RequestBody XhpcTradebillPaymentCheckRecordDomain domain){
return AjaxResult.success(paymentBillService.updateInfoByDomain(domain));
}
+ @Log(title = "导出支付平台对账数据", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response,
@RequestParam(required = false) Integer uploadId,