Merge branch 'dev-增加商铺分类' of https://e.coding.net/chuanghaikeji/moxuanyunshangwaimai/backend into dev-测试环境分支不要从这拉代码

src/main/java/com/sqx/modules/exportExecl/controller/ExportExeclController.java

@@ -197,7 +197,7 @@ public class ExportExeclController {
         exportJob.setConditions(condCode);
         LocalDateTime localDateTime = LocalDateTime.now();
         String time=localDateTime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
-        exportJob.setFileName(time+(Math.random() * 100)+fileName);
+        exportJob.setFileName(time+(int)(Math.random() * 100)+fileName);
         exportJob.setCreateTime(new Date());
         exportJob.setUpdateTime(new Date());
         exportJob.setUserId(userId);

src/main/java/com/sqx/modules/order/dto/OrderQueryDto.java

@@ -84,21 +84,21 @@ public class OrderQueryDto extends PageQuery {
 
     public String toStrCode() {
         return ","+(status==null?"":status)+
-                ","+phone+
+                ","+(phone==null?"":phone)+
                 ","+(shopId==null?"":shopId)+
-                ","+userName+
-                ","+orderNumber+
-                "," +(orderType==null?"":orderType)+
-                ","+shopName+
-                "," +riderPhone+
-                ","+startTime+
-                ","+endTime+
-                ","+payStartTime +
-                ","+payEndTime+
+                ","+(userName==null?"":userName)+
+                ","+(orderNumber==null?"":orderNumber)+
+                ","+(orderType==null?"":orderType)+
+                ","+(shopName==null?"":shopName)+
+                ","+(riderPhone==null?"":riderPhone)+
+                ","+(startTime==null?"":startTime)+
+                ","+(endTime==null?"":endTime)+
+                ","+(payStartTime ==null?"":payStartTime)+
+                ","+(payEndTime==null?"":payEndTime)+
                 ","+(riderStationId==null?"":riderStationId)+
-                ","+shopTypeId+
-                ","+couponType+
-                ","+indentStatus+
+                ","+(shopTypeId==null?"":shopTypeId)+
+                ","+(couponType==null?"":couponType)+
+                ","+(indentStatus==null?"":indentStatus)+
                 ",";
     }