Merge remote-tracking branch 'origin/test_saas' into test_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TenantInfoDto.java

@@ -49,6 +49,7 @@ public class TenantInfoDto implements Serializable {
     /**
      * 地址
      */
+    @NotBlank(message = "地址不能为空!")
     @Size(max = 200, message = "地址不能超过200个字!")
     @ApiModelProperty(value = "地址")
     private String address;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -173,7 +173,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         setIdByApply(tenantId, dto.getConfig(), dto.getConfig()::setTenantId, tenantConfigService::addConfig);
         //查询机构入驻表如果公司全称和联系电话相同则把入驻表修改为已入驻
         TenantPreJoin preJoin = tenantPreJoinService.getOne(new QueryWrapper<TenantPreJoin>()
-                .eq("phone_", dto.getPhone())
+                .eq("tsign_code_", dto.getTsignCode())
                 .eq("state_", 0));
         if (Objects.nonNull(preJoin)) {
             preJoin.setState(1);
@@ -535,7 +535,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             throw new BizException("读取产品协议出错");
         } finally {
             //删除文件
-            FileUtils.deleteQuietly(srcFile);
+//            FileUtils.deleteQuietly(srcFile);
         }
     }
 
@@ -544,7 +544,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      */
     private Map<String, Object> getContractParam(TenantInfoInfoPageVo tenantInfo, Date now) {
         //将数据转换为Map
-        Map<String, Object> param = toMap(tenantInfo);
+        Map<String, Object> param = WrapperUtil.toMap(tenantInfo);
         //当前时间
         param.put("nowDate", DateUtils.formatDate(now, "yyyy年MM月dd日"));
         //服务过期时间
@@ -591,13 +591,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         return param;
     }
 
-    private Map toMap(TenantInfoInfoPageVo tenantInfo) {
-        return Optional.ofNullable(tenantInfo)
-                .map(JSONObject::toJSON)
-                .map(o -> JSONObject.toJavaObject((JSONObject) o, Map.class))
-                .orElse(null);
-    }
-
     private static <O, T, S> T opsContractData(O param, Function<O, T> fun, String msg,
                                                BiConsumer<String, Object> putC, String key, Function<T, S> val) {
         Optional<T> optional = Optional.ofNullable(fun.apply(param));

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantPreJoinServiceImpl.java

@@ -54,8 +54,8 @@ public class TenantPreJoinServiceImpl extends ServiceImpl<TenantPreJoinDao, Tena
         IPage<TenantPreJoin> page = this.page(pageInfo,
                 new WrapperUtil<TenantPreJoin>()
                         .hasEq("state_", param.get("state"))
-                        .hasGe("create_time_", param.get("startTime"))
-                        .hasLe("create_time_", param.get("endTime"))
+                        .hasGe("created_time_", param.get("startTime"))
+                        .hasLe("created_time_", param.get("endTime"))
                         .queryWrapper()
                         .and(Objects.nonNull(search),
                                 o -> o.eq("tsign_name_", search)
@@ -78,7 +78,7 @@ public class TenantPreJoinServiceImpl extends ServiceImpl<TenantPreJoinDao, Tena
         opsAreaData(obj.getAreaId(), sysAreaService::getParentArea,
                 () -> new BizException("未查询到区域id为 [" + obj.getAreaId() + "]的数据！"),
                 obj::setProvinceId, obj::setProvinceName);
-
+        obj.setState(0);
         obj.setCreatedTime(new Date());
         return baseMapper.insert(obj);
     }

mec-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -43,7 +43,7 @@
         <result column="tsign_name_" jdbcType="VARCHAR" property="tsignName"/>
         <result column="contacts_" jdbcType="VARCHAR" property="contacts"/>
         <result column="phone_" jdbcType="VARCHAR" property="phone"/>
-        <result column="address_" jdbcType="VARCHAR" property="address"/>
+        <result column="address_" property="address"/>
         <result column="email_" jdbcType="VARCHAR" property="email"/>
         <result column="pay_state_" jdbcType="INTEGER" property="payState"/>
         <result column="state_" jdbcType="INTEGER" property="state"/>

mec-common/common-core/src/main/java/com/ym/mec/common/page/WrapperUtil.java

@@ -1,5 +1,6 @@
 package com.ym.mec.common.page;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ym.mec.common.exception.BizException;
 import org.apache.commons.collections.CollectionUtils;
@@ -241,6 +242,7 @@ public class WrapperUtil<T> {
      * <p> a -> [3,6]
      * <p> b -> [2]
      */
+    @SuppressWarnings("unchecked")
     public static <O> void listDifference(List<O> a, List<O> b) {
         //将ab并集
         Collection<O> abUn = CollectionUtils.retainAll(a, b);
@@ -250,4 +252,15 @@ public class WrapperUtil<T> {
         b.removeAll(abUn);
     }
 
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> toMap(Object obj) {
+        if (obj instanceof Map) {
+            return (Map<String, Object>) obj;
+        }
+        return Optional.ofNullable(obj)
+                .map(JSONObject::toJSON)
+                .map(o -> JSONObject.toJavaObject((JSONObject) o, Map.class))
+                .orElse(new HashMap<String, Object>());
+    }
+
 }