TRX 1 vuosi sitten
vanhempi
commit
dc97bbb54a

+ 7 - 6
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/TestController.java

@@ -5,6 +5,7 @@ import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.service.TestService;
 import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
 import com.zhongshu.card.server.core.service.openAPI.OpenAPIRegisterService;
+import com.zhongshu.card.server.core.service.payment.PayCallService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -13,8 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.*;
 
 @Slf4j
 @RestController
@@ -31,15 +31,16 @@ public class TestController {
     @Autowired
     DeviceInfoServiceImpl deviceInfoService;
 
+    @Autowired
+    private PayCallService payCallService;
+
     @Operation(summary = "测试接口", description = "测试接口")
     @RequestMapping(value = "text", method = {RequestMethod.GET})
     public ResultContent text() {
 //        openAPIRegisterService.initRegisterPAIS();
         try {
-            byte[] bins = BytesUtil.longToBin(Long.parseLong("2152525002"), 4);
-//            var ret = reverse(bins);
-            String str = BytesUtil.binToHex(bins);
-            log.info("str; {}", str.toUpperCase());
+            Set<String> set = new HashSet<>(List.of("P202411191422212690001"));
+            payCallService.markOrderSettlement(set);
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/CommonService.java

@@ -69,7 +69,8 @@ public class CommonService {
         if (where != null) {
             where.forEach((key, value) -> {
                 if (value != null && value instanceof List<?>) {
-                    criteria.and(key).in(value);
+                    List<Object> _temp = (List<Object>) value;
+                    criteria.and(key).in(_temp);
                 } else {
                     criteria.and(key).is(value);
                 }

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -653,7 +653,7 @@ public class PayCallService extends SuperService {
      *
      * @param orderNoSet
      */
-    private void markOrderSettlement(Set<String> orderNoSet) {
+    public void markOrderSettlement(Set<String> orderNoSet) {
         log.info("orderNoSet: {}", orderNoSet);
         if (orderNoSet != null && !orderNoSet.isEmpty()) {
             List<String> orderNoList = new ArrayList<>(orderNoSet);