Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/GetCarSignRequest.java

@@ -0,0 +1,30 @@
+package cn.com.taiji.core.model.comm.protocol.ias.order;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
+import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
+import lombok.Getter;
+import lombok.Setter;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/19 22:31
+ * @Filename：GetCarSignRequest
+ * @description:
+ */
+@Getter
+@Setter
+public class GetCarSignRequest extends AbstractSignTypeRequest<GetCarSignResponse> {
+    public GetCarSignRequest() {
+        super(OrderServiceCmd.GETCARSIGN);
+    }
+
+    @NotBlank
+    private String orderNo; //订单编号
+    @NotNull
+    @IntegerConstant(values = "1,2")
+    private Integer signChannelType=1;// 1:微信小程序 2：支付宝小程序
+    @NotBlank
+    private String subOpenId;// signChannelType=1或2时必填，填黔通微信或支付宝小程序的openId，
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/GetCarSignResponse.java

@@ -0,0 +1,52 @@
+package cn.com.taiji.core.model.comm.protocol.ias.order;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/19 22:31
+ * @Filename：GetCarSignResponse
+ * @description:  获取签约参数响应
+ */
+@Getter
+@Setter
+public class GetCarSignResponse extends AbstractSignTypeResponse {
+
+    private String userState;//用户签约状态 是
+
+    private String deductMode;//发起扣费方式PROACTIVE：表示用户主动发起的免密支付 AUTOPAY：表示用户无感的支付 否
+
+    private String plateNumberInfo;//车牌信息 否
+
+    //=====================前端请求微信签约参数==============参与签名字段 +
+    private String appId;//请求appid 是 +
+
+    private String mchId;//商户号 是 +
+
+    private String subMchId;//子商户号 是 +
+
+    private String subAppId;//子商户公众账号id 是 +
+
+    private String nonceStr;//随机字符串 是 +
+
+    private String signType;//签名类型 是 +
+
+    private String sign;//签名 是
+
+    private String tradeScene = "HIGHWAY";//交易场景 写死 是 +
+
+    private String openId;//用户标识 否
+
+    private String subOpenId;//用户子标识 是 +
+
+    private String plateNumber;//车牌号 是 +
+
+    private String channelType = "ETC";//通道类型 写死 ETC +
+
+    private String path;//跳转路径 是
+
+
+    private String preopenId;//V3黄牌 签约参数
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/OrderServiceCmd.java

@@ -15,6 +15,7 @@ public enum OrderServiceCmd implements SignServiceCommand {
     STATUSQUERY("状态查询", OrderStatusQueryRequest.class),
     PAYAPPLY("支付申请", OrderPayApplyRequest.class),
     PAYQUERY("支付查询", OrderPayQueryRequest.class),
+    GETCARSIGN("获取签约参数", GetCarSignRequest.class),
     SIGNQUERY("签约检测", SignQueryRequest.class),
     TRANSACTION("事务同步", OrderTransactionRequest.class),
     PRODUCTQUERY("获取产品列表", ProductQueryRequest.class),

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/SignQueryManager.java

@@ -70,7 +70,6 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
             case BLUE:
             case GREEN:
                 res = signCommonManager.carSignV2(request.getSubOpenId(), order.getProductId(), order.getVehicleId());
-                res.setStep(order.getOrderStep());
                 flag = !"UNAUTHORIZED".equals(res.getUserState());
                 break;
             case YELLOW:
@@ -85,7 +84,6 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
                     idNum = order.getAgentIdNum();
                 }
                 res = signCommonManager.carSignV3(request.getSubOpenId(), order.getProductId(), order.getVehicleId(), name, idNum);
-                res.setStep(order.getOrderStep());
                 flag = "OPENED".equals(res.getUserState());
                 break;
             default:
@@ -107,6 +105,7 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
             }
             orderInfoRepo.merge(order);
         }
+        res.setStep(order.getOrderStep());
         dataStream.put(RES, res);
     }
     @Override

zhywpt-service-ias/src/test/java/cn/com/taiji/oqs/client/demo/OneTest.java

@@ -2,10 +2,13 @@ package cn.com.taiji.oqs.client.demo;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.model.comm.protocol.ias.ass.ReleasePlateApplyRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.order.GetCustomerIdRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.order.GetCustomerIdResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.order.UserUploadRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.vaild.VehiclePlateCheckRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.vaild.VehiclePlateCheckResponse;
 import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsCardQueryRequest;
@@ -68,4 +71,43 @@ public class OneTest extends AbstractCommManager {
         OqsCardQueryResponse oqsCardQueryResponse = jsonPostRepeat(request);
         System.out.println(oqsCardQueryResponse.toJson(true));
     }
+
+    @Test
+    public void OqsCardQueryRequestTest2() throws ManagerException {
+        UserUploadRequest request = new UserUploadRequest();
+        request.setCustomerIdVld("20441218");
+        request.setMobile("19833787623");
+        request.setOrderNo("20250818094233520101069987157313");
+        request.setUserAddress("山东省济南市历城区遥墙镇四凤闸村东组25号");
+        request.setUserIdNum("520403198707285409");
+        request.setUserIdType(101);
+        request.setUserName("张三");
+        request.setUserPosImgUrl("zhywpt-issuer/20250818/h5/5f21ee5a71b64c01a49c144a_mmexport1753424081039.jpg");
+        request.setUserNegImgUrl("zhywpt-issuer/20250818/h5/6f216174b57b4e98982aa1d0_mmexport1753424083383.jpg");
+        jsonPostRepeat(request);
+    }
+    @Test
+    public void tttt() throws ServiceHandleException {
+
+        ReleasePlateApplyRequest request = new ReleasePlateApplyRequest();
+        request.setAgencyId("52010106004");
+        request.setApplyType(1);
+        request.setChannelId("5201010600401140003");
+        request.setCustomerIdNum("350623199807072540");
+        request.setIsSelf(1);
+        request.setMobile("15359873965");
+        request.setName("钱川");
+        request.setOpenId("e8a6c80903ce4b3096342369a7312bfe");
+        request.setSourceType(SourceType.SERVICE_HALL);
+        request.setUserPosImagesUrl("https://qtzl.etcjz.cn/zhywpt-issuer-test/20250818/app/faf4985138b94b739c8a4247_1755481860690_pic.jpg");
+        request.setUserNegImagesUrl("https://qtzl.etcjz.cn/zhywpt-issuer-test/20250818/app/6f00314a492b40cfb6d0cd1b_1755481866170_pic.jpg");
+        request.setVehNegImgUrl("https://qtzl.etcjz.cn/zhywpt-issuer-test/20250818/app/9d212870c1d04d73a44f5486_1755481906961435.jpeg");
+        request.setVehPosImgUrl("https://qtzl.etcjz.cn/zhywpt-issuer-test/20250818/app/989e7cd9b9494b88a9facd84_175548190027769.jpeg");
+        request.setVehicleOwnerName("钱川");
+        request.setVehiclePlate("贵Z10020");
+        request.setVehiclePlateColor(0);
+        jsonPostRepeat(request);
+
+
+    }
 }