签约检测返回订单状态

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/issue/order/SignQueryResponseDTO.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.iaw.dto.issue.order;
 
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,6 +14,8 @@ import lombok.Data;
 @Data
 @ApiModel(description = "签约检测响应")
 public class SignQueryResponseDTO {
+    @ApiModelProperty(value = "订单阶段（通知小程序订单阶段）")
+    private IssueOrderStep step;
     @ApiModelProperty(value = "用户签约状态 UNAUTHORIZED 未签约")
     private String userState;//用户签约状态 是
 

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

@@ -70,6 +70,7 @@ 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:
@@ -84,6 +85,7 @@ 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: