添加业主支持自动生成 业主账号功能免去 注册环节 账号和密码都是手机号 但是需要编码映射 AUTO_GENERATOR_OWNER_USER 开关控制 ON 打开 OFF 关闭

java110-core/src/main/java/com/java110/core/smo/IPhotoSMO.java

@@ -16,6 +16,14 @@ public interface IPhotoSMO {
      */
     int savePhoto(String photo,String objId, String communityId);
 
+    /**
+     * 保存图片公共类，供cmd 调用
+     * @param photo
+     * @param objId
+     * @return
+     */
+    int savePhoto(String photo,String objId, String communityId,String relTypeCd);
+
     /**
      * 保存图片公共类，供cmd 调用
      * @param reqJson

java110-core/src/main/java/com/java110/core/smo/impl/PhotoSMOImpl.java

@@ -26,8 +26,12 @@ public class PhotoSMOImpl implements IPhotoSMO {
     @Autowired(required = false)
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
 
+    public int savePhoto(String photo, String objId, String communityId){
+        return savePhoto(photo,objId,communityId,"11000");
+    }
+
     @Override
-    public int savePhoto(String photo, String objId, String communityId) {
+    public int savePhoto(String photo, String objId, String communityId,String relTypeCd) {
         if (StringUtil.isEmpty(photo)) {
             return 0;
         }
@@ -42,7 +46,7 @@ public class PhotoSMOImpl implements IPhotoSMO {
             photo = fileName;
         }
         JSONObject businessUnit = new JSONObject();
-        businessUnit.put("relTypeCd", "11000");
+        businessUnit.put("relTypeCd", relTypeCd);
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", objId);
         businessUnit.put("fileRealName", photo);

service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarPaymentCmd.java

@@ -133,6 +133,7 @@ public class MachineUploadCarPaymentCmd extends Cmd {
         carInoutDto.setPaId(machineDto.getLocationObjId());
         carInoutDto.setStates(new String[]{
                 CarInoutDto.STATE_IN,
+                CarInoutDto.STATE_PAY,
                 CarInoutDto.STATE_REPAY
         });
         List<CarInoutDto> carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(carInoutDto);

service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java

@@ -7,25 +7,29 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.AuthenticationFactory;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.factory.SendSmsFactory;
+import com.java110.core.smo.IPhotoSMO;
 import com.java110.doc.annotation.*;
+import com.java110.dto.community.CommunityDto;
 import com.java110.dto.file.FileDto;
 import com.java110.dto.msg.SmsDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.common.ISmsInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.community.ICommunityV1InnerServiceSMO;
-import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
-import com.java110.intf.user.IOwnerV1InnerServiceSMO;
-import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
-import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.intf.user.*;
 import com.java110.po.file.FileRelPo;
+import com.java110.po.owner.OwnerAppUserPo;
 import com.java110.po.owner.OwnerAttrPo;
 import com.java110.po.owner.OwnerPo;
 import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.po.user.UserPo;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.UserLevelConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -68,7 +72,7 @@ import java.util.List;
 )
 
 @Java110ExampleDoc(
-        reqBody="{\n" +
+        reqBody = "{\n" +
                 "\t\"name\": \"王王\",\n" +
                 "\t\"age\": \"\",\n" +
                 "\t\"link\": \"18909718888\",\n" +
@@ -81,7 +85,7 @@ import java.util.List;
                 "\t\"idCard\": \"\",\n" +
                 "\t\"communityId\": \"2022121921870161\"\n" +
                 "}",
-        resBody="{\"code\":0,\"msg\":\"成功\"}"
+        resBody = "{\"code\":0,\"msg\":\"成功\"}"
 )
 @Java110Cmd(serviceCode = "owner.saveOwner")
 public class SaveOwnerCmd extends Cmd {
@@ -110,6 +114,17 @@ public class SaveOwnerCmd extends Cmd {
     @Autowired
     private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IPhotoSMO photoSMOImpl;
+
+    @Autowired
+    private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         Assert.jsonObjectHaveKey(reqJson, "name", "请求报文中未包含name");
@@ -186,31 +201,58 @@ public class SaveOwnerCmd extends Cmd {
                 throw new CmdException("保存业主房屋关系失败");
             }
         }
-        if (reqJson.containsKey("ownerPhoto") && !StringUtils.isEmpty(reqJson.getString("ownerPhoto"))) {
-            JSONObject businessUnit = new JSONObject();
-            String _photo = reqJson.getString("ownerPhoto");
-            if(_photo.length()> 512){
-                FileDto fileDto = new FileDto();
-                fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
-                fileDto.setFileName(fileDto.getFileId());
-                fileDto.setContext(_photo);
-                fileDto.setSuffix("jpeg");
-                fileDto.setCommunityId(reqJson.getString("communityId"));
-                _photo = fileInnerServiceSMOImpl.saveFile(fileDto);
-            }
-            businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
-            businessUnit.put("relTypeCd", "10000");
-            businessUnit.put("saveWay", "table");
-            businessUnit.put("objId", reqJson.getString("memberId"));
-            businessUnit.put("fileRealName", _photo);
-            businessUnit.put("fileSaveName", _photo);
-            FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
-            flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
-            if (flag < 1) {
-                throw new CmdException("保存业主房屋关系失败");
-            }
-        }
+
+        //保存照片
+        photoSMOImpl.savePhoto(reqJson.getString("ownerPhoto"),
+                reqJson.getString("memberId"),
+                reqJson.getString("communityId"),
+                "10000");
         dealOwnerAttr(reqJson, cmdDataFlowContext);
+
+        String autoUser = MappingCache.getValue("OWNER", "AUTO_GENERATOR_OWNER_USER");
+
+        if (!"OFF".equals(autoUser)) {
+            return;
+        }
+
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId(ownerPo.getCommunityId());
+        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+        Assert.listNotNull(communityDtos, "未包含小区信息");
+        CommunityDto tmpCommunityDto = communityDtos.get(0);
+
+        UserPo userPo = new UserPo();
+        userPo.setUserId(GenerateCodeFactory.getUserId());
+        userPo.setName(ownerPo.getName());
+        userPo.setTel(ownerPo.getLink());
+        userPo.setPassword(AuthenticationFactory.passwdMd5(ownerPo.getLink()));
+        userPo.setLevelCd(UserLevelConstant.USER_LEVEL_ORDINARY);
+        userPo.setAge(ownerPo.getAge());
+        userPo.setAddress(ownerPo.getAddress());
+        userPo.setSex(ownerPo.getSex());
+        flag = userV1InnerServiceSMOImpl.saveUser(userPo);
+        if (flag < 1) {
+            throw new CmdException("注册失败");
+        }
+
+        OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
+        //状态类型，10000 审核中，12000 审核成功，13000 审核失败
+        ownerAppUserPo.setState("12000");
+        ownerAppUserPo.setAppTypeCd("10010");
+        ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
+        ownerAppUserPo.setMemberId(ownerPo.getMemberId());
+        ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
+        ownerAppUserPo.setCommunityId(ownerPo.getCommunityId());
+        ownerAppUserPo.setAppUserName(ownerPo.getName());
+        ownerAppUserPo.setIdCard(ownerPo.getIdCard());
+        ownerAppUserPo.setAppType("WECHAT");
+        ownerAppUserPo.setLink(ownerPo.getLink());
+        ownerAppUserPo.setUserId(userPo.getUserId());
+
+        flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
+        if (flag < 1) {
+            throw new CmdException("添加用户业主关系失败");
+        }
     }
 
     /**