修复平台收入！！

src/main/java/com/sy/service/OrdersService.java

@@ -114,7 +114,9 @@ public class OrdersService {
                         continue;
                     }
                     countOrderSize++;
-                    amount=amount.add(orders.getPayFee());
+                    if(!orders.getPayment().equals("free")){
+                        amount=amount.add(orders.getPayFee());
+                    }
                     if(orders.getPayment().equals("cash")){
                         offline_amount=offline_amount.add(shopPaymentRecord.getCash().subtract(shopPaymentRecord.getReturnCash()).subtract(shopPaymentRecord.getReturnOrigin()));
                     }

src/main/java/com/sy/utils/ECDSASigner.java

@@ -20,7 +20,9 @@ import java.util.TreeMap;
 @Slf4j
 @Component
 public class ECDSASigner {
+    //本地公钥
     //public static final String publicSig="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwvbT7jUHDUbJzrU7oGPKIJhYw5DQ4xVMLqYcpUYeHIirlqghpXKpggeNmYVMYG6R2uJ7DmbajBU158ybMj70Gg==";
+    //线上公钥
     public static final String publicSig="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEmU7b_sdeNNDxyQUYLhWDfdQtXRLO1WD1U9CYZKSZNk44OcVcEg0xKvMQ1m2OY2oLlql9ggs7SVqkzyJ6oFYiVg==";
 
     public static final String privateKeySig="MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCAmNynvNAl5h9Pob6BldE1U1anv8orqMc4z15XW2BzBmg==";
@@ -113,7 +115,7 @@ public class ECDSASigner {
      */
     public static boolean verify(Map<String, Object> params, String publicKeyBase64) {
         try {
-            // 时间戳要求不超过60秒
+            // 时间戳要求不超过60秒  如果本地测试可以选择注释此代码
             long requestTimestamp = Long.parseLong(String.valueOf(params.get(TIMESTAMP)));
             if (Math.abs(requestTimestamp - System.currentTimeMillis()) > 60_000) {
                 log.warn("verify fail, request timestamp time is over 60 seconds");

src/test/java/com/sy/QgSdkTests.java

@@ -52,9 +52,9 @@ class QgSdkTests {
     @Test
     void profitSeparateList() throws Exception {
         Map<String, Object> params = new HashMap<>();
-        params.put("startTimestamp","20240701");
-        params.put("endTimestamp", "20240717");
-        //params.put("shopId","19031816333414");
+        params.put("startTimestamp","20240819");
+        params.put("endTimestamp", "20240819");
+        params.put("shopId","24071416503101");
         Map<String, Object> extracted = extracted(params);
         // 遍历原始的Map，并将键和值作为Object类型添加到新的Map中
         params.forEach((key, value) -> System.out.println("Key = " + key + ", Value = " + value));
@@ -71,8 +71,8 @@ class QgSdkTests {
     void refundList() throws Exception {
         Map<String, Object> params = new HashMap<>();
         params.put("startTimestamp","1720563978000");
-        params.put("endTimestamp", "1721174865743");
-        params.put("shopId","24071617124901");
+        params.put("endTimestamp", "1721909568223");
+        params.put("shopId","24071416503101");
         Map<String, Object> extracted = extracted(params);
         // 遍历原始的Map，并将键和值作为Object类型添加到新的Map中
         params.forEach((key, value) -> System.out.println("Key = " + key + ", Value = " + value));
@@ -115,10 +115,10 @@ class QgSdkTests {
 
     @Test
     void test3333(){
-        BigDecimal number = new BigDecimal("13.00");
+        BigDecimal number = new BigDecimal("00");
         BigDecimal stripped = number.stripTrailingZeros();
 
-        System.out.println(stripped);
+        System.out.println(number.multiply(new BigDecimal("999")));
         // 假设我们期望原始数字是一个整数或者小数点后都是零
         if (stripped.compareTo(BigDecimal.valueOf(stripped.longValue())) == 0) {
             System.out.println("The number has only zeros after the decimal point.");