java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml
@@ -254,6 +254,9 @@ <if test="acctName !=null and acctName != ''"> t.acct_name= #{acctName}, </if> <if test="link !=null and link != ''"> t.link= #{link}, </if> </set> where 1=1 <if test="acctId !=null and acctId != ''"> service-acct/src/main/java/com/java110/acct/api/AccountApi.java
@@ -115,31 +115,31 @@ ownerRoomRelDto.setRoomId(payerObjId); List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto); Assert.listOnlyOne(ownerRoomRelDtos, "查询业主房屋关系表错误！"); ownerId = ownerRoomRelDtos.get(0).getOwnerId(); link = ownerRoomRelDtos.get(0).getLink(); } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(payerObjType)) { OwnerCarDto ownerCarDto = new OwnerCarDto(); ownerCarDto.setCarId(payerObjId); List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto); // Assert.listOnlyOne(ownerCarDtos, "查询业主车辆关系表错误！"); ownerId = ownerCarDtos.get(0).getOwnerId(); link = ownerCarDtos.get(0).getLink(); } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(payerObjType)) { ContractDto contractDto = new ContractDto(); contractDto.setContractId(payerObjId); List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto); // Assert.listOnlyOne(ownerCarDtos, "查询业主车辆关系表错误！"); ownerId = contractDtos.get(0).getObjId(); link = contractDtos.get(0).getbLink(); } else { ownerId = "-1"; } accountDto.setObjId(ownerId); accountDto.setLink(link); } else { accountDto.setObjId(ownerId); accountDto.setLink(link); } accountDto.setObjType(AccountDto.OBJ_TYPE_PERSON); accountDto.setAcctName(ownerName); accountDto.setPartId(communityId); accountDto.setAcctType(acctType); accountDto.setLink(link); accountDto.setObjId(ownerId); accountDto.setAcctId(acctId); OwnerDto ownerDto = new OwnerDto(); ownerDto.setOwnerId(ownerId); service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
@@ -368,7 +368,7 @@ String wechatUrl = UrlCache.getOwnerUrl(); Miniprogram miniprogram = null; if (wechatUrl.startsWith("https://") || wechatUrl.startsWith("http://")) { miniprogram = new Miniprogram(); //miniprogram = new Miniprogram(); } else { miniprogram = new Miniprogram(); miniprogram.setAppid(wechatUrl); service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
@@ -9,10 +9,12 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.account.AccountDto; import com.java110.dto.file.FileDto; import com.java110.dto.file.FileRelDto; import com.java110.dto.owner.OwnerAppUserDto; import com.java110.dto.owner.OwnerDto; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.intf.common.IFileInnerServiceSMO; import com.java110.intf.common.IFileRelInnerServiceSMO; import com.java110.intf.user.IOwnerV1InnerServiceSMO; @@ -20,6 +22,7 @@ import com.java110.intf.user.IOwnerAppUserV1InnerServiceSMO; import com.java110.intf.user.IOwnerAttrInnerServiceSMO; import com.java110.intf.user.IOwnerInnerServiceSMO; import com.java110.po.account.AccountPo; import com.java110.po.file.FileRelPo; import com.java110.po.owner.OwnerAppUserPo; import com.java110.po.owner.OwnerAttrPo; @@ -103,6 +106,9 @@ @Autowired private IFileInnerServiceSMO fileInnerServiceSMOImpl; @Autowired private IAccountInnerServiceSMO accountInnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException { @@ -192,7 +198,11 @@ if (reqJson.containsKey("ownerPhoto") && !StringUtils.isEmpty(reqJson.getString("ownerPhoto"))) { editOwnerPhoto(reqJson); } //todo 修改 业主信息 editOwner(reqJson); JSONArray attrs = reqJson.getJSONArray("attrs"); if (attrs == null || attrs.size() < 1) { return; @@ -247,7 +257,7 @@ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto(); ownerAppUserDto.setMemberId(paramInJson.getString("ownerId")); //查询app用户表 //todo 查询app用户表 List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto); if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) { for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) { @@ -260,6 +270,22 @@ } } } //todo 判断业主手机号和账户手机号是否相同，不相同修改账户手机号 AccountDto accountDto = new AccountDto(); accountDto.setObjId(ownerDtos.get(0).getMemberId()); accountDto.setPartId(ownerDtos.get(0).getCommunityId()); List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto); if(accountDtos == null || accountDtos.size()< 1){ return ; } if(accountDtos.get(0).getLink().equals(ownerDtos.get(0).getLink())){ return; } AccountPo accountPo = new AccountPo(); accountPo.setLink(ownerDtos.get(0).getLink()); accountPo.setAcctId(accountDtos.get(0).getAcctId()); accountInnerServiceSMOImpl.updateAccount(accountPo); } public void editOwnerPhoto(JSONObject paramInJson) {
