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

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/SalesPolicy.java

@@ -18,16 +18,15 @@ package org.springblade.mocha.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 /**
  * 销售政策表实体类
  *
@@ -42,132 +41,135 @@ public class SalesPolicy implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 编码
-	*/
-		@ApiModelProperty(value = "编码")
-		private String code;
-	/**
-	* 品牌
-	*/
-		@ApiModelProperty(value = "品牌")
-		private String brand;
-	/**
-	* 产品分类
-	*/
-		@ApiModelProperty(value = "产品分类")
-		private String productCategory;
-	/**
-	* 政策名称
-	*/
-		@ApiModelProperty(value = "政策名称")
-		private String cname;
-	/**
-	* 有效期开始时间
-	*/
-		@ApiModelProperty(value = "有效期开始时间")
-		private Date startTime;
-	/**
-	* 有效期结束时间
-	*/
-		@ApiModelProperty(value = "有效期结束时间")
-		private Date endTime;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 编码
+	 */
+	@ApiModelProperty(value = "编码")
+	private String code;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+	/**
+	 * 产品分类
+	 */
+	@ApiModelProperty(value = "产品分类")
+	private String productCategory;
+	/**
+	 * 政策名称
+	 */
+	@ApiModelProperty(value = "政策名称")
+	private String cname;
+	/**
+	 * 有效期开始时间
+	 */
+	@ApiModelProperty(value = "有效期开始时间")
+	private Date startTime;
+	/**
+	 * 有效期结束时间
+	 */
+	@ApiModelProperty(value = "有效期结束时间")
+	private Date endTime;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
 	/**
 	 * 租户id
 	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
+	/**
+	 * 版本
+	 */
+	@ApiModelProperty(value = "版本")
+	private String version;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private Long updateUser;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 政策类型
+	 */
+	@ApiModelProperty(value = "政策类型")
+	private String type;
+	/**
+	 * 状态（0 正常 1停用）
+	 */
+	@ApiModelProperty(value = "状态（0 正常 1停用）")
+	private Integer status;
+	/**
+	 * 是否已删除（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	private Integer isDeleted;
 	/**
 	 * 代理商
 	 */
-		@ApiModelProperty(value = "代理商")
-		private String corps;
+	@ApiModelProperty(value = "代理商")
+	private String corps;
 	/**
 	 * 创建人中文名
 	 */
-		@ApiModelProperty(value = "创建人中文名")
-		@TableField(exist = false)
-		private String createUserName;
+	@ApiModelProperty(value = "创建人中文名")
+	@TableField(exist = false)
+	private String createUserName;
 	/**
 	 * 修改人中文名
 	 */
-		@ApiModelProperty(value = "修改人中文名")
-		@TableField(exist = false)
-		private String updateUserName;
+	@ApiModelProperty(value = "修改人中文名")
+	@TableField(exist = false)
+	private String updateUserName;
 	/**
 	 * 特价销售政策明细信息
 	 */
-		@ApiModelProperty(value = "特价销售政策明细信息")
-		@TableField(exist = false)
-		private List<SalesPolicyItem> specialItemList;
+	@ApiModelProperty(value = "特价销售政策明细信息")
+	@TableField(exist = false)
+	private List<SalesPolicyItem> specialItemList;
 	/**
 	 * 买赠销售政策明细信息
 	 */
-		@ApiModelProperty(value = "买赠政策明细信息")
-		@TableField(exist = false)
-		private List<SalesPolicyItem> presentItemList;
+	@ApiModelProperty(value = "买赠政策明细信息")
+	@TableField(exist = false)
+	private List<SalesPolicyItem> presentItemList;
 	/**
 	 * 代理商回显
 	 */
-		@ApiModelProperty(value = "代理商回显")
-		@TableField(exist = false)
-		private List<Map<String,Object>> corpNameList;
+	@ApiModelProperty(value = "代理商回显")
+	@TableField(exist = false)
+	private List<Map<String, Object>> corpNameList;
 	/**
 	 * 当前时间
 	 */
