From 792dd99e8e472b7edcc8b2e0b42db8cceb29eeb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Fri, 28 Jul 2023 15:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/service/AgencyService.java   |  8 ++++++-
 .../admin/system/service/Userservice.java     | 24 ++++++++++++++++---
 .../admin/system/util/RSAUtil.java            |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java
index 8ded0fe..b73e22f 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java
@@ -164,7 +164,13 @@ public class AgencyService {
                   it.put("sumfansShareMoney",0);
                   it.put("yestedayShareMoney",0);
               }
-            });
+
+
+              switch ("channel"){
+
+              }
+            }
+            );
         }
         PageInfo pageInfo=new PageInfo(list);
         return new RespBody("000000",pageInfo);
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java
index 2c4608d..7fcc8b0 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java
@@ -359,15 +359,33 @@ public class Userservice {
         CashStatus upStatus=null;
         switch (promotion.getTypeCode()){
             case "AG":
-                cashStatus=map.get("AG");
+                if(!map.containsKey("AG")){
+                    cashStatus=new CashStatus();
+                    cashStatus.setStatus("1");
+                }else {
+                    cashStatus=map.get("AG");
+                }
+
                 upStatus=map.get("SO");
                 break;
             case "SO":
-                cashStatus=map.get("AG");
+                if(!map.containsKey("AG")){
+                    cashStatus=new CashStatus();
+                    cashStatus.setStatus("1");
+                }else {
+                    cashStatus=map.get("AG");
+                }
+
                 upStatus=map.get("FO");
                 break;
             case "FO":
-                cashStatus=map.get("SO");
+                if(!map.containsKey("SO")){
+                    cashStatus=new CashStatus();
+                    cashStatus.setStatus("1");
+                }else {
+                    cashStatus=map.get("SO");
+                }
+
                 upStatus=map.get("MG");
                 break;
             case "MG":
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/RSAUtil.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/RSAUtil.java
index 7dddbfa..0c416f2 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/RSAUtil.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/RSAUtil.java
@@ -206,7 +206,7 @@ public class RSAUtil {
 
         String priKey="MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK3gHtMn28yaXenmocShh9ki5GqSVsVKsjmOerbm+OOqkmnxVzwivSfxBUKl/No7mhTa1/ipngoiJ3CXKxqB3MtvverwRAh/ggu3YFAVFLlEAY+co08DwGxbCrNucAjb4YcJJa2LFVq0tuzB92YhAkQczMPKUsYfJxtvcIb6YL+xAgMBAAECgYA6qkO8OtaOUgcdxBMQpO+Q85Td4EImju1TPh9pVsTjC8oatLMaNx5bO5bqxdZqS3HRV4VHAPOxt5RXCKoiZ253JMvmcWXmiwYNFEr9iFXOLVT0H6q+TT4cpp5klAFM5xELaR4WFsYlxvCA6KGdNqHg4wYSPwj+WdYM12xEhBtjgQJBAPttT2LuIoEyLvjrqUr8bMuFKHRuYp3rMtl3nwU0es2OuOOsWH69w+L7oi4tgHr1gzpN8k2XExMcf0uDnk9eBrsCQQCxCbdegzCiSafUxrDwZpROlfL1duRXDinkLc9KC2HfS+w4/9Mjuc49SFo3grKczGN3t6AnlBasONehmNuDAAqDAkAeFND3tCgarwdhrshdeWAG5ZKWg5J29GnsDNzQwZujtly2mKsp1sh2Asc/oSALFg6yThscX2Pf2Hv+a+vn8Qb7AkAuDXD9zPKhxLc7ylPMtWJu7uK8p6jOXIjZKnF5uWxEQeO5EBNEf9j+aAvP1NfRofld8w5ePU+IjWDKUJEJisExAkEA+L6M96L3ICNF3sYtdvILO2ExYb4AuxF18MmPVWEy0jK9xxan3rggpIG+BQQuy8DoL1snc+JABALiSFEbAZjm6Q==";
 
-        String data="HTh2tGDI9XwCIzqHbNlwMjfxl3K1q4WaLLTTDVd1XmUbEr/w4ChictxZoT/rvrWPxIIvdefI4+/FcuYKFNUPM2IQ/3rgKuLBssrkdTyYEYscQOB4geAOBk6ZCZmmx1uYTWaf4zQbeQGl1oCEHnmE5KsmnIF8WWQOCsHhF/52eEo=";
+        String data="hFAKmbWQ4mo/ARmGWPBUxPP0kbpiIukGrNWovZS3MJiq/wf63ZDtnfLlLDgGMbuNRxE0dX3sVM69O6Pndv1JNSGNs+NUsU8EAScg0gfWrBssoKFdi4ZFqla9uauoY7E/chsANvU3kwEoeMplloOilvvX4LTQueKnuNvHyt1WTYY=";
         System.out.println(decryptByPrivateKey(data,priKey));