第三方接口访问日志

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/PayOpenApiController.java

@@ -81,7 +81,7 @@ public class PayOpenApiController {
 
     @Operation(summary = "银联无感支付退款", description = "银联无感支付退款")
     @RequestMapping(value = "unionSenselessRefund", method = {RequestMethod.POST})
-    public ResultContent<Object> unionSenselessRefund(@RequestBody RefundParam param){
+    public ResultContent<UnionFrictionlessPayFinishModel> unionSenselessRefund(@RequestBody RefundParam param){
         return payOpenApiService.unionSenselessRefund(param.getProjectOid(), param.getOid(), param.getUserId(), param.getTotal(), param.getOrderNo(), param.getRefundOrderNo(), param.getRemark(), param.getTargetOrderId());
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/PayOpenApiService.java

@@ -115,7 +115,7 @@ public class PayOpenApiService {
     /**
      * 银联无感支付退款
      */
-    public ResultContent<Object> unionSenselessRefund(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String refundOrderNo, String remark, String targetOrderId){
+    public ResultContent<UnionFrictionlessPayFinishModel> unionSenselessRefund(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String refundOrderNo, String remark, String targetOrderId){
         Assert.notNull(projectOid, "参数校验失败：projectOid is null");
         Assert.notNull(oid, "参数校验失败：oid is null");
         Assert.notNull(userId, "参数校验失败：userId is null");

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/ChinaumsSenselessPayService.java

@@ -359,7 +359,7 @@ public class ChinaumsSenselessPayService extends SuperService {
      * refundOrderNo 退款订单号
      */
     @SneakyThrows
-    public ResultContent refund(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String refundOrderNo, String remark, String targetOrderId) {
+    public ResultContent<UnionFrictionlessPayFinishModel> refund(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String refundOrderNo, String remark, String targetOrderId) {
 
         String projectAccountName = orgPayAccountService.queryOgPayAccount(projectOid, PaymentType.UnionFrictionlessPay);
         //获取银联支付产品账户及需要签约的商户号

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/OrgOverviewService.java

@@ -343,7 +343,8 @@ public class OrgOverviewService extends SuperService {
             BigDecimal divide = subtract.divide(yesterday, 2, BigDecimal.ROUND_HALF_UP);
             amountChangeRate = divide.movePointRight(2);
         }else {
-            amountChangeRate = new BigDecimal(todayAmount);
+            BigDecimal totalAmountBigDecimal = new BigDecimal(todayAmount);
+            amountChangeRate = totalAmountBigDecimal.movePointRight(2);
         }
         return amountChangeRate;
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/WithdrawService.java

@@ -396,7 +396,9 @@ public class WithdrawService extends SuperService {
                 withdrawOrder.setProcessUserId(userAccount.getUserId());
                 withdrawOrder.setProcessTime(System.currentTimeMillis());
                 withdrawOrderDao.save(withdrawOrder);
-//                ExecuteQueueUtil.execute(5, 1000L, data->{
+//                ExecuteQueueUtil.execute(5, it->{
+//                    return Map.of(1, 1000L, 2, 3000L, 3, 5000L, 4, 5000L, 5, 5000L).getOrDefault(it, )
+//                }, data->{
 //                    com.github.microservice.net.ResultContent<WithdrawStatus> resultContent = withdrawQuery((String) data.get("withdrawUserId"));
 //                    if (resultContent.getState().equals(com.github.microservice.net.ResultState.Success)){
 //                        WithdrawStatus withdrawStatus = resultContent.getContent();