no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -387,10 +387,13 @@ public class CommonLogic {
         final List<OrderPickTimeConfig> list = orderPickTimeConfigService.lambdaQuery()
                 .eq(OrderPickTimeConfig::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
                 .eq(OrderPickTimeConfig::getStorageId, storageId)
+                .orderByDesc(OrderPickTimeConfig::getId)
                 .list();
 
 
 
+
+
         return list;
     }
 }

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

@@ -189,8 +189,8 @@ public class OrderLogic {
                 throw new RemoteServiceException("仓储未配置此时间段");
             }
 
-            if (DateUtil.date().getTime() > orderBuyBean.getAppointmentPickStartTime().getTime()) {
-                throw new RemoteServiceException("提交的时间不能大于选择的自提开始时间");
+            if (DateUtil.date().getTime() > orderBuyBean.getAppointmentPickEndTime().getTime()) {
+                throw new RemoteServiceException("提交的时间不能大于选择的自提结束时间");
             }
 
             if (pickTimeConfig.getLimitNum() > 0) {
@@ -463,7 +463,7 @@ public class OrderLogic {
                     .setSpecsName(orderDetail.getGoodsSpecValue())
                     .setUnit(orderDetail.getGoodsMaterialUnit())
                     .setPrice(orderDetail.getPrice())
-                    .setSdate(orderInfo.getExamineTime())
+                    .setSdate(orderInfo.getCreateTime())
                     .setChangeQty(orderDetail.getNum())
                     .setRefBillNo(orderInfo.getOrderId())
                     .setRefBillType(refBillType)

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -40,14 +40,14 @@
     </select>
     <select id="countDeliverOrder" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">
         SELECT
-            SUM(IF(a.order_status = 'DPS', 1, 0)) AS 'dps',
+            SUM(IF(a.order_status = 'PSDQ', 1, 0)) AS 'dps',
             SUM(IF(a.order_status = 'PSZ', 1, 0)) AS 'psz',
             SUM(IF(a.order_status = 'OVER', 1, 0)) AS 'over'
         FROM
             order_info a
         WHERE
             a.delivery_user_id = #{userId}
-          AND a.order_status IN ('DPS', 'PSZ', 'OVER')
+          AND a.order_status IN ('PSDQ', 'PSZ', 'OVER')
     </select>
 
 </mapper>

mall-server-api/src/main/java/com/gree/mall/manager/bean/member/UserCompanyDeliveryVO.java

@@ -22,7 +22,7 @@ public class UserCompanyDeliveryVO {
     @ZfireField(hide = true)
     private String userId;
 
-    @ApiModelProperty(value = "师傅id")
+    @ApiModelProperty(value = "仓储id")
     @ZfireField(tbName = "c", hide = true)
     private String storageId;
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -2,6 +2,7 @@ package com.gree.mall.manager.logic.order;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
@@ -910,10 +911,12 @@ public class OrderLogic {
         if(!StringUtils.equals(orderInfo.getOrderStatus(),OrderStatusEnum.DQR.toString())){
             throw new RemoteServiceException("非待确认订单不可操作");
         }
+        final DateTime curDate = DateUtil.date();
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        orderInfo.setExamineTime(DateUtil.date());
+        orderInfo.setExamineTime(curDate);
         orderInfo.setExamineStatus(ExamineStatusEnum.OK.getKey());
         orderInfo.setExamineBy(adminUser.getNickName());
+        orderInfo.setCheckById(adminUser.getAdminUserId());
         orderInfo.setOrderStatus(OrderStatusEnum.DJH.toString());
         orderInfo.updateById();