MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/bo/NumSettleBo.java

@@ -18,7 +18,7 @@ public class NumSettleBo implements Serializable {
 
     private Long settleId;
 
-    private Long settleSn;
+    private String settleSn;
 
     @ApiModelProperty("标题")
     private String title;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/bo/TimeSettleBo.java

@@ -18,7 +18,7 @@ public class TimeSettleBo implements Serializable {
 
     private Long settleId;
 
-    private Long settleSn;
+    private String settleSn;
 
     @ApiModelProperty("标题")
     private String title;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/service/impl/ITopInstSettleServiceImpl.java

@@ -439,11 +439,8 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
         checkLog.setCheckSign(1);
         topOldOrderCheckLogService.updateById(checkLog);
         //订单审核状态
-        Integer checkStatus = 1;//待审核
+        Integer checkStatus = 2;//审核中
         for (TopOldOrderCheckLog item : checkLogList) {
-            if (item.getId().equals(checkLog.getId()) && item.getType() == 7 && item.getCheckSort() > 1){
-                checkStatus = 2;//审核中
-            }
             if (item.getId().equals(checkLog.getId()) && item.getType() == 8 ){
                 checkStatus = 4;//待支付
             }