-		@ApiModelProperty(value = "当前时间")
-		@TableField(exist = false)
-		private String newTime;
-
-
+	@ApiModelProperty(value = "当前时间")
+	@TableField(exist = false)
+	private String newTime;
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -393,6 +393,11 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "状态（0 正常 1停用）")
 	private Integer status;
 	/**
+	 * 确认状态
+	 */
+	@ApiModelProperty(value = "确认状态")
+	private Integer confirmStatus;
+	/**
 	 * 是否已删除（0 否 1是）
 	 */
 	//@TableLogic

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -238,6 +238,11 @@ public class OrderItems implements Serializable {
 	@ApiModelProperty(value = "状态（0 正常 1停用）")
 	private Integer status;
 	/**
+	 * 确认状态
+	 */
+	@ApiModelProperty(value = "确认状态")
+	private Integer confirmStatus;
+	/**
 	 * 是否已删除（0 否 1是）
 	 */
 	//@TableLogic

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/mapper/SalesPolicyMapper.xml

@@ -71,7 +71,7 @@
         SELECT
         dept.id,
         0 AS parent_id,
-        dept.cname AS title,
+        concat(dept.cname, '（', ifnull(dept.type, 'NULL'), '）') AS title,
         dept.id AS "value",
         dept.id AS "key",
         0 AS "has_children"

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -847,9 +847,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		baseMapper.updateById(order);
 		// ===========================end 审核通过修改销售订单信息==========================
 
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		if (OrderTypeEnum.DOMESTIC.getType().equals(order.getTradeType())) {
 			// 销售的逻辑
-			if ("XS".equals(order.getBillType())) {
+			if (OrderTypeEnum.SALES.getType().equals(order.getBillType())) {
 				// ===========================Start 审核通过锁定库存=============================
 				//获取此销售订单下,所有明细的库存
 				/*LambdaQueryWrapper<OrderItems> orderItemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -967,6 +967,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 			}
 
+		} else if (OrderTypeEnum.DEALER.getType().equals(order.getTradeType())) {
+			if (OrderTypeEnum.SALES.getType().equals(order.getBillType())) {
+				this.paymentApply(order,"收费","销售");
+			}
 		}
 
 
@@ -1206,11 +1210,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		List<OrderItems> list = orderItemsService.list(queryWrapper);
 		// 先判断订单状态 0 录入 1 审批 2 审批中 3 审批完成/确认订单
 		if (order.getDealer() == 1) {
-			if (selectById.getStatus() != 0) {
+			if (selectById.getConfirmStatus() != 0) {
 				throw new RuntimeException("当前单据状态不支持确认订单");
 			}
 		} else if (order.getDealer() == 2) {
-			if (selectById.getStatus() != 3) {
+			if (selectById.getConfirmStatus() != 3) {
 				throw new RuntimeException("当前单据状态不支持取消订单");
 			}
 		}
@@ -1244,12 +1248,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				data.setBalanceAmount(data.getInAmount().subtract(data.getOutAmount()));
 				stockGoodsClient.updateStock(data);
 				// 更改明细状态
-				item.setStatus(3);
+				item.setConfirmStatus(3);
 				item.setUpdateTime(new Date());
 				item.setUpdateUser(SecureUtil.getUserId());
 				orderItemsService.updateById(item);
 			}
-			selectById.setStatus(3);
+			selectById.setConfirmStatus(3);
 			baseMapper.updateById(selectById);
 		} else if (order.getDealer() == 2 && CollectionUtils.isNotEmpty(list)) {
 			// 查询库存
@@ -1276,12 +1280,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				data.setBalanceAmount(data.getInAmount().subtract(data.getOutAmount()));
 				stockGoodsClient.updateStock(data);
 				// 更改明细状态
-				item.setStatus(0);
+				item.setConfirmStatus(0);
 				item.setUpdateTime(new Date());
 				item.setUpdateUser(SecureUtil.getUserId());
 				orderItemsService.updateById(item);
 			}
-			selectById.setStatus(0);
+			selectById.setConfirmStatus(0);
 			baseMapper.updateById(selectById);
 		}
 		// 库存充足更改明细状态