wujiefeng hai 1 ano
pai
achega
fb1a4740ee

+ 2 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/BalancePayService.java

@@ -122,12 +122,14 @@ public class BalancePayService extends SuperService {
     }
     }
 
 
     public void handleWeChatCallback(WeChatMiniAppPayRet ret) {
     public void handleWeChatCallback(WeChatMiniAppPayRet ret) {
+        log.info("收到的消息:{}", JsonUtil.toJson(ret));
         BalanceRechargeOrder rechargeOrder = rechargeOrderDao.findTopByOrderNo(ret.getOutTradeNo());
         BalanceRechargeOrder rechargeOrder = rechargeOrderDao.findTopByOrderNo(ret.getOutTradeNo());
         if (!rechargeOrder.getStatus().equals(RechargeOrderStatus.Wait)){
         if (!rechargeOrder.getStatus().equals(RechargeOrderStatus.Wait)){
             return;
             return;
         }
         }
         switch (ret.getTradeState()) {
         switch (ret.getTradeState()) {
             case "SUCCESS" -> {
             case "SUCCESS" -> {
+                log.info("收到的消息Success:{}", JsonUtil.toJson(ret));
                 rechargeOrder.setStatus(RechargeOrderStatus.Success);
                 rechargeOrder.setStatus(RechargeOrderStatus.Success);
                 //获取项目总账户
                 //获取项目总账户
                 PayAccount projectPayAccount = payAccountService.getProjectParent(rechargeOrder.getProjectOid());
                 PayAccount projectPayAccount = payAccountService.getProjectParent(rechargeOrder.getProjectOid());

+ 9 - 9
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/PayAccountService.java

@@ -134,7 +134,7 @@ public class PayAccountService {
         payAccount.setLevel(PayAccountLevel.OrgChildren);
         payAccount.setLevel(PayAccountLevel.OrgChildren);
         String ledgerId = createLedger("机构子账-" + channelType.getRemark(),
         String ledgerId = createLedger("机构子账-" + channelType.getRemark(),
                 parent.getLedgerId(),
                 parent.getLedgerId(),
-                Map.of("projectOid", projectOid, "paymentChannelType", channelType, "level", PayAccountLevel.OrgParent));
+                Map.of("projectOid", projectOid, "paymentChannelType", channelType, "level", PayAccountLevel.OrgParent), 999999999L, -999999999L);
         if (StringUtils.isBlank(ledgerId)){
         if (StringUtils.isBlank(ledgerId)){
             throw new Exception("支付中心创建用户子账失败");
             throw new Exception("支付中心创建用户子账失败");
         }
         }
@@ -150,7 +150,7 @@ public class PayAccountService {
         payAccount.setProjectOid(projectOid);
         payAccount.setProjectOid(projectOid);
         payAccount.setOid(oid);
         payAccount.setOid(oid);
         payAccount.setLevel(PayAccountLevel.projectParent);
         payAccount.setLevel(PayAccountLevel.projectParent);
-        String ledgerId = createLedger("机构总账", null, Map.of("projectOid", projectOid, "oid", oid, "level", PayAccountLevel.OrgParent));
+        String ledgerId = createLedger("机构总账", null, Map.of("projectOid", projectOid, "oid", oid, "level", PayAccountLevel.OrgParent), 999999999L, -999999999L);
         if (StringUtils.isBlank(ledgerId)){
         if (StringUtils.isBlank(ledgerId)){
             throw new Exception("支付中心创建机构总账失败");
             throw new Exception("支付中心创建机构总账失败");
         }
         }
@@ -167,7 +167,7 @@ public class PayAccountService {
         payAccount.setUserId(userId);
         payAccount.setUserId(userId);
         payAccount.setPaymentChannelType(channelType);
         payAccount.setPaymentChannelType(channelType);
         payAccount.setLevel(PayAccountLevel.UserChildren);
         payAccount.setLevel(PayAccountLevel.UserChildren);
-        String ledgerId = createLedger("用户子账-" + channelType.getRemark(), parent.getLedgerId(), Map.of("projectOid", projectOid, "paymentChannelType", channelType));
+        String ledgerId = createLedger("用户子账-" + channelType.getRemark(), parent.getLedgerId(), Map.of("projectOid", projectOid, "paymentChannelType", channelType) , 999999999L, 0L);
         if (StringUtils.isBlank(ledgerId)){
         if (StringUtils.isBlank(ledgerId)){
             throw new Exception("支付中心创建用户子账失败");
             throw new Exception("支付中心创建用户子账失败");
         }
         }
@@ -182,7 +182,7 @@ public class PayAccountService {
         payAccount.setProjectOid(projectOid);
         payAccount.setProjectOid(projectOid);
         payAccount.setUserId(userId);
         payAccount.setUserId(userId);
         payAccount.setLevel(PayAccountLevel.UserParent);
         payAccount.setLevel(PayAccountLevel.UserParent);
-        String ledgerId = createLedger("用户总账", null, Map.of("projectOid", projectOid, "userId", userId));
+        String ledgerId = createLedger("用户总账", null, Map.of("projectOid", projectOid, "userId", userId), 999999999L, 0L);
         if (StringUtils.isBlank(ledgerId)){
         if (StringUtils.isBlank(ledgerId)){
             throw new Exception("支付中心创建用户总账失败");
             throw new Exception("支付中心创建用户总账失败");
         }
         }
@@ -199,7 +199,7 @@ public class PayAccountService {
         payAccount.setParent(parent);
         payAccount.setParent(parent);
         payAccount.setPaymentChannelType(channelType);
         payAccount.setPaymentChannelType(channelType);
         payAccount.setLevel(PayAccountLevel.projectChildren);
         payAccount.setLevel(PayAccountLevel.projectChildren);
-        String ledgerId = createLedger("项目子账-" + channelType.getRemark(), parent.getLedgerId(), Map.of("projectOid", projectOid, "paymentChannelType", channelType));
+        String ledgerId = createLedger("项目子账-" + channelType.getRemark(), parent.getLedgerId(), Map.of("projectOid", projectOid, "paymentChannelType", channelType), 99999999L, -99999999L);
         if (StringUtils.isBlank(ledgerId)){
         if (StringUtils.isBlank(ledgerId)){
             throw new Exception("支付中心创建项目子账失败");
             throw new Exception("支付中心创建项目子账失败");
         }
         }
@@ -214,7 +214,7 @@ public class PayAccountService {
         PayAccount payAccount = new PayAccount();
         PayAccount payAccount = new PayAccount();
         payAccount.setProjectOid(projectOid);
         payAccount.setProjectOid(projectOid);
         payAccount.setLevel(PayAccountLevel.projectParent);
         payAccount.setLevel(PayAccountLevel.projectParent);
-        String ledgerId = createLedger("项目总账", null, Map.of("projectOid", projectOid));
+        String ledgerId = createLedger("项目总账", null, Map.of("projectOid", projectOid), 99999999L, -99999999L);
         if (StringUtils.isBlank(ledgerId)){
         if (StringUtils.isBlank(ledgerId)){
             throw new Exception("支付中心创建项目总账失败");
             throw new Exception("支付中心创建项目总账失败");
         }
         }
@@ -223,11 +223,11 @@ public class PayAccountService {
         return payAccount;
         return payAccount;
     }
     }
 
 
-    private String createLedger(String name, String parentLedgerId, Map<String, Object> meta){
+    private String createLedger(String name, String parentLedgerId, Map<String, Object> meta, long rangeMax, long rangeMin){
         GeneralLedgerTreeModel ledgerModel = new GeneralLedgerTreeModel();
         GeneralLedgerTreeModel ledgerModel = new GeneralLedgerTreeModel();
         ledgerModel.setName(name);
         ledgerModel.setName(name);
-        ledgerModel.setBalanceRangeMax(999999L);
-        ledgerModel.setBalanceRangeMin(-100L);
+        ledgerModel.setBalanceRangeMax(rangeMax);
+        ledgerModel.setBalanceRangeMin(rangeMin);
         ledgerModel.setMeta(meta);
         ledgerModel.setMeta(meta);
         if (StringUtils.isNotEmpty(parentLedgerId)){
         if (StringUtils.isNotEmpty(parentLedgerId)){
             GeneralLedgerModel parentLedger = new GeneralLedgerModel();
             GeneralLedgerModel parentLedger = new GeneralLedgerModel();