支付openAPI

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

@@ -6,9 +6,11 @@ import com.zhongshu.card.client.openApi.params.PayParam;
 import com.zhongshu.card.client.openApi.params.RefundParam;
 import com.zhongshu.card.server.core.service.pay.BalancePayService;
 import com.zhongshu.card.server.core.service.pay.ChinaumsSenselessPayService;
+import com.zhongshu.card.server.core.service.pay.PayAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -24,6 +26,9 @@ public class PayOpenApiController {
     @Autowired
     ChinaumsSenselessPayService chinaumsSenselessPayService;
 
+    @Autowired
+    PayAccountService payAccountService;
+
     @Operation(summary = "查询个人钱包账户余额", description = "查询个人钱包账户余额")
     @RequestMapping(value = "queryDeviceBindUsers", method = {RequestMethod.GET})
     public ResultContent<Long> queryUserWallet(@RequestParam("projectOid") String projectOid,
@@ -62,19 +67,19 @@ public class PayOpenApiController {
         return ResultContent.buildFail("参数传入错误，paymentType");
     }
 
-    /**
-     * 支付结果查询
-     */
-
     /**
      * 退款结果查询
      */
 
     /**
-     * 账本
+     * 查询账本
      */
+//    public ResultContent queryGeneralLedger(String projectOid, String oid, String userId) {
+//        payAccountService.get
+//    }
 
     /**
-     * 账单
+     *
      */
+//    public
 }

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

@@ -191,7 +191,7 @@ public class BalancePayService extends SuperService {
         rechargeOrderDao.save(rechargeOrder);
     }
 
-    public com.github.microservice.net.ResultContent balancePay(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String remark) {
+    public ResultContent balancePay(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String remark) {
         //获取用户余额支付子账户
         PayAccount userBalancePayment = payAccountService.getUserChildren(projectOid, userId, PaymentChannelType.BalancePayment);
         //获取机构待结算账户
@@ -220,11 +220,8 @@ public class BalancePayService extends SuperService {
         destinationTransaction.setMeta(Map.of("paymentType",PaymentType.UserWallet, "description", "用户余额支付"));
         transferModel.setDestinations(new TransferTransactionsModel.GeneralLedgerTransaction[]{destinationTransaction});
         //发起转账
-        ResultContent<List<TransactionLogModel>> transfer = transactionLogService.transfer(transferModel);
-        if (transfer.getState().equals(ResultState.Success)) {
-            return com.github.microservice.net.ResultContent.buildContent(transfer.getContent());
-        }
-        return com.github.microservice.net.ResultContent.buildFail(transfer.getMsg());
+       return transactionLogService.transfer(transferModel);
+
     }
 
     public ResultContent queryRechargeOrder(QueryRechargeParam param) {
@@ -245,7 +242,7 @@ public class BalancePayService extends SuperService {
         return ResultContent.buildContent(Map.of("list", balanceRechargeOrders.stream().map(this::toModel).toList(), "amountTotal", amountTotal));
     }
 
-    public com.github.microservice.net.ResultContent<Long> queryUserBalance(String projectOid, String userId) {
+    public ResultContent<Long> queryUserBalance(String projectOid, String userId) {
 
         if (StringUtils.isEmpty(projectOid)){
             projectOid = getCurrentProjectOid();
@@ -257,9 +254,9 @@ public class BalancePayService extends SuperService {
         PayAccount userBalance = payAccountService.getUserChildren(projectOid, userId, PaymentChannelType.BalancePayment);
         ResultContent<GeneralLedgerQueryModel> ret = generalLedgerService.get(userBalance.getLedgerId());
         if (ret.getState().equals(ResultState.Success)) {
-            return com.github.microservice.net.ResultContent.buildContent(ret.getContent().getBalance());
+            return ResultContent.buildContent(ret.getContent().getBalance());
         }
-        return com.github.microservice.net.ResultContent.buildFail(ret.getMsg());
+        return ResultContent.build(ret.getState());
     }
 
     public ResultContent queryInfo(String orderNo){
@@ -320,11 +317,7 @@ public class BalancePayService extends SuperService {
         destinationTransaction.setRemark(remark);
         transferModel.setDestinations(new TransferTransactionsModel.GeneralLedgerTransaction[]{destinationTransaction});
         //调用支付中心转账接口
-        ResultContent<List<TransactionLogModel>> transfer = transactionLogService.transfer(transferModel);
-        if (transfer.getState().equals(ResultState.Success)) {
-            return com.github.microservice.net.ResultContent.buildContent(transfer.getContent());
-        }
-        return com.github.microservice.net.ResultContent.buildFail(transfer.getMsg());
+        return transactionLogService.transfer(transferModel);
     }
 
     /**