Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/InssServiceType.java

@@ -5,6 +5,7 @@ import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
 import cn.com.taiji.core.model.comm.protocol.inss.cancelInst.DeviceCancelInstServiceCmd;
+import cn.com.taiji.core.model.comm.protocol.inss.carChange.CarChangeServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.inss.enableInst.DeviceEnableInstServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.inss.inst.InstServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.inss.renewalInst.RenewalInstServiceCmd;
@@ -24,6 +25,7 @@ public enum InssServiceType implements SignServiceType {
     DEVICECANCEL("注销指令接口", "^DEVICECANCEL_\\S+\\.json$", DeviceCancelInstServiceCmd.values()),
     DEVICEENABLE("停用启用指令接口", "^DEVICEENABLE_\\S+\\.json$", DeviceEnableInstServiceCmd.values()),
     PINUNLOCK("PIN解锁指令接口", "^PINUNLOCK_\\S+\\.json$", UnlockInstServiceCmd.values()),
+    CARCHANGE("车辆信息变更指令接口", "^CARCHANGE_\\S+\\.json$", CarChangeServiceCmd.values()),
     ;
 
     @Getter

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/carChange/CarChangeApplyRequest.java

@@ -0,0 +1,31 @@
+package cn.com.taiji.core.model.comm.protocol.inss.carChange;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
+import cn.com.taiji.core.model.comm.protocol.inss.inst.InstServiceCmd;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/26 11:20
+ * @Filename：CarChangeApplyRequest
+ * @description:
+ */
+@Getter
+@Setter
+public class CarChangeApplyRequest extends AbstractSignTypeRequest<CarChangeApplyResponse> {
+    protected CarChangeApplyRequest() {
+        super(CarChangeServiceCmd.APPLY);
+    }
+
+    @NotBlank
+    private String orderNo;//售后订单编号
+
+    @NotBlank
+    private String cardId;//卡号
+
+    @NotBlank
+    private String obuId;//签号
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/carChange/CarChangeApplyResponse.java

@@ -0,0 +1,24 @@
+package cn.com.taiji.core.model.comm.protocol.inss.carChange;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/26 11:21
+ * @Filename：CarChangeApplyResponse
+ * @description:
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@AllArgsConstructor
+public class CarChangeApplyResponse extends AbstractSignTypeResponse {
+    private Integer stepNo;//步骤号
+    private String cmd;//指令
+    private String cmdType;//指令类型
+    private String transOrderId;//指令编号
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/carChange/CarChangeCallBackRequest.java

@@ -0,0 +1,33 @@
+package cn.com.taiji.core.model.comm.protocol.inss.carChange;
+
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
+import cn.com.taiji.core.model.comm.protocol.inss.inst.InstServiceCmd;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/26 11:20
+ * @Filename：CarChangeCallBackRequest
+ * @description:
+ */
+@Getter
+@Setter
+public class CarChangeCallBackRequest extends AbstractSignTypeRequest<CarChangeCallBackResponse> {
+    public CarChangeCallBackRequest() {
+        super(CarChangeServiceCmd.CALLBACK);
+    }
+
+    @NotBlank
+    private String transOrderId;//交易编号
+    @NotBlank
+    private String cmd;//指令
+    @NotBlank
+    private String cmdResult;//指令结果
+    @NotNull
+    private Integer stepNo;
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/carChange/CarChangeCallBackResponse.java

@@ -0,0 +1,22 @@
+package cn.com.taiji.core.model.comm.protocol.inss.carChange;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/26 11:23
+ * @Filename：CarChangeCallBackResponse
+ * @description:
+ */
+@Setter
+@Getter
+@Accessors(chain = true)
+public class CarChangeCallBackResponse extends AbstractSignTypeResponse {
+    private Integer stepNo;
+    private String cmd;//指令
+    private String cmdType;//指令类型
+    private String transOrderId;//二发订单号
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/carChange/CarChangeServiceCmd.java

@@ -0,0 +1,46 @@
+package cn.com.taiji.core.model.comm.protocol.inss.carChange;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
+import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
+import cn.com.taiji.core.model.comm.protocol.SignServiceType;
+import cn.com.taiji.core.model.comm.protocol.inss.InssServiceType;
+
+public enum CarChangeServiceCmd implements SignServiceCommand {
+
+
+    APPLY("车辆信息变更初始化命令", CarChangeApplyRequest.class),
+    CALLBACK("车辆信息变更激活指令回传", CarChangeCallBackRequest.class),
+    ;
+
+    private final String value;
+    private final Class<? extends AbstractSignTypeRequest<?>> reqClass;
+
+    CarChangeServiceCmd(String value, Class<? extends AbstractSignTypeRequest<?>> reqClass) {
+        this.value = value;
+        this.reqClass = reqClass;
+    }
+
+    @Override
+    public SignServiceType getServiceType() {
+        return InssServiceType.CARCHANGE;
+    }
+
+    public static CarChangeServiceCmd fromIfCode(String ifCode) {
+        return SignServiceCommand.fromName(CarChangeServiceCmd.class, SignServiceCommand.getCmdStr(ifCode));
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean isMyCommand(String ifCode) {
+        return this == fromIfCode(ifCode);
+    }
+
+    @Override
+    public Class<? extends AbstractSignTypeRequest<?>> getProtocolClass() {
+        return reqClass;
+    }
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/issue/UserEquityLinkManagerImpl.java

@@ -63,9 +63,9 @@ public class UserEquityLinkManagerImpl extends AbstractIawManager implements Use
         if (equityLink == null) {
             throw new ManagerException("未获取到权益！");
         }
-        if (LocalDateTime.now().isAfter(equityLink.getValidEndTime())) {
-            throw new ManagerException("权益已过期！");
-        }
+//        if (equityLink.getValidEndTime() != null && LocalDateTime.now().isAfter(equityLink.getValidEndTime())) {
+//            throw new ManagerException("权益已过期！");
+//        }
         //获取兑换码
         IssueSingleEquity singleEquity = singleEquityRepo.findBySingleEquityId(equityLink.getEquityId());
         if (singleEquity == null) {
@@ -133,7 +133,7 @@ public class UserEquityLinkManagerImpl extends AbstractIawManager implements Use
         if (singleEquity == null) {
             throw new ManagerException("未获取到权益！");
         }
-        equityLink.setEquityId(singleEquity.getId());
+        equityLink.setEquityId(singleEquity.getSingleEquityId());
         equityLink.setEquityName(singleEquity.getEquityName());
         equityLink.setProductIntro(singleEquity.getProductIntro());
         equityLink.setFee(singleEquity.getDiscountPrice());

zhywpt-service-ias/src/main/resources/bootstrap.yml

@@ -13,7 +13,8 @@ spring:
       discovery:
         enabled: true
         server-addr: 100.64.2.105:8848
-        namespace: zhywpt-new-test
+#        namespace: zhywpt-new-test
+        namespace: zhywpt-prod-new
         username: nacos
         password: 'Pw=j8PKxV7s9'
 #        ip: 127.0.0.1
@@ -22,7 +23,8 @@ spring:
         enabled: true
         file-extension: yaml  # 必须修改成yaml
         server-addr: 100.64.2.105:8848
-        namespace: zhywpt-new-test
+#        namespace: zhywpt-new-test
+        namespace: zhywpt-prod-new
         username: nacos
         password: 'Pw=j8PKxV7s9'
         extension-configs:
@@ -95,8 +97,8 @@ app:
   comm:
     #    自定义服务地址map，key为服务名、value为服务地址。如果配置了服务地址，接口调用时请求到该地址，如果没配置，默认请求到gateway
     serviceAddr:
-#      issues: http://127.0.0.1:8090
-      ods: http://100.64.2.98:8092
+      issues: http://127.0.0.1:8090
+#      ods: http://100.64.2.98:8092
 
 # 退费接口相关参数
 refund: