禅道修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java

@@ -89,5 +89,10 @@ public class UserVO extends User {
 	@ApiModelProperty(value = "租户类型")
 	private Integer billType;
 
+	/**
+	 * 角色名
+	 */
+	private String roleAlias;
+
 	private String source;
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -509,6 +509,18 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			delivery.setUpdateUser(SecureUtil.getUserId());
 			delivery.setUpdateTime(new Date());
 			baseMapper.updateById(delivery);
+
+			if (DeliveryEnum.TAKE.getType().equals(delivery.getDeliveryType())) {
+				Order order = new Order();
+				order.setId(delivery.getOrgId());
+				order.setOrderStatus("已完成");
+				orderDescClient.updateOrder(order);
+			} else if (DeliveryEnum.REVOCATION.getType().equals(delivery.getDeliveryType())) {
+				Order order = new Order();
+				order.setId(delivery.getOrgId());
+				order.setOrderStatus("待发货");
+				orderDescClient.updateOrder(order);
+			}
 		}
 		//保存发货明细信息
 		if (CollectionUtils.isNotEmpty(delivery.getDeliveryItemsList())) {

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -112,7 +112,10 @@ public class UserController {
 			.eq(User::getIsDeleted, 0);
 
 		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			R<Long> roleR = sysClient.getRoleByAlias("分管调度");
+			userVO.setRoleAlias("分管调度");
+		}
+		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
+			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());
 			if (!roleR.isSuccess()) {
 				return R.data(new ArrayList<>());
 			}