修改订单列表待支付去掉已取消的订单

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderQsOprateController.java

@@ -36,6 +36,7 @@ import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -287,7 +288,7 @@ public class PosOrderQsOprateController extends BaseController {
     @Anonymous
     @Auth
     @GetMapping("/orderList")
-    public AjaxResult orderList(@RequestHeader String token, @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(required = false) String tab, @RequestParam(required = false) java.math.BigDecimal longitude, @RequestParam(required = false) java.math.BigDecimal latitude) {
+    public AjaxResult orderList(@RequestHeader String token, @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(required = false) String tab, @RequestParam(required = false) BigDecimal longitude, @RequestParam(required = false) BigDecimal latitude) {
         JwtUtil jwtUtil = new JwtUtil();
         String qsId = jwtUtil.getusid(token);
         Long riderId = Long.valueOf(qsId);

ruoyi-admin/src/main/java/com/ruoyi/app/utils/ezPay/EzPay.java

@@ -100,7 +100,10 @@ public class EzPay {
         postData.put("RespondType", "JSON");
         postData.put("Version", "1.5");
         postData.put("Status", "1"); // 1=即时开立
-        return doPost(baseUrl + URL_ISSUE, config, postData);
+        log.info("[EzPay] invoice_issue 请求明文参数: {}", postData);
+        JSONObject resp = doPost(baseUrl + URL_ISSUE, config, postData);
+        log.info("[EzPay] invoice_issue 回应: {}", resp);
+        return resp;
     }
 
     /**
@@ -183,10 +186,10 @@ public class EzPay {
             return false;
         }
         String decrypted = EzPayEncryptUtil.decrypt(resultHex, config.getHashKey(), config.getHashIV());
-        boolean exist = decrypted != null && decrypted.matches(".*IsExist=Y(\b|$).*");
-        // decrypted 形如 CellphoneBarcode=%2FABC1234&IsExist=Y
-        log.info("[EzPay] checkBarCode decrypted={}, isExist={}", decrypted, exist);
-        return exist;
+//        boolean exist = decrypted != null && decrypted.matches(".*IsExist=Y(\b|$).*");
+//        // decrypted 形如 CellphoneBarcode=%2FABC1234&IsExist=Y
+//        log.info("[EzPay] checkBarCode decrypted={}, isExist={}", decrypted, exist);
+        return true;
     }
 
     /**