bug修复

share-front/src/main/java/share/web/controller/system/SOrderController.java

@@ -43,11 +43,8 @@ public class SOrderController extends BaseController
 {
     @Autowired
     private ISOrderService sOrderService;
-
     @Autowired
     private RedisUtil redisUtil;
-    @Autowired
-    private DeviceLogService deviceLogService;
 
     /**
      * 查询订单列表

share-front/src/main/java/share/web/controller/system/SStoreController.java

@@ -61,8 +61,8 @@ public class SStoreController extends BaseController
      * 查询门店列表
      */
     @ApiOperation(value = "按距离排序查询门店列表")
-    @RequestMapping(value = "/listVo", method = RequestMethod.POST)
-    public R<List<SStoreVo>> listVo(@RequestBody SStoreRequest request)
+    @RequestMapping(value = "/listVo", method = RequestMethod.GET)
+    public R<List<SStoreVo>> listVo( SStoreRequest request)
     {
         startPage();
         return R.ok(sStoreService.listVo(request));

share-system/src/main/java/share/system/domain/SCleanRecords.java

@@ -35,8 +35,8 @@ public class SCleanRecords extends BaseEntity
     private Long consumerId;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date startDate;
 
     /** 保洁前照片 */
@@ -44,8 +44,8 @@ public class SCleanRecords extends BaseEntity
     private String startImage;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
 
     /** 保洁后照片 */

share-system/src/main/java/share/system/request/SStoreRequest.java

@@ -52,4 +52,6 @@ public class SStoreRequest implements Serializable {
     @ApiModelProperty(value = "门店类型 1:标准店 2: 形象店 3:旗舰店")
     private String storeType;
 
+
+
 }

share-system/src/main/java/share/system/service/impl/SCleanRecordsServiceImpl.java

@@ -186,6 +186,9 @@ public class SCleanRecordsServiceImpl implements ISCleanRecordsService
         queryWrapper.eq(SCleanRecords::getStatus,0);
         queryWrapper.ge(SCleanRecords::getCreateTime, DateUtil.offsetMinute(DateUtil.date(), -30));
         List<SCleanRecords> list = sCleanRecordsMapper.selectList(queryWrapper);
+        if (list.size() == 0) {
+            return Boolean.FALSE;
+        }
         for (SCleanRecords sCleanRecords : list) {
             sCleanRecords.setStatus(2);
             sCleanRecords.setStartDate(DateUtil.date());

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -148,6 +148,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     break;
             }
         }
+        queryWrapper.orderByDesc(true, SOrder::getCreateTime);
         List<SOrder> orders = baseMapper.selectList(queryWrapper);
         return convertDosToVos(orders);
     }