Merge remote-tracking branch 'origin/dev' into dev

blade-ops/blade-swagger/src/main/resources/application-dev.yml

@@ -28,4 +28,7 @@ knife4j:
       - name: 运维管理
         uri: 127.0.0.1:1080
         location: /blade-mocha-item/v2/api-docs
+      - name: 审批管理
+        uri: 127.0.0.1:1080
+        location: /blade-check/v2/api-docs
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditItemsDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditItemsDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditItems;
+import org.springblade.check.entity.AuditItems;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditItemsUsersDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditItemsUsersDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditItemsUsers;
+import org.springblade.check.entity.AuditItemsUsers;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditPathsActsDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditPathsActsDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsActs;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditPathsDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditPathsDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditPaths;
+import org.springblade.check.entity.AuditPaths;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditPathsLevelsDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditPathsLevelsDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditPathsLevels;
+import org.springblade.check.entity.AuditPathsLevels;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditProecessDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditProecessDTO.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.entity.AuditProecess;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.entity.AuditProecess;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditItems.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditItems.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditItemsUsers.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditItemsUsers.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditPaths.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditPaths.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditPathsActs.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditPathsActs.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditPathsLevels.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditPathsLevels.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditProecess.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -14,10 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -40,7 +42,7 @@ public class AuditProecess implements Serializable {
 	* 1:财务清核
 	*/
 		@ApiModelProperty(value = "1:财务清核")
-		private Long actId;
+		private int actId;
 	/**
 	* 业务id
 	*/
@@ -75,7 +77,7 @@ public class AuditProecess implements Serializable {
 	* 请核时间
 	*/
 		@ApiModelProperty(value = "请核时间")
-		private LocalDateTime sendTime;
+		private Date sendTime;
 	/**
 	* 请核备注
 	*/

blade-service-api/blade-check-api/src/main/java/com/blade/check/feign/ICheckClient.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/feign/ICheckClient.java

@@ -1,10 +1,14 @@
-package com.blade.check.feign;
+package org.springblade.check.feign;
 
 
-import com.blade.check.entity.AuditPathsLevels;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -19,11 +23,15 @@ public interface ICheckClient {
 
 	//通过唯一的actId查询审批等级
 	@GetMapping("/auditpathsacts/listLevelsByActId")
-	List<AuditPathsLevels> listLevelsByActId(@RequestParam("actId") int actId,@RequestParam("fidStatus") int fidStatus);
+	List<AuditPathsLevels> listLevelsByActId(@RequestParam("actId") int actId, @RequestParam("fidStatus") String fidStatus);
 
 	//通过actId查询是否开启审批
 	@GetMapping("/auditpathsacts/getActsByActId")
-	AuditPathsLevels getActsByActId(@RequestParam("actId") int actId,@RequestParam("fidStatus") int fidStatus);
+	AuditPathsActs getActsByActId(@RequestParam("actId") int actId, @RequestParam("fidStatus") String fidStatus);
+
+	//开启审批流程
+	@PostMapping("/auditproecess/createFinanceProcess")
+	R createFinanceProcess (@RequestBody AuditProecessDTO auditProecessDTO);
 
 	/**
 	 * 获取商品信息

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditItemsUsersVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditItemsUsersVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditItemsUsers;
+import org.springblade.check.entity.AuditItemsUsers;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditItemsVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditItemsVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditItems;
+import org.springblade.check.entity.AuditItems;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditPathsActsVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditPathsActsVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsActs;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditPathsLevelsVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditPathsLevelsVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditPathsLevels;
+import org.springblade.check.entity.AuditPathsLevels;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditPathsVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditPathsVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditPaths;
+import org.springblade.check.entity.AuditPaths;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditProecessVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditProecessVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditProecess;
+import org.springblade.check.entity.AuditProecess;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/store-goods-api/src/main/java/com/store/goods/dto/AppDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.dto;
+
+import com.store.goods.entity.App;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * app应用表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AppDTO extends App {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/store-goods-api/src/main/java/com/store/goods/dto/AppVersionDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.dto;
+
+import com.store.goods.entity.AppVersion;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * app版本表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AppVersionDTO extends AppVersion {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/store-goods-api/src/main/java/com/store/goods/entity/App.java

@@ -0,0 +1,122 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * app应用表实体类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@Data
+@TableName("blade_app")
+@ApiModel(value = "App对象", description = "app应用表")
+public class App implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* app
+	*/
+		@ApiModelProperty(value = "app")
+		private Long id;
+	/**
+	* app名称
+	*/
+		@ApiModelProperty(value = "app名称")
+		private String appName;
+	/**
+	* logo
+	*/
+		@ApiModelProperty(value = "logo")
+		private String logo;
+	/**
+	* 小图标logo
+	*/
+		@ApiModelProperty(value = "小图标logo")
+		private String miniLogo;
+	/**
+	* 0为安卓,1为苹果
+	*/
+		@ApiModelProperty(value = "0为安卓,1为苹果")
+		private Integer type;
+	/**
+	* 安卓包名
+	*/
+		@ApiModelProperty(value = "安卓包名")
+		private String packageName;
+	/**
+	* 苹果url_schema
+	*/
+		@ApiModelProperty(value = "苹果url_schema")
+		private String urlSchema;
+	/**
+	* 苹果app_store_id
+	*/
+		@ApiModelProperty(value = "苹果app_store_id")
+		private String appStoreId;
+	/**
+	* 苹果bundle_id
+	*/
+		@ApiModelProperty(value = "苹果bundle_id")
+		private String bundleId;
+	/**
+	* app应用描述
+	*/
+		@ApiModelProperty(value = "app应用描述")
+		private String appDesc;
+
+		/**
+		 * 创建时间
+		 *
+		 * @ignore
+		 */
+		@ApiModelProperty(value = "创建时间")
+		@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+		@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+		protected Date createTime;
+
+		/**
+		 * 创建人
+		 *
+		 * @ignore
+		 */
+		@ApiModelProperty(value = "创建人")
+		protected Long createUser;
+
+		@TableField(exist = false)
+		@ApiModelProperty(value = "最新的app版本")
+		private AppVersion AppVersion;
+
+		@TableField(exist = false)
+		@ApiModelProperty(value = "app版本历史列表")
+		private List<AppVersion> AppVersionList;
+
+}

blade-service-api/store-goods-api/src/main/java/com/store/goods/entity/AppVersion.java

@@ -0,0 +1,96 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * app版本表实体类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@Data
+@TableName("blade_app_version")
+@ApiModel(value = "AppVersion对象", description = "app版本表")
+public class AppVersion implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	/**
+	* 属于的app的id
+	*/
+		@ApiModelProperty(value = "属于的app的id")
+		@TableField("appId")
+	private Long appid;
+	/**
+	* 版本名称
+	*/
+		@ApiModelProperty(value = "版本名称")
+		private String versionName;
+	/**
+	* 版本号
+	*/
+		@ApiModelProperty(value = "版本号")
+		private Long versionCode;
+	/**
+	* 版本更新描述
+	*/
+		@ApiModelProperty(value = "版本更新描述")
+		private String versionDesc;
+	/**
+	* 下载地址
+	*/
+		@ApiModelProperty(value = "下载地址")
+		private String downloadUrl;
+	/**
+	* 是否发布  0待发布 1发布
+	*/
+		@ApiModelProperty(value = "是否发布  0待发布 1发布")
+		private Integer isRelease;
+
+	/**
+	 * 创建时间
+	 *
+	 * @ignore
+	 */
+	@ApiModelProperty(value = "创建时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	protected Date createTime;
+
+	/**
+	 * 创建人
+	 *
+	 * @ignore
+	 */
+	@ApiModelProperty(value = "创建人")
+	protected Long createUser;
+
+
+}

blade-service-api/store-goods-api/src/main/java/com/store/goods/vo/AppVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.vo;
+
+import com.store.goods.entity.App;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * app应用表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppVO对象", description = "app应用表")
+public class AppVO extends App {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/store-goods-api/src/main/java/com/store/goods/vo/AppVersionVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.vo;
+
+import com.store.goods.entity.AppVersion;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * app版本表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppVersionVO对象", description = "app版本表")
+public class AppVersionVO extends AppVersion {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/blade-check/src/main/java/com.blade.check/CheckApplication.java → blade-service/blade-check/src/main/java/org/springblade/check/CheckApplication.java

@@ -14,12 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check;
+package org.springblade.check;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
@@ -30,7 +28,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-@MapperScan({"com.blade.check.**.mapper.**"})
 @SeataCloudApplication
 public class CheckApplication {
 

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditItemsController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditItemsController.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,15 +23,15 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditItems;
+import org.springblade.check.vo.AuditItemsVO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditItems;
-import com.blade.check.vo.AuditItemsVO;
-import com.blade.check.service.IAuditItemsService;
+import org.springblade.check.service.IAuditItemsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -111,7 +111,7 @@ public class AuditItemsController extends BladeController {
 		return R.status(auditItemsService.saveOrUpdate(auditItems));
 	}
 
-	
+
 	/**
 	 * 删除 审批流任务明细
 	 */
@@ -122,5 +122,5 @@ public class AuditItemsController extends BladeController {
 		return R.status(auditItemsService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditItemsUsersController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditItemsUsersController.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,15 +23,15 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditItemsUsers;
+import org.springblade.check.vo.AuditItemsUsersVO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditItemsUsers;
-import com.blade.check.vo.AuditItemsUsersVO;
-import com.blade.check.service.IAuditItemsUsersService;
+import org.springblade.check.service.IAuditItemsUsersService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -111,7 +111,7 @@ public class AuditItemsUsersController extends BladeController {
 		return R.status(auditItemsUsersService.saveOrUpdate(auditItemsUsers));
 	}
 
-	
+
 	/**
 	 * 删除 审批流任务明细用户表
 	 */
@@ -122,5 +122,5 @@ public class AuditItemsUsersController extends BladeController {
 		return R.status(auditItemsUsersService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditPathsActsController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditPathsActsController.java

@@ -14,31 +14,27 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.service.IAuditPathsLevelsService;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.service.IAuditPathsLevelsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.vo.AuditPathsActsVO;
-import com.blade.check.service.IAuditPathsActsService;
+import org.springblade.check.service.IAuditPathsActsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
@@ -86,7 +82,7 @@ public class AuditPathsActsController extends BladeController {
 	}
 
 	@GetMapping("listLevelsByActId")
-    public List<AuditPathsLevels> listLevelsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId,@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus)
+    public List<AuditPathsLevels> listLevelsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus)
 	{
 		AuditPathsActs pathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<AuditPathsActs>().eq(AuditPathsActs::getActId, actId).eq(AuditPathsActs::getFidStatus,fidStatus).eq(AuditPathsActs::getTenantId,AuthUtil.getTenantId()));
 		Long pathId = pathsActs.getPathId();

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditPathsController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditPathsController.java

@@ -14,15 +14,14 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.service.IAuditPathsActsService;
-import com.blade.check.service.IAuditPathsLevelsService;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.service.IAuditPathsActsService;
+import org.springblade.check.service.IAuditPathsLevelsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,6 +29,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditPaths;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -37,9 +37,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.vo.AuditPathsVO;
-import com.blade.check.service.IAuditPathsService;
+import org.springblade.check.service.IAuditPathsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditPathsLevelsController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditPathsLevelsController.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,15 +23,15 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.vo.AuditPathsLevelsVO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.vo.AuditPathsLevelsVO;
-import com.blade.check.service.IAuditPathsLevelsService;
+import org.springblade.check.service.IAuditPathsLevelsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -111,7 +111,7 @@ public class AuditPathsLevelsController extends BladeController {
 		return R.status(auditPathsLevelsService.saveOrUpdate(auditPathsLevels));
 	}
 
-	
+
 	/**
 	 * 删除 审批流配置明细级别表
 	 */
@@ -122,5 +122,5 @@ public class AuditPathsLevelsController extends BladeController {
 		return R.status(auditPathsLevelsService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditProecessController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -14,26 +14,22 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.blade.check.dto.AuditProecessDTO;
+import org.springblade.check.dto.AuditProecessDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditProecess;
+import org.springblade.check.service.IAuditProecessService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditProecess;
-import com.blade.check.vo.AuditProecessVO;
-import com.blade.check.service.IAuditProecessService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -64,7 +60,7 @@ public class AuditProecessController extends BladeController {
 	@PostMapping("createFinanceProcess")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "开启-财务审批流记录", notes = "传入auditProecessDTO")
-	public R createFinanceProcess(@RequestBody  AuditProecessDTO auditProecessDTO)
+	public R createFinanceProcess(@RequestBody AuditProecessDTO auditProecessDTO)
 	{
         if(CollectionUtils.isEmpty(auditProecessDTO.getPathsLevelsList()))
         {

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditItems.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditItems.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditItemsUsers.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditItemsUsers.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditPaths.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditPaths.java

@@ -14,18 +14,17 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditPathsActs.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditPathsActs.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditPathsLevels.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditPathsLevels.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditProecess.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditItemsMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditItemsMapper.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditItems;
-import com.blade.check.vo.AuditItemsVO;
+import org.springblade.check.entity.AuditItems;
+import org.springblade.check.vo.AuditItemsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditItemsMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditItemsMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditItemsMapper">
+<mapper namespace="org.springblade.check.mapper.AuditItemsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditItemsResultMap" type="com.blade.check.entity.AuditItems">
+    <resultMap id="auditItemsResultMap" type="org.springblade.check.entity.AuditItems">
         <id column="id" property="id"/>
         <result column="act_id" property="actId"/>
         <result column="bill_id" property="billId"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditItemsUsersMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditItemsUsersMapper.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditItemsUsers;
-import com.blade.check.vo.AuditItemsUsersVO;
+import org.springblade.check.entity.AuditItemsUsers;
+import org.springblade.check.vo.AuditItemsUsersVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditItemsUsersMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditItemsUsersMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditItemsUsersMapper">
+<mapper namespace="org.springblade.check.mapper.AuditItemsUsersMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditItemsUsersResultMap" type="com.blade.check.entity.AuditItemsUsers">
+    <resultMap id="auditItemsUsersResultMap" type="org.springblade.check.entity.AuditItemsUsers">
         <id column="id" property="id"/>
         <result column="pid" property="pid"/>
         <result column="bill_no" property="billNo"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsActsMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsActsMapper.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.vo.AuditPathsActsVO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.vo.AuditPathsActsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsActsMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsActsMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditPathsActsMapper">
+<mapper namespace="org.springblade.check.mapper.AuditPathsActsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditPathsActsResultMap" type="com.blade.check.entity.AuditPathsActs">
+    <resultMap id="auditPathsActsResultMap" type="org.springblade.check.entity.AuditPathsActs">
         <id column="id" property="id"/>
         <result column="branch_id" property="branchId"/>
         <result column="act_id" property="actId"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsLevelsMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsLevelsMapper.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.vo.AuditPathsLevelsVO;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.vo.AuditPathsLevelsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsLevelsMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsLevelsMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditPathsLevelsMapper">
+<mapper namespace="org.springblade.check.mapper.AuditPathsLevelsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditPathsLevelsResultMap" type="com.blade.check.entity.AuditPathsLevels">
+    <resultMap id="auditPathsLevelsResultMap" type="org.springblade.check.entity.AuditPathsLevels">
         <id column="id" property="id"/>
         <result column="path_id" property="pathId"/>
         <result column="level_id" property="levelId"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsMapper.java

@@ -14,12 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.vo.AuditPathsVO;
+import org.springblade.check.entity.AuditPaths;
+import org.springblade.check.vo.AuditPathsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import java.util.List;
 
 /**

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditPathsMapper">
+<mapper namespace="org.springblade.check.mapper.AuditPathsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditPathsResultMap" type="com.blade.check.entity.AuditPaths">
+    <resultMap id="auditPathsResultMap" type="org.springblade.check.entity.AuditPaths">
         <id column="id" property="id"/>
         <result column="path_id" property="pathId"/>
         <result column="path_name" property="pathName"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditProecessMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditProecessMapper.java

@@ -14,12 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditProecess;
-import com.blade.check.vo.AuditProecessVO;
+import org.springblade.check.entity.AuditProecess;
+import org.springblade.check.vo.AuditProecessVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import java.util.List;
 
 /**

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditProecessMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditProecessMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditProecessMapper">
+<mapper namespace="org.springblade.check.mapper.AuditProecessMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditProecessResultMap" type="com.blade.check.entity.AuditProecess">
+    <resultMap id="auditProecessResultMap" type="org.springblade.check.entity.AuditProecess">
         <id column="id" property="id"/>
         <result column="act_id" property="actId"/>
         <result column="bill_id" property="billId"/>

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditItemsService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditItemsService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditItems;
-import com.blade.check.vo.AuditItemsVO;
+import org.springblade.check.entity.AuditItems;
+import org.springblade.check.vo.AuditItemsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditItemsUsersService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditItemsUsersService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditItemsUsers;
-import com.blade.check.vo.AuditItemsUsersVO;
+import org.springblade.check.entity.AuditItemsUsers;
+import org.springblade.check.vo.AuditItemsUsersVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditPathsActsService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditPathsActsService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.vo.AuditPathsActsVO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.vo.AuditPathsActsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditPathsLevelsService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditPathsLevelsService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.vo.AuditPathsLevelsVO;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.vo.AuditPathsLevelsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditPathsService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditPathsService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.vo.AuditPathsVO;
+import org.springblade.check.entity.AuditPaths;
+import org.springblade.check.vo.AuditPathsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditProecessService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditProecessService.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.dto.AuditProecessDTO;
-import com.blade.check.entity.AuditProecess;
-import com.blade.check.vo.AuditProecessVO;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditProecess;
+import org.springblade.check.vo.AuditProecessVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditItemsServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditItemsServiceImpl.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
-import com.blade.check.entity.AuditItems;
-import com.blade.check.vo.AuditItemsVO;
-import com.blade.check.mapper.AuditItemsMapper;
-import com.blade.check.service.IAuditItemsService;
+import org.springblade.check.entity.AuditItems;
+import org.springblade.check.vo.AuditItemsVO;
+import org.springblade.check.mapper.AuditItemsMapper;
+import org.springblade.check.service.IAuditItemsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditItemsUsersServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditItemsUsersServiceImpl.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
-import com.blade.check.entity.AuditItemsUsers;
-import com.blade.check.vo.AuditItemsUsersVO;
-import com.blade.check.mapper.AuditItemsUsersMapper;
-import com.blade.check.service.IAuditItemsUsersService;
+import org.springblade.check.entity.AuditItemsUsers;
+import org.springblade.check.vo.AuditItemsUsersVO;
+import org.springblade.check.mapper.AuditItemsUsersMapper;
+import org.springblade.check.service.IAuditItemsUsersService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditPathsActsServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditPathsActsServiceImpl.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.vo.AuditPathsActsVO;
-import com.blade.check.mapper.AuditPathsActsMapper;
-import com.blade.check.service.IAuditPathsActsService;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.vo.AuditPathsActsVO;
+import org.springblade.check.mapper.AuditPathsActsMapper;
+import org.springblade.check.service.IAuditPathsActsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditPathsLevelsServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditPathsLevelsServiceImpl.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.vo.AuditPathsLevelsVO;
-import com.blade.check.mapper.AuditPathsLevelsMapper;
-import com.blade.check.service.IAuditPathsLevelsService;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.vo.AuditPathsLevelsVO;
+import org.springblade.check.mapper.AuditPathsLevelsMapper;
+import org.springblade.check.service.IAuditPathsLevelsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditPathsServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditPathsServiceImpl.java

@@ -14,17 +14,17 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.mapper.AuditPathsLevelsMapper;
-import com.blade.check.vo.AuditPathsVO;
-import com.blade.check.mapper.AuditPathsMapper;
-import com.blade.check.service.IAuditPathsService;
+import org.springblade.check.entity.AuditPaths;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.mapper.AuditPathsLevelsMapper;
+import org.springblade.check.vo.AuditPathsVO;
+import org.springblade.check.mapper.AuditPathsMapper;
+import org.springblade.check.service.IAuditPathsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditProecessServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -14,26 +14,24 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.blade.check.dto.AuditProecessDTO;
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.entity.AuditProecess;
-import com.blade.check.mapper.AuditPathsActsMapper;
-import com.blade.check.vo.AuditProecessVO;
-import com.blade.check.mapper.AuditProecessMapper;
-import com.blade.check.service.IAuditProecessService;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.entity.AuditProecess;
+import org.springblade.check.mapper.AuditPathsActsMapper;
+import org.springblade.check.vo.AuditProecessVO;
+import org.springblade.check.mapper.AuditProecessMapper;
+import org.springblade.check.service.IAuditProecessService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 
 /**

blade-service/blade-check/src/main/resources/application-dev.yml

@@ -11,4 +11,4 @@ spring:
 #swagger文档
 swagger:
   base-packages:
-    - com.store.goods
+    - org.springblade.check

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderItemsClient.java

@@ -1,6 +1,7 @@
 package org.springblade.purchase.sales.feign;
 
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.deliver.goods.enums.DeliveryEnum;
@@ -11,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.math.BigDecimal;
-
+@Slf4j
 @NonDS
 @ApiIgnore()
 @RestController
@@ -36,8 +37,11 @@ public class OrderItemsClient implements IOrderItemsClient{
 		OrderItems items = new OrderItems();
 		items.setId(orderItemsId);
 		if (deliveryType == DeliveryEnum.DELIVER.getType()){ //发货
+			log.info("已发货数量为:==>"+actualQuantity);
+			log.info("订货数量-已收数量:==>"+orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity()));
+
 			//判断 已发货数量 或者 已收货数量 ,不能大于(订货数量-已收数量)
-			if(actualQuantity.compareTo(orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity()))==1)
+			if(actualQuantity.compareTo(orderItems.getOrderQuantity().subtract(orderItems.getActualQuantity()))>0)
 			{
 				throw  new RuntimeException("操作数量禁止大于订货数量");
 			}

blade-service/store-goods/src/main/java/com/store/goods/controller/AppController.java

@@ -0,0 +1,140 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.store.goods.entity.AppVersion;
+import com.store.goods.service.IAppVersionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.store.goods.entity.App;
+import com.store.goods.vo.AppVO;
+import com.store.goods.service.IAppService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
+
+/**
+ * app应用表 控制器
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app")
+@Api(value = "app应用管理", tags = "app应用表接口")
+public class AppController extends BladeController {
+
+	private final IAppService appService;
+
+	private final IAppVersionService appVersionService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查看app应用", notes = "传入app")
+	public R<App> detail(App app) {
+		App detail = appService.getOne(Condition.getQueryWrapper(app));
+		//获取全部的版本记录
+		List<AppVersion> list = appVersionService.list(new LambdaQueryWrapper<AppVersion>().eq(AppVersion::getAppid, detail.getId()).orderByDesc(AppVersion::getVersionCode));
+		detail.setAppVersionList(list);
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 app应用表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "app应用列表", notes = "传入app")
+	public R<IPage<App>> list(App app, Query query) {
+		try {
+			Page<App> page = new Page<>(query.getCurrent(), query.getSize());
+			IPage<App> pageList = appService.page(page, new LambdaQueryWrapper<App>().orderByDesc(App::getCreateTime));
+			pageList.getRecords().forEach(it -> {
+				//获取最新的版本信息
+				it.setAppVersion(appService.getLatestVersionById(it.getId(), null));
+			});
+			return R.data(pageList);
+		} catch (Exception e) {
+			return R.fail(e.getMessage());
+		}
+	}
+
+	/**
+	 * 分页列表查询更新历史记录
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/versionHistory", method = RequestMethod.GET)
+	public R versionHistory(App app, Query query)
+	{
+		Page<AppVersion> page = new Page<>(query.getCurrent(), query.getSize());
+		IPage<AppVersion> pageList = appVersionService.page(page, new LambdaQueryWrapper<AppVersion>().eq(AppVersion::getAppid, app.getId()).orderByDesc(AppVersion::getVersionCode));
+		return R.data(pageList);
+	}
+
+
+	/**
+	 * 新增 app应用表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增app应用", notes = "传入app")
+	public R save(@Valid @RequestBody App app) {
+		return R.status(appService.save(app));
+	}
+
+	/**
+	 * 修改 app应用表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入app")
+	public R update(@Valid @RequestBody App app) {
+		return R.status(appService.updateById(app));
+	}
+
+	/**
+	 * 删除 app应用表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(appService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}

blade-service/store-goods/src/main/java/com/store/goods/controller/AppVersionController.java

@@ -0,0 +1,167 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.store.goods.service.IAppService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.store.goods.entity.AppVersion;
+import com.store.goods.vo.AppVersionVO;
+import com.store.goods.service.IAppVersionService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * app版本表 控制器
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/appversion")
+@Api(value = "app版本表", tags = "app版本表接口")
+public class AppVersionController extends BladeController {
+
+	private final IAppVersionService appVersionService;
+
+	private final IAppService appService;
+
+
+
+    /**
+	 * 通过包名-获取应用最新版本
+	 * */
+	@GetMapping("/getLatestVersion")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "通过包名-获取应用最新版本", notes = " ")
+	public R<AppVersion> getLatestVersion(@ApiParam(value = "当前app包名,必填", required = true)@RequestParam String packageName,
+										  @RequestParam(required = false, name = "type", defaultValue = "0") Integer type)
+	{
+		AppVersion appVersion = appService.getLatestVersion(packageName, new Integer[]{1}, type);
+		if (appVersion == null) {
+			return R.fail("该应用还未上传");
+		}
+		return R.data(appVersion);
+	}
+
+	/**
+	 * 发布应用/取消版本
+	 *
+	 * @param
+	 * @return
+	 */
+	@PutMapping("/versionRelease")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "发布/取消app应用版本", notes = "传入AppVersion")
+	public R release(@RequestBody  AppVersion appVersion) {
+		Long appVersionId = appVersion.getId();
+		AppVersion version = appVersionService.getById(appVersionId);
+		version.setIsRelease(version.getIsRelease()==0 ? 1 : 0);
+		appVersionService.updateById(version);
+		return R.success("操作成功");
+	}
+
+
+
+	/**
+	 * 详情
+	 *//*
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入appVersion")
+	public R<AppVersion> detail(AppVersion appVersion) {
+		AppVersion detail = appVersionService.getOne(Condition.getQueryWrapper(appVersion));
+		return R.data(detail);
+	}
+
+	*//**
+	 * 分页 app版本表
+	 *//*
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入appVersion")
+	public R<IPage<AppVersion>> list(AppVersion appVersion, Query query) {
+		IPage<AppVersion> pages = appVersionService.page(Condition.getPage(query), Condition.getQueryWrapper(appVersion));
+		return R.data(pages);
+	}
+
+	*//**
+	 * 自定义分页 app版本表
+	 *//*
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入appVersion")
+	public R<IPage<AppVersionVO>> page(AppVersionVO appVersion, Query query) {
+		IPage<AppVersionVO> pages = appVersionService.selectAppVersionPage(Condition.getPage(query), appVersion);
+		return R.data(pages);
+	}
+
+	*//**
+	 * 新增 app版本表
+	 *//*
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入appVersion")
+	public R save(@Valid @RequestBody AppVersion appVersion) {
+		return R.status(appVersionService.save(appVersion));
+	}
+
+	*//**
+	 * 修改 app版本表
+	 *//*
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入appVersion")
+	public R update(@Valid @RequestBody AppVersion appVersion) {
+		return R.status(appVersionService.updateById(appVersion));
+	}
+
+	*//**
+	 * 新增或修改 app版本表
+	 *//*
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入appVersion")
+	public R submit(@Valid @RequestBody AppVersion appVersion) {
+		return R.status(appVersionService.saveOrUpdate(appVersion));
+	}
+
+
+	*//**
+	 * 删除 app版本表
+	 *//*
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(appVersionService.removeByIds(Func.toLongList(ids)));
+	}*/
+
+
+}

blade-service/store-goods/src/main/java/com/store/goods/mapper/AppMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.mapper;
+
+import com.store.goods.entity.App;
+import com.store.goods.vo.AppVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * app应用表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+public interface AppMapper extends BaseMapper<App> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param app
+	 * @return
+	 */
+	List<AppVO> selectAppPage(IPage page, AppVO app);
+
+}

blade-service/store-goods/src/main/java/com/store/goods/mapper/AppMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.store.goods.mapper.AppMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="appResultMap" type="com.store.goods.entity.App">
+        <id column="id" property="id"/>
+        <result column="app_name" property="appName"/>
+        <result column="logo" property="logo"/>
+        <result column="mini_logo" property="miniLogo"/>
+        <result column="type" property="type"/>
+        <result column="package_name" property="packageName"/>
+        <result column="url_schema" property="urlSchema"/>
+        <result column="app_store_id" property="appStoreId"/>
+        <result column="bundle_id" property="bundleId"/>
+        <result column="app_desc" property="appDesc"/>
+    </resultMap>
+
+
+    <select id="selectAppPage" resultMap="appResultMap">
+        select * from blade_app where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/store-goods/src/main/java/com/store/goods/mapper/AppVersionMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.mapper;
+
+import com.store.goods.entity.AppVersion;
+import com.store.goods.vo.AppVersionVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * app版本表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param appVersion
+	 * @return
+	 */
+	List<AppVersionVO> selectAppVersionPage(IPage page, AppVersionVO appVersion);
+
+}

blade-service/store-goods/src/main/java/com/store/goods/mapper/AppVersionMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.store.goods.mapper.AppVersionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="appVersionResultMap" type="com.store.goods.entity.AppVersion">
+        <id column="id" property="id"/>
+        <result column="appId" property="appid"/>
+        <result column="version_name" property="versionName"/>
+        <result column="version_code" property="versionCode"/>
+        <result column="version_desc" property="versionDesc"/>
+        <result column="download_url" property="downloadUrl"/>
+        <result column="is_release" property="isRelease"/>
+    </resultMap>
+
+
+    <select id="selectAppVersionPage" resultMap="appVersionResultMap">
+        select * from blade_app_version where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/store-goods/src/main/java/com/store/goods/service/IAppService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.service;
+
+import com.store.goods.entity.App;
+import com.store.goods.entity.AppVersion;
+import com.store.goods.vo.AppVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * app应用表 服务类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+public interface IAppService extends IService<App> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param app
+	 * @return
+	 */
+	IPage<AppVO> selectAppPage(IPage<AppVO> page, AppVO app);
+
+	/**
+	 * 获取最新app版本信息
+	 * */
+	AppVersion getLatestVersionById(Long id, Integer[] release);
+
+	/**
+	 * 通过包名获取最新版本信息
+	 * */
+	AppVersion getLatestVersion(String packageName,Integer[] isRelease,Integer type);
+
+}

blade-service/store-goods/src/main/java/com/store/goods/service/IAppVersionService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.service;
+
+import com.store.goods.entity.AppVersion;
+import com.store.goods.vo.AppVersionVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * app版本表 服务类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+public interface IAppVersionService extends IService<AppVersion> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param appVersion
+	 * @return
+	 */
+	IPage<AppVersionVO> selectAppVersionPage(IPage<AppVersionVO> page, AppVersionVO appVersion);
+
+}

blade-service/store-goods/src/main/java/com/store/goods/service/impl/AppServiceImpl.java

@@ -0,0 +1,79 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.store.goods.entity.App;
+import com.store.goods.entity.AppVersion;
+import com.store.goods.mapper.AppVersionMapper;
+import com.store.goods.vo.AppVO;
+import com.store.goods.mapper.AppMapper;
+import com.store.goods.service.IAppService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * app应用表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@Service
+public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppService
+{
+	@Autowired
+	private AppVersionMapper appVersionMapper;
+
+	@Override
+	public IPage<AppVO> selectAppPage(IPage<AppVO> page, AppVO app) {
+		return page.setRecords(baseMapper.selectAppPage(page, app));
+	}
+
+	@Override
+	public AppVersion getLatestVersionById(Long id, Integer[] release)
+	{
+		//查询此app应用下最新的版本信息
+		try {
+			LambdaQueryWrapper<AppVersion> wrapper = new LambdaQueryWrapper<AppVersion>()
+				.eq(AppVersion::getAppid, id)
+				.in(release != null, AppVersion::getIsRelease, release)
+				.orderByDesc(AppVersion::getVersionCode).last("limit 1");
+			return appVersionMapper.selectOne(wrapper);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new SecurityException("应用不存在");
+		}
+	}
+
+	@Override
+	public AppVersion getLatestVersion(String packageName, Integer[] isRelease, Integer type)
+	{
+		try
+		{
+			App app = baseMapper.selectOne(new LambdaQueryWrapper<App>().eq(type != null, App::getType, type).eq(App::getPackageName,packageName));
+			return getLatestVersionById(app.getId(), isRelease);
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			throw new SecurityException("应用不存在");
+		}
+	}
+
+}

blade-service/store-goods/src/main/java/com/store/goods/service/impl/AppVersionServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.store.goods.service.impl;
+
+import com.store.goods.entity.AppVersion;
+import com.store.goods.vo.AppVersionVO;
+import com.store.goods.mapper.AppVersionMapper;
+import com.store.goods.service.IAppVersionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * app版本表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-12-13
+ */
+@Service
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements IAppVersionService {
+
+	@Override
+	public IPage<AppVersionVO> selectAppVersionPage(IPage<AppVersionVO> page, AppVersionVO appVersion) {
+		return page.setRecords(baseMapper.selectAppVersionPage(page, appVersion));
+	}
+
+}

blade-service/trade-finance/pom.xml

@@ -87,6 +87,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-check-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/SettlementServiceImpl.java

@@ -20,6 +20,10 @@ package com.trade.finance.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.feign.ICheckClient;
 import com.trade.finance.dto.SettlementDTO;
 import com.trade.finance.entity.Acc;
 import com.trade.finance.entity.Files;
@@ -32,7 +36,6 @@ import com.trade.finance.service.ISettlementService;
 import com.trade.finance.vo.SettlementVO;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
-import org.checkerframework.checker.units.qual.A;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.ISerialClient;
@@ -70,6 +73,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
     private  IOrderDescClient orderDescClient;
 
+    private ICheckClient iCheckClient;
+
 
 
 	@Override
@@ -235,35 +240,30 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@Transactional
 	public void check(Settlement settlement)
 	{
-		//目前清核直接通过
-		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
-		itemsLambdaQueryWrapper.eq(Items::getPid,settlement.getId());
-		List<Items> items = itemsMapper.selectList(itemsLambdaQueryWrapper);
-		if(!CollectionUtils.isEmpty(items))
-		{
-			//有几个申请明细 就生成几个账单明细
-			items.forEach(e->{
-				  Acc acc=new Acc();
-                  BeanUtils.copyProperties(e,acc);
-				  acc.setId(null);
-				  acc.setSrcBillNo(e.getBillNo());
-				  acc.setAccSysNo(e.getSrcOrderno());
-				  acc.setSrcParentId(e.getSrcParentId());
-				  acc.setBillType(settlement.getBillType());
-				  acc.setCreateTime(new Date());
-				  acc.setStatus(0);
-				  acc.setCreateUser(AuthUtil.getUserId());
-				  acc.setCostType(e.getCostType());
-				  accMapper.insert(acc);
-
-				  //绑定accId,从申请表传递给结算表,后续结算时操作账单表的结算金额
-				  e.setAccId(acc.getId());
-				  itemsMapper.updateById(e);
-
-			});
-		}
-		settlement.setCheckStatus("请核成功");
-		baseMapper.updateById(settlement);
+          //判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过
+		  AuditPathsActs pathsActs = iCheckClient.getActsByActId(1, "check_status");
+		  //没开启审批流直接走 通过流程
+          if(pathsActs==null || pathsActs.getIsEnable()==2)
+          {
+             this.passCheck(settlement.getId());
+		  }
+          //如果开启审批流了, 就直接创建审批业务
+          else
+		  {
+		  	  //获取审批级次
+			  List<AuditPathsLevels> auditPathsLevels = iCheckClient.listLevelsByActId(1, "check_status");
+
+			  AuditProecessDTO auditProecessDTO=new AuditProecessDTO();
+			  auditProecessDTO.setPathsLevelsList(auditPathsLevels);
+			  auditProecessDTO.setActId(1);
+			  auditProecessDTO.setBillId(settlement.getId());
+			  auditProecessDTO.setBillNo(settlement.getSrcOrderno());
+			  auditProecessDTO.setSendUserId(AuthUtil.getUserId());
+			  auditProecessDTO.setSendName(AuthUtil.getUserName());
+			  auditProecessDTO.setSendTime(new Date());
+			  auditProecessDTO.setSendMsg(settlement.getRemark());
+			  iCheckClient.createFinanceProcess(auditProecessDTO);
+		  }
 	}
 
 	@Override
@@ -364,4 +364,49 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		return settlementDTO;
 	}
 
+	//审核通过方法
+	public  void  passCheck(Long settlementId)
+	{
+		Settlement settlement = baseMapper.selectById(settlementId);
+		if(settlement ==null)
+		{
+			throw new SecurityException("数据错误,请确认后提交");
+		}
+		//目前清核直接通过
+		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		itemsLambdaQueryWrapper.eq(Items::getPid,settlement.getId());
+		List<Items> items = itemsMapper.selectList(itemsLambdaQueryWrapper);
+		if(!CollectionUtils.isEmpty(items))
+		{
+			//有几个申请明细 就生成几个账单明细
+			items.forEach(e->{
+				Acc acc=new Acc();
+				BeanUtils.copyProperties(e,acc);
+				acc.setId(null);
+				acc.setSrcBillNo(e.getBillNo());
+				acc.setAccSysNo(e.getSrcOrderno());
+				acc.setSrcParentId(e.getSrcParentId());
+				acc.setBillType(settlement.getBillType());
+				acc.setCreateTime(new Date());
+				acc.setStatus(0);
+				acc.setCreateUser(AuthUtil.getUserId());
+				acc.setCostType(e.getCostType());
+				accMapper.insert(acc);
+
+				//绑定accId,从申请表传递给结算表,后续结算时操作账单表的结算金额
+				e.setAccId(acc.getId());
+				itemsMapper.updateById(e);
+
+			});
+		}
+		settlement.setCheckStatus("请核成功");
+		baseMapper.updateById(settlement);
+	}
+	//审核取消方法
+	public void passCancel(Long settlementId)
+	{
+
+	}
+
+
 }