查询用户得注册量以及商家入驻量

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/CategoryDTO.java

@@ -79,10 +79,12 @@ public class CategoryDTO implements Serializable {
      * 商家ID
      */
     private Long merchantId;
-
-
     /**
      * 针对商家分类id，该分类来源于平台得分类
      */
     private Long sourceId;
+    /**
+     * 商家名称
+     */
+    private String merchantName;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/MerchantAuthModifyParam.java

@@ -28,14 +28,14 @@ public class MerchantAuthModifyParam implements Serializable {
     /**
      * 营业执照编号
      */
-    @NotEmpty(message = "营业执照编号不能为空")
+//    @NotEmpty(message = "营业执照编号不能为空")
     @Size(max = 100, message = "营业执照编号长度不能大于64")
     private String businessLicenseId;
     /**
      * 营业执照证件号
      */
 //    @NotEmpty(message = "营业执照证件号不能为空")
-    @Size(max = 100, message = "营业执照证件号长度不能大于64")
+    @Size(max = 64, message = "营业执照证件号长度不能大于64")
     private String businessLicenseNumber;
     /**
      * 营业执照有效期
@@ -46,7 +46,7 @@ public class MerchantAuthModifyParam implements Serializable {
      * 身份证号
      */
     @NotEmpty(message = "身份证号不能为空")
-    @Size(max = 100, message = "身份证号长度不能大于32")
+    @Size(max = 32, message = "身份证号长度不能大于32")
     private String idCardNumber;
     /**
      * 身份证有效期
@@ -61,7 +61,7 @@ public class MerchantAuthModifyParam implements Serializable {
      * 法人姓名
      */
     @NotEmpty(message = "法人姓名不能为空")
-    @Size(max = 100, message = "法人姓名长度t不能大于255")
+    @Size(max = 255, message = "法人姓名长度t不能大于255")
     private String legalRepresentativeName;
     /**
      * 法人性别
@@ -72,12 +72,12 @@ public class MerchantAuthModifyParam implements Serializable {
      * 手机号
      */
     @NotEmpty(message = "手机号不能为空")
-    @Size(max = 100, message = "手机号长度不能大于20")
+    @Size(max = 20, message = "手机号长度不能大于20")
     private String mobileNumber;
     /**
      * 账号
      */
-    @Size(max = 100, message = "账号长度不能大于64")
+    @Size(max = 64, message = "账号长度不能大于64")
     private String account;
     /**
      * 账号注册日期
@@ -91,12 +91,12 @@ public class MerchantAuthModifyParam implements Serializable {
      *店名
      */
     @NotEmpty(message = "店名不能为空")
-    @Size(max = 100, message = "店名长度不能大于255")
+    @Size(max = 255, message = "店名长度不能大于255")
     private String storeName;
     /**
      * 店铺地址
      */
-    @Size(max = 100, message = "店铺地址长度不能大于255")
+    @Size(max = 255, message = "店铺地址长度不能大于255")
     private String storeAddress;
     /**
      * 经营许可证照片
@@ -105,13 +105,13 @@ public class MerchantAuthModifyParam implements Serializable {
     /**
      * 经营许可证号
      */
-    @NotEmpty(message = "经营许可证号不能为空")
-    @Size(max = 100, message = "经营许可证号长度不能大于20")
+//    @NotEmpty(message = "经营许可证号不能为空")
+    @Size(max = 20, message = "经营许可证号长度不能大于20")
     private String businessLicenseNumberValid;
     /**
      * 经营许可证有效期
      */
-    @NotNull(message = "经营许可证有效期不能为空")
+//    @NotNull(message = "经营许可证有效期不能为空")
     private Date businessLicenseExpirationDateValid;
     /**
      * 推荐人

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CategoryServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.uc.api.model.Scope;
 import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
+import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.api.param.CategoryListParam;
 import com.chelvc.cloud.vehicle.api.param.CategoryModifyParam;
 import com.chelvc.cloud.vehicle.api.param.CategoryPagingParam;
@@ -91,8 +92,16 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
                 .eq(StringUtils.notEmpty(param.getMerchantId()),Category::getMerchantId,param.getMerchantId())
                 .eq(Objects.nonNull(param.getEnabled()), Category::getEnabled, param.getEnabled())
                 .eq(StringUtils.notEmpty(param.getType()),Category::getType,param.getType())
+                .orderByDesc(Category::getMerchantId)
                 .orderByAsc(Category::getSort).page(DatabaseContextHolder.page(param.getPaging()));
-        return DatabaseContextHolder.pagination(page, CategoryCopier.INSTANCE::copying);
+        Pagination<CategoryDTO> pagination = DatabaseContextHolder.pagination(page, CategoryCopier.INSTANCE::copying);
+        pagination.getRecords().forEach(item ->{
+            MerchantDTO merchantDTO = this.merchantService.getMerchantById(item.getMerchantId());
+            if (null != merchantDTO){
+                item.setMerchantName(merchantDTO.getName());
+            }
+        });
+        return pagination;
     }
 
     @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -454,7 +454,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 //        Long increment = redisService.incr(key, 1);
         sb.append(date);
 //        sb.append(String.format("%02d", order.getSourceType()));
-        sb.append(String.format("%02d", order.getPayType()));
+        sb.append(String.format("%02d", new Random().nextInt(9000) + 1000));
 //        String incrementStr = increment.toString();
 //        if (incrementStr.length() <= 6) {
 //            sb.append(String.format("%06d", increment));