no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/OrderDeliverLogic.java

@@ -1,6 +1,8 @@
 package com.gree.mall.miniapp.logic.order;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.miniapp.bean.order.OrderDeliverBean;
 import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
@@ -30,17 +32,21 @@ public class OrderDeliverLogic {
 
     public IPage<OrderInfo> orderList(String orderStatus, Integer pageNum, Integer pageSize) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        return orderInfoService.lambdaQuery()
+        LambdaQueryChainWrapper<OrderInfo> wrapper = orderInfoService.lambdaQuery()
                 .eq(OrderInfo::getDeliveryUserId, currentCompanyWechat.getUserId())
-                .eq(StringUtils.isNotBlank(orderStatus), OrderInfo::getOrderStatus, orderStatus)
-                .page(new Page<>(pageNum, pageSize));
+                .eq(StringUtils.isNotBlank(orderStatus), OrderInfo::getOrderStatus, orderStatus);
+
+        if (StringUtils.isNotBlank(orderStatus) && !orderStatus.equals(OrderStatusEnum.OVER.toString())) {
+            wrapper.orderByAsc(OrderInfo::getAppointmentPickStartTime);
+        }
+
+        return wrapper.page(new Page<>(pageNum, pageSize));
     }
 
     public CountOrderStatusBean countOrderStatus() {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        CountOrderStatusBean countOrderStatusBean3 = orderBaseCMapper.countDeliverOrder(currentCompanyWechat.getUserId());
 
-        return countOrderStatusBean3;
+        return orderBaseCMapper.countDeliverOrder(currentCompanyWechat.getUserId());
     }
 
     public void finish(String orderId, String url, String finishRemark, String lng, String lat) {
@@ -54,6 +60,7 @@ public class OrderDeliverLogic {
         orderInfoService.lambdaUpdate()
                 .set(OrderInfo::getOrderStatus, OrderStatusEnum.OVER.toString())
                 .set(OrderInfo::getLastOrderStatus, OrderStatusEnum.PSZ.toString())
+                .set(OrderInfo::getOverTime, DateUtil.date())
                 .eq(OrderInfo::getOrderId, orderId)
                 .eq(OrderInfo::getDeliveryUserId, currentCompanyWechat.getUserId())
                 .update();

mall-server-api/src/main/java/com/gree/mall/manager/controller/common/OrderPickTimeConfigController.java

@@ -45,7 +45,7 @@ public class OrderPickTimeConfigController {
 
     @ZfireList
     @PostMapping("/list2")
-    @ApiOperation(value = "仓储时间配置-列表")
+    @ApiOperation(value = "作废 仓储时间配置-列表")
     public ResponseHelper<Page<OrderPickTimeConfigVO>> list2(
             @RequestBody ZfireParamBean zfireParamBean
     ) throws RemoteServiceException {
@@ -55,7 +55,7 @@ public class OrderPickTimeConfigController {
     }
 
     @PostMapping("/list2/export")
-    @ApiOperation("仓储时间配置-导出")
+    @ApiOperation("作废 仓储时间配置-导出")
     public void listExport(
             @RequestBody ZfireParamBean zfireParamBean,
             HttpServletRequest request,