xiongzhu 4 ani în urmă
părinte
comite
b40f0a71b6

+ 2 - 1
src/main/java/com/izouma/nineth/service/OrderService.java

@@ -289,7 +289,8 @@ public class OrderService {
             }
             }
             restAmount = divMoney(restAmount, divMembers, owner.getMemberId(), restAmount, false);
             restAmount = divMoney(restAmount, divMembers, owner.getMemberId(), restAmount, false);
         } else {
         } else {
-            if (invitor != null) {
+            if (invitor != null && invitor.getShareRatio() != null
+                    && invitor.getShareRatio().compareTo(BigDecimal.ZERO) > 0) {
                 restAmount = divMoney(totalAmount, restAmount, divMembers, invitor.getMemberId(),
                 restAmount = divMoney(totalAmount, restAmount, divMembers, invitor.getMemberId(),
                         invitor.getShareRatio().intValue(), false);
                         invitor.getShareRatio().intValue(), false);
             }
             }

+ 11 - 0
src/test/java/com/izouma/nineth/CommonTest.java

@@ -57,6 +57,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.List;
 import java.util.*;
 import java.util.*;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 
 
 import static java.nio.file.StandardOpenOption.CREATE;
 import static java.nio.file.StandardOpenOption.CREATE;
@@ -371,4 +372,14 @@ public class CommonTest {
     public void sfsdf() {
     public void sfsdf() {
         System.out.println(BigDecimal.valueOf(11111110.5).setScale(2, RoundingMode.HALF_UP).toPlainString());
         System.out.println(BigDecimal.valueOf(11111110.5).setScale(2, RoundingMode.HALF_UP).toPlainString());
     }
     }
+
+    @Test
+    public void sdfsdf() {
+        Matcher matcher = Pattern.compile(".*- \\[(.*)\\((\\d+)\\)\\]")
+                .matcher("binding parameter [2] as [VARCHAR] - [第一批NFT韭菜大队(2888)]");
+        if (matcher.matches()) {
+            System.out.println(matcher.group(2));
+        }
+
+    }
 }
 }

+ 13 - 0
src/test/java/com/izouma/nineth/service/OrderServiceTest.java

@@ -11,12 +11,14 @@ import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.repo.*;
 import com.izouma.nineth.repo.*;
+import com.izouma.nineth.utils.FileUtils;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections.MapUtils;
 import org.junit.Test;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -162,4 +164,15 @@ public class OrderServiceTest extends ApplicationTests {
         }
         }
         log.info(s);
         log.info(s);
     }
     }
+
+    @Test
+    public void consignmentFix() throws IOException {
+        String s = FileUtils.readFile("/Users/drew/Downloads/app.log").replaceAll("</p>\n","</p>");
+        String[] arr = s.split("\n");
+        for (int i = 0; i < arr.length; i++) {
+            if (arr[i].contains("insert into collection_info")) {
+//                arr[i][2]
+            }
+        }
+    }
 }
 }