陆运修改

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

blade-service/blade-land/src/main/java/org/springblade/land/controller/OrderIndexController.java

@@ -187,7 +187,7 @@ public class OrderIndexController extends BladeController {
 		long all = itemList.size();
 
 		// 未运行
-		long inactive = itemList.stream().filter(item -> item.getStatus() == 0 && item.getStatus() == 1).count();
+		long inactive = itemList.stream().filter(item -> item.getStatus() == 0 || item.getStatus() == 1).count();
 		mapTemp = new HashMap<>();
 		mapTemp.put("name", "未运行");
 		mapTemp.put("value", inactive);

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -76,6 +76,7 @@
             <if test="acct.status == 3">and t2.status = 4</if>
         </where>
         group by t1.id, t2.plate_no
+        order by t2.arrival_time desc
     </select>
 
 </mapper>

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

@@ -16,13 +16,19 @@
  */
 package org.springblade.land.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.land.entity.Order;
 import org.springblade.land.entity.OrderAddress;
 import org.springblade.land.mapper.OrderAddressMapper;
+import org.springblade.land.mapper.OrderMapper;
 import org.springblade.land.service.IOrderAddressService;
 import org.springblade.land.vo.OrderAddressVO;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -33,20 +39,58 @@ import java.util.List;
  * @since 2022-03-07
  */
 @Service
+@AllArgsConstructor
 public class OrderAddressServiceImpl extends ServiceImpl<OrderAddressMapper, OrderAddress> implements IOrderAddressService {
 
+	private final OrderMapper orderMapper;
+
 	@Override
 	public IPage<OrderAddressVO> selectOrderAddressPage(IPage<OrderAddressVO> page, OrderAddressVO orderAddress) {
 		return page.setRecords(baseMapper.selectOrderAddressPage(page, orderAddress));
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public boolean removeOrderAddress(List<Long> idList) {
 		idList.forEach(id -> {
+			OrderAddress temp = baseMapper.selectById(id);
+
 			OrderAddress orderAddress = new OrderAddress();
 			orderAddress.setId(id);
 			orderAddress.setIsDeleted(1);
 			baseMapper.updateById(orderAddress);
+
+			List<OrderAddress> addressList = baseMapper.selectList(new LambdaQueryWrapper<OrderAddress>()
+				.eq(OrderAddress::getOrderId, temp.getOrderId())
+				.eq(OrderAddress::getIsDeleted, 0)
+			);
+
+			int i = 1;
+			StringBuilder addressDetail = new StringBuilder();
+			for (OrderAddress address : addressList) {
+				if (StringUtil.isNotBlank(address.getCorpName())) {
+					addressDetail.append(i).append(".").append(address.getCorpName()).append("(");
+
+					if (StringUtil.isNotBlank(address.getContacts())) {
+						addressDetail.append(address.getContacts());
+					}
+					if (StringUtil.isNotBlank(address.getTel())) {
+						addressDetail.append(" ").append(address.getTel());
+					}
+					if (StringUtil.isNotBlank(address.getAddress())) {
+						addressDetail.append(") ").append(address.getAddress()).append("\n");
+					} else {
+						addressDetail.append(") ").append("\n");
+					}
+
+					i ++;
+				}
+			}
+
+			Order order = new Order();
+			order.setId(temp.getOrderId());
+			order.setAddressDetail(addressDetail.toString());
+			orderMapper.updateById(order);
 		});
 		return true;
 	}

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

@@ -143,7 +143,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		long all = itemList.size();
 		long one = itemList.stream().filter(item -> item.getStatus() == 1).count();
 		long two = itemList.stream().filter(item -> item.getStatus() == 2).count();
-		long three = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 2 && item.getStatus() != 3).count();
+		long three = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 2 && item.getStatus() != 4).count();
 		long four = itemList.stream().filter(item -> item.getStatus() == 4).count();
 
 		Map<String, Object> data = new HashMap<>();

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

@@ -764,6 +764,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	private void dealExtraInfo(Order order, StringBuilder addressDetail) {
+		int i = 1;
 		for (OrderAddress address : order.getOrderAddressList()) {
 			if (ObjectUtil.isEmpty(address.getId())) {
 				address.setOrderId(order.getId());
@@ -778,7 +779,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 
 			if (StringUtil.isNotBlank(address.getCorpName())) {
-				addressDetail.append(address.getSort()).append(".").append(address.getCorpName()).append("(");
+				addressDetail.append(i).append(".").append(address.getCorpName()).append("(");
 
 				if (StringUtil.isNotBlank(address.getContacts())) {
 					addressDetail.append(address.getContacts());
@@ -791,6 +792,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				} else {
 					addressDetail.append(") ").append("\n");
 				}
+
+				i ++;
 			}
 		}