fix：定时任务

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -495,11 +495,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
     @Override
     public void confirmReceiveOrder(Long orderId) {
-        UmsMember member = memberService.getCurrentMember();
+        // UmsMember member = memberService.getCurrentMember();
         OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
-        if (!member.getId().equals(order.getMemberId())) {
-            Asserts.fail("不能确认他人订单！");
-        }
+        // if (!member.getId().equals(order.getMemberId())) {
+        //     Asserts.fail("不能确认他人订单！");
+        // }
         if (order.getStatus() != 2) {
             Asserts.fail("该订单还未发货！");
         }else if (order.getStatus() == 3) {
@@ -805,7 +805,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         OmsOrderExample orderExample = new OmsOrderExample();
         orderExample.createCriteria().andStatusEqualTo(3).andDeleteStatusEqualTo(0).andConfirmStatusEqualTo(1)
                 .andAfterSaleEqualTo(0)
-                    .andDeliveryTimeLessThanOrEqualTo(Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()));
+                .andReceiverCityIsNotNull()
+                    .andReceiveTimeLessThan(Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()));
 
         List<OmsOrder> omsOrders = orderMapper.selectByExample(orderExample);
         if (CollectionUtils.isEmpty(omsOrders)) {
@@ -824,15 +825,14 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
     private void FinishReceiveOrder(Long orderId) {
 
-        UmsMember member = memberService.getCurrentMember();
+        // UmsMember member = memberService.getCurrentMember();
         OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
-        if (!member.getId().equals(order.getMemberId())) {
-            Asserts.fail("不能确认他人订单！");
-        }
+        // if (!member.getId().equals(order.getMemberId())) {
+        //     Asserts.fail("不能确认他人订单！");
+        // }
          if (order.getStatus() != 3) {
             Asserts.fail("未确认收货！");
         }
-        order.setStatus(4);
         order.setAfterSale(1);
         orderMapper.updateByPrimaryKey(order);