微信通知修改

src/main/java/com/usky/dxtop/service/api/WxApi.java

@@ -120,8 +120,11 @@ public class WxApi {
             if ("40001".equals(jsonObject.get("errcode").toString())){
                 String token = reloadToken(appId, appSecret);
                 result = sendMessageApi(openId,data,token,templateId,detailUrl);
+                if (!"0".equals(JSONObject.parseObject(result).get("errcode").toString())) {
+                    throw new CustomException(result);
+                }
             }else {
-                throw new CustomException(String.format("发送异常:code:%s,message:%s",jsonObject.get("errcode"),jsonObject.get("errmsg")));
+                throw new CustomException(result);
             }
         }
         return result;

src/main/java/com/usky/dxtop/service/impl/DreOrderServiceImpl.java

@@ -96,6 +96,7 @@ public class DreOrderServiceImpl extends ServiceImpl<DreOrderMapper, DreOrder> i
         IPage<DreOrder> page = new Page<>(dreOrderRequest.getCurrent(), dreOrderRequest.getSize());
         LambdaQueryWrapper<DreOrder> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper
+                .between(null != dreOrderRequest.getStartTime() && null != dreOrderRequest.getEndTime(),DreOrder::getOrderTime,dreOrderRequest.getStartTime(),dreOrderRequest.getEndTime())
                 .eq(StringUtils.isNotBlank(dreOrderRequest.getMType()),DreOrder::getMType,dreOrderRequest.getMType())
                 .eq(null != dreOrderRequest.getOrderStatus(),DreOrder::getOrderStatus,dreOrderRequest.getOrderStatus())
                 .eq(StringUtils.isNotBlank(dreOrderRequest.getOrderUserName()),DreOrder::getOrderUserName,dreOrderRequest.getOrderUserName())