禅道修改

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

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

@@ -249,6 +249,9 @@ public class Order implements Serializable {
 	private Integer kind;
 
 	@TableField(exist = false)
+	private String createUserName;
+
+	@TableField(exist = false)
 	private String corpName;
 
 	@TableField(exist = false)

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/NcpCheckServiceImpl.java

@@ -110,7 +110,7 @@ public class NcpCheckServiceImpl extends ServiceImpl<NcpCheckMapper, NcpCheck> i
 
 	@Override
 	public String phone(NcpCheck ncpCheck) {
-		String token = CacheUtil.get(LandConst.LAND_CACHE, WxConst.WECHAT_TOKEN, ncpCheck.getTenantId(), String.class);
+		String token = CacheUtil.get(LandConst.LAND_CACHE, WxConst.WECHAT_TOKEN, ncpCheck.getTenantId(), String.class, false);
 		if (StringUtil.isBlank(token)) {
 			throw new RuntimeException("获取请求token失败");
 		}

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -643,7 +643,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			.eq(OrderItem::getKind, 2)
 			.eq(OrderItem::getIsDeleted, 0)
 			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
-			.orderByDesc(OrderItem::getUpdateTime);
+			.orderByDesc(OrderItem::getArrivalTime);
 		return itemQueryWrapper;
 	}
 

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

@@ -227,13 +227,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime())
 			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), Order::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime())
 			.eq(Order::getIsDeleted, 0)
-			.eq(Order::getTenantId, AuthUtil.getTenantId());
+			.eq(Order::getTenantId, AuthUtil.getTenantId())
+			.orderByDesc(Order::getArrivalTime);
 
-		if (order.getKind() == 1) {
-			orderQueryWrapper.orderByDesc(Order::getCreateTime);
-		} else if (order.getKind() == 2) {
+		if (order.getKind() == 2) {
 			orderQueryWrapper.ne(Order::getStatus, 0);
-			orderQueryWrapper.orderByDesc(Order::getUpdateTime);
 		}
 
 		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
@@ -246,6 +244,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 
+			if (!ObjectUtil.isEmpty(record.getCreateUser())) {
+				R<User> user = userClient.userInfoById(record.getCreateUser());
+				if (user.isSuccess() && user.getData() != null) {
+					record.setCreateUserName(user.getData().getRealName());
+				}
+			}
 			if (!ObjectUtil.isEmpty(record.getSalesman())) {
 				R<User> user = userClient.userInfoById(record.getSalesman());
 				if (user.isSuccess() && user.getData() != null) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -40,6 +40,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.deliver.goods.entity.Delivery;
+import org.springblade.deliver.goods.entity.DeliveryItems;
 import org.springblade.deliver.goods.feign.IDeliveryClient;
 import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.finance.vojo.Acc;
@@ -240,6 +241,16 @@ public class OrderController extends BladeController {
 		if (CollectionUtils.isNotEmpty(financeAcc)) {
 			throw new SecurityException("销售单已生成账单不能删除");
 		}
+
+		int itemCount = orderItemsService.count(new LambdaQueryWrapper<OrderItems>()
+			.eq(OrderItems::getPid, order.getId())
+			.eq(OrderItems::getTenantId, AuthUtil.getTenantId())
+			.eq(OrderItems::getIsDeleted, 0)
+		);
+		if (itemCount > 0) {
+			throw new SecurityException("存在明细禁止删除");
+		}
+
 		order.setIsDeleted(1);
 		orderService.updateById(order);
 		orderItemsService.updateByPid(order.getId());