merge

clx-performance-web/src/main/java/com/clx/performance/config/ConfiguredOpenProperties.java

@@ -15,4 +15,5 @@ public class ConfiguredOpenProperties {
     private String appKey;
     private String smsAccessKey;
     private String carrierInternalMessageAccessKey;
+    private String accessKey;
 }

clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -723,15 +723,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.countLoadByOrderGoodsNo(orderGoodsNo);
     }
 
-    @Override
-    public List<OrderChild> listNoCancelOrderChild(String orderNo) {
-        return list(lQrWrapper()
-                .eq(OrderChild :: getOrderNo, orderNo)
-                .lt(OrderChild :: getStatus,OrderChildEnum.Status.DRIVER_CANCEL.getCode())
-        );
-
-    }
-
     @Override
     public OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo) {
         return baseMapper.countTodayOrderGoodsSumByUserNo(userNo);