加入业主预存功能

java110-bean/src/main/java/com/java110/dto/accountDetail/AccountDetailDto.java

@@ -19,6 +19,8 @@ public class AccountDetailDto extends PageDto implements Serializable {
     //类型，1001 转入 2002 转出
     public static String DETAIL_TYPE_IN = "1001";
     public static String DETAIL_TYPE_OUT = "2002";
+    public static String ORDER_TYPE_USER = "6006";
+    public static String ORDER_TYPE_STORE = "7007";
 
     private String detailType;
     private String amount;

java110-bean/src/main/java/com/java110/po/accountDetail/AccountDetailPo.java

@@ -1,74 +1,90 @@
 package com.java110.po.accountDetail;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class AccountDetailPo implements Serializable {
 
     private String detailType;
-private String amount;
-private String orderId;
-private String objId;
-private String detailId;
-private String acctId;
-private String relAcctId;
-private String remark;
-private String objType;
-public String getDetailType() {
+    private String amount;
+    private String orderId;
+    private String objId;
+    private String detailId;
+    private String acctId;
+    private String relAcctId;
+    private String remark;
+    private String objType;
+
+    public String getDetailType() {
         return detailType;
     }
-public void setDetailType(String detailType) {
+
+    public void setDetailType(String detailType) {
         this.detailType = detailType;
     }
-public String getAmount() {
+
+    public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getOrderId() {
+
+    public String getOrderId() {
         return orderId;
     }
-public void setOrderId(String orderId) {
+
+    public void setOrderId(String orderId) {
         this.orderId = orderId;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getDetailId() {
+
+    public String getDetailId() {
         return detailId;
     }
-public void setDetailId(String detailId) {
+
+    public void setDetailId(String detailId) {
         this.detailId = detailId;
     }
-public String getAcctId() {
+
+    public String getAcctId() {
         return acctId;
     }
-public void setAcctId(String acctId) {
+
+    public void setAcctId(String acctId) {
         this.acctId = acctId;
     }
-public String getRelAcctId() {
+
+    public String getRelAcctId() {
         return relAcctId;
     }
-public void setRelAcctId(String relAcctId) {
+
+    public void setRelAcctId(String relAcctId) {
         this.relAcctId = relAcctId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
 
 
-
 }

java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml

@@ -13,6 +13,14 @@
         )
     </insert>
 
+    <insert id="saveAccount" parameterType="Map">
+        insert into account(
+        amount,acct_type,obj_id,acct_id,acct_name,b_id,obj_type,part_id
+        ) values (
+        #{amount},#{acctType},#{objId},#{acctId},#{acctName},'-1',#{objType},#{partId}
+        )
+    </insert>
+
 
     <!-- 查询账户信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessAccountInfo" parameterType="Map" resultType="Map">

java110-interface/src/main/java/com/java110/intf/acct/IAccountInnerServiceSMO.java

@@ -3,6 +3,7 @@ package com.java110.intf.acct;
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.account.AccountDto;
 import com.java110.po.account.AccountPo;
+import com.java110.po.accountDetail.AccountDetailPo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -49,4 +50,28 @@ public interface IAccountInnerServiceSMO {
      */
     @RequestMapping(value = "/updateAccount", method = RequestMethod.POST)
     int updateAccount(@RequestBody AccountPo accountPo);
+
+    /**
+     * 保存账户
+     * @param accountPo
+     */
+    @RequestMapping(value = "/saveAccount", method = RequestMethod.POST)
+    int saveAccount(@RequestBody AccountPo accountPo);
+
+
+    /**
+     * 预存金额
+     * @param accountDetailPo
+     * @return
+     */
+    @RequestMapping(value = "/prestoreAccount", method = RequestMethod.POST)
+    int prestoreAccount(@RequestBody AccountDetailPo accountDetailPo);
+
+    /**
+     * 扣款金额
+     * @param accountDetailPo
+     * @return
+     */
+    @RequestMapping(value = "/withholdAccount", method = RequestMethod.POST)
+    int withholdAccount(@RequestBody AccountDetailPo accountDetailPo);
 }

service-acct/src/main/java/com/java110/acct/api/AccountApi.java

@@ -1,16 +1,17 @@
 package com.java110.acct.api;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.acct.bmo.account.IGetAccountBMO;
+import com.java110.acct.bmo.account.IOwnerPrestoreAccountBMO;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.account.AccountDto;
 import com.java110.dto.accountDetail.AccountDetailDto;
 import com.java110.dto.owner.OwnerDto;
+import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.utils.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @ClassName AccountApi
@@ -28,6 +29,9 @@ public class AccountApi {
     @Autowired
     private IGetAccountBMO getAccountBMOImpl;
 
+    @Autowired
+    private IOwnerPrestoreAccountBMO ownerPrestoreAccountBMOImpl;
+
     /**
      * 微信删除消息模板
      *
@@ -99,4 +103,25 @@ public class AccountApi {
         accountDto.setAcctId(acctId);
         return getAccountBMOImpl.getDetail(accountDto);
     }
+
+    /**
+     * 业主账户预存
+     *
+     * @param reqJson 小区ID
+     * @return
+     * @serviceCode /account/ownerPrestoreAccount
+     * @path /app/account/ownerPrestoreAccount
+     */
+    @RequestMapping(value = "/ownerPrestoreAccount", method = RequestMethod.GET)
+    public ResponseEntity<String> queryAccountDetail(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "ownerId", "业主不能为空");
+        Assert.hasKeyAndValue(reqJson, "amount", "金额不能为空");
+
+        AccountDetailPo accountDetailPo = new AccountDetailPo();
+        accountDetailPo.setRemark(reqJson.getString("remark"));
+        accountDetailPo.setObjId(reqJson.getString("ownerId"));
+        accountDetailPo.setAmount(reqJson.getString("amount"));
+        return ownerPrestoreAccountBMOImpl.prestore(accountDetailPo,reqJson);
+    }
 }

service-acct/src/main/java/com/java110/acct/bmo/account/IOwnerPrestoreAccountBMO.java

@@ -0,0 +1,21 @@
+package com.java110.acct.bmo.account;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.account.AccountDto;
+import com.java110.dto.accountDetail.AccountDetailDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.po.accountDetail.AccountDetailPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IOwnerPrestoreAccountBMO {
+
+
+    /**
+     * 业主预存
+     * add by wuxw
+     * @param  accountDetailPo
+     * @return
+     */
+    ResponseEntity<String> prestore(AccountDetailPo accountDetailPo, JSONObject reqJson);
+
+
+}

service-acct/src/main/java/com/java110/acct/bmo/account/impl/OwnerPrestoreAccountBMOImpl.java

@@ -0,0 +1,85 @@
+package com.java110.acct.bmo.account.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.acct.bmo.account.IOwnerPrestoreAccountBMO;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.account.AccountDto;
+import com.java110.dto.accountDetail.AccountDetailDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.po.account.AccountPo;
+import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("ownerPrestoreAccountBMOImpl")
+public class OwnerPrestoreAccountBMOImpl implements IOwnerPrestoreAccountBMO {
+
+    @Autowired
+    private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
+
+    @Autowired
+    private IAccountDetailInnerServiceSMO accountDetailInnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+    /**
+     * @param accountDetailPo
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> prestore(AccountDetailPo accountDetailPo, JSONObject reqJson) {
+
+        ResponseEntity<String> responseEntity = null;
+
+        //查询 业主是否有账户
+        AccountDto accountDto = new AccountDto();
+        accountDto.setObjId(accountDetailPo.getObjId());
+        accountDto.setObjType(AccountDto.OBJ_TYPE_PERSON);
+        accountDto.setPartId(reqJson.getString("communityId"));
+        accountDto.setAcctType(AccountDto.ACCT_TYPE_CASH);
+        List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
+        if (accountDtos == null || accountDtos.size() < 1) {
+            accountDto = addAccountDto(reqJson);
+        } else {
+            accountDto = accountDtos.get(0);
+        }
+        accountDetailPo.setOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
+        accountDetailPo.setAcctId(accountDto.getAcctId());
+        accountDetailPo.setObjType(AccountDetailDto.ORDER_TYPE_USER);
+
+        int flag = accountInnerServiceSMOImpl.prestoreAccount(accountDetailPo);
+        if (flag < 1) {
+            return ResultVo.error("预存失败");
+        }
+        return ResultVo.success();
+    }
+
+
+    private AccountDto addAccountDto(JSONObject reqJson) {
+        AccountPo accountPo = new AccountPo();
+        accountPo.setAmount(reqJson.getString("amount"));
+        accountPo.setAcctId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_acctId));
+        accountPo.setObjId(reqJson.getString("ownerId"));
+        accountPo.setObjType(AccountDto.OBJ_TYPE_PERSON);
+        accountPo.setAcctType(AccountDto.ACCT_TYPE_CASH);
+        OwnerDto ownerDto = new OwnerDto();
+        ownerDto.setMemberId(reqJson.getString("ownerId"));
+        ownerDto.setCommunityId(reqJson.getString("communityId"));
+        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+        Assert.listOnlyOne(ownerDtos, "业主不存在");
+        accountPo.setAcctName(ownerDtos.get(0).getName());
+        accountPo.setPartId(reqJson.getString("communityId"));
+        accountInnerServiceSMOImpl.saveAccount(accountPo);
+        return BeanConvertUtil.covertBean(accountPo, AccountDto.class);
+    }
+
+}

service-acct/src/main/java/com/java110/acct/dao/IAccountServiceDao.java

@@ -85,4 +85,6 @@ public interface IAccountServiceDao {
      * @return 账户数量
      */
     int updateAccount(Map info);
+
+    void saveAccount(Map beanCovertMap);
 }

service-acct/src/main/java/com/java110/acct/dao/impl/AccountServiceDaoImpl.java

@@ -144,5 +144,13 @@ public class AccountServiceDaoImpl extends BaseServiceDao implements IAccountSer
         return flag;
     }
 
+    @Override
+    public void saveAccount(Map info) {
+        logger.debug("查询账户数据 入参 info : {}", info);
+
+         sqlSessionTemplate.update("accountServiceDaoImpl.saveAccount", info);
+
+    }
+
 
 }

service-acct/src/main/java/com/java110/acct/smo/impl/AccountInnerServiceSMOImpl.java

@@ -1,19 +1,26 @@
 package com.java110.acct.smo.impl;
 
 
+import com.java110.acct.dao.IAccountDetailServiceDao;
 import com.java110.acct.dao.IAccountServiceDao;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.PageDto;
 import com.java110.dto.account.AccountDto;
+import com.java110.dto.accountDetail.AccountDetailDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.po.account.AccountPo;
+import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.utils.lock.DistributedLock;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,6 +38,9 @@ public class AccountInnerServiceSMOImpl extends BaseServiceSMO implements IAccou
     @Autowired
     private IAccountServiceDao accountServiceDaoImpl;
 
+    @Autowired
+    private IAccountDetailServiceDao accountDetailServiceDaoImpl;
+
 
     @Override
     public List<AccountDto> queryAccounts(@RequestBody AccountDto accountDto) {
@@ -89,6 +99,130 @@ public class AccountInnerServiceSMOImpl extends BaseServiceSMO implements IAccou
         return accountServiceDaoImpl.updateAccount(BeanConvertUtil.beanCovertMap(accountPo));
     }
 
+    @Override
+    public int saveAccount(@RequestBody AccountPo accountPo) {
+        accountServiceDaoImpl.saveAccount(BeanConvertUtil.beanCovertMap(accountPo));
+        return 1;
+    }
+
+    /**
+     * 预存接口
+     *
+     * @param accountDetailPo
+     * @return
+     */
+    @Override
+    @Java110Transactional
+    public int prestoreAccount(@RequestBody AccountDetailPo accountDetailPo) {
+
+        if (StringUtil.isEmpty(accountDetailPo.getAcctId())) {
+            throw new IllegalArgumentException("账户ID为空");
+        }
+        //开始枷锁
+        String requestId = DistributedLock.getLockUUID();
+        String key = accountDetailPo.getAcctId();
+        AccountDto accountDto = null;
+        List<AccountDto> accounts = null;
+        int flag;
+        try {
+            DistributedLock.waitGetDistributedLock(key, requestId);
+            accountDto = new AccountDto();
+            accountDto.setObjId(accountDetailPo.getObjId());
+            accountDto.setAcctId(accountDetailPo.getAcctId());
+            accounts = BeanConvertUtil.covertBeanList(accountServiceDaoImpl.getAccountInfo(BeanConvertUtil.beanCovertMap(accountDto)), AccountDto.class);
+            if (accounts == null || accounts.size() < 1) {
+                throw new IllegalArgumentException("账户不存在");
+            }
+            //在账户增加
+            double amount = Double.parseDouble(accounts.get(0).getAmount());
+            BigDecimal amountBig = new BigDecimal(amount);
+            amount = amountBig.add(new BigDecimal(accountDetailPo.getAmount())).doubleValue();
+            AccountPo accountPo = new AccountPo();
+            accountPo.setObjId(accountDetailPo.getObjId());
+            accountPo.setAcctId(accountDetailPo.getAcctId());
+            accountPo.setAmount(amount + "");
+            flag = accountServiceDaoImpl.updateAccount(BeanConvertUtil.beanCovertMap(accountPo));
+            if (flag < 1) {
+                throw new IllegalArgumentException("更新账户失败");
+            }
+        } finally {
+            DistributedLock.releaseDistributedLock(requestId, key);
+        }
+        accountDetailPo.setDetailType(AccountDetailDto.DETAIL_TYPE_IN);
+        if(StringUtil.isEmpty(accountDetailPo.getDetailId())) {
+            accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+        }
+        if(StringUtil.isEmpty(accountDetailPo.getOrderId())){
+            accountDetailPo.setOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
+        }
+        if(StringUtil.isEmpty(accountDetailPo.getRelAcctId())){
+            accountDetailPo.setRelAcctId("-1");
+        }
+
+        //保存交易明细
+        return accountDetailServiceDaoImpl.saveAccountDetails(BeanConvertUtil.beanCovertMap(accountDetailPo));
+    }
+
+    /**
+     * 扣款接口
+     *
+     * @param accountDetailPo
+     * @return
+     */
+    @Override
+    @Java110Transactional
+    public int withholdAccount(@RequestBody AccountDetailPo accountDetailPo) {
+
+        if (StringUtil.isEmpty(accountDetailPo.getAcctId())) {
+            throw new IllegalArgumentException("账户ID为空");
+        }
+        //开始枷锁
+        String requestId = DistributedLock.getLockUUID();
+        String key = accountDetailPo.getAcctId();
+        AccountDto accountDto = null;
+        List<AccountDto> accounts = null;
+        int flag;
+        try {
+            DistributedLock.waitGetDistributedLock(key, requestId);
+            accountDto = new AccountDto();
+            accountDto.setObjId(accountDetailPo.getObjId());
+            accountDto.setAcctId(accountDetailPo.getAcctId());
+            accounts = BeanConvertUtil.covertBeanList(accountServiceDaoImpl.getAccountInfo(BeanConvertUtil.beanCovertMap(accountDto)), AccountDto.class);
+            if (accounts == null || accounts.size() < 1) {
+                throw new IllegalArgumentException("账户不存在");
+            }
+            //在账户增加
+            double amount = Double.parseDouble(accounts.get(0).getAmount());
+            BigDecimal amountBig = new BigDecimal(amount);
+            amount = amountBig.subtract(new BigDecimal(accountDetailPo.getAmount())).doubleValue();
+            if(amount < 0){
+                throw new IllegalArgumentException("余额不足");
+            }
+            AccountPo accountPo = new AccountPo();
+            accountPo.setObjId(accountDetailPo.getObjId());
+            accountPo.setAcctId(accountDetailPo.getAcctId());
+            accountPo.setAmount(amount + "");
+            flag = accountServiceDaoImpl.updateAccount(BeanConvertUtil.beanCovertMap(accountPo));
+            if (flag < 1) {
+                throw new IllegalArgumentException("更新账户失败");
+            }
+        } finally {
+            DistributedLock.releaseDistributedLock(requestId, key);
+        }
+        accountDetailPo.setDetailType(AccountDetailDto.DETAIL_TYPE_OUT);
+        if(StringUtil.isEmpty(accountDetailPo.getDetailId())) {
+            accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+        }
+        if(StringUtil.isEmpty(accountDetailPo.getOrderId())){
+            accountDetailPo.setOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
+        }
+        if(StringUtil.isEmpty(accountDetailPo.getRelAcctId())){
+            accountDetailPo.setRelAcctId("-1");
+        }
+        //保存交易明细
+        return accountDetailServiceDaoImpl.saveAccountDetails(BeanConvertUtil.beanCovertMap(accountDetailPo));
+    }
+
     public IAccountServiceDao getAccountServiceDaoImpl() {
         return accountServiceDaoImpl;
     }

service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarToIotAdapt.java

@@ -25,6 +25,7 @@ import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.car.OwnerCarPo;
+import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
@@ -121,6 +122,7 @@ public class AddCarToIotAdapt extends DatabusAdaptImpl {
         ownerCarDto = new OwnerCarDto();
         ownerCarDto.setOwnerId(ownerCarPo.getOwnerId());
         ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
+        ownerCarDto.setStatusCd(StatusConstant.STATUS_CD_VALID);
         long parkingSpaceCount = ownerCarInnerServiceSMOImpl.queryOwnerParkingSpaceCount(ownerCarDto);
 
         JSONObject postParameters = new JSONObject();

service-job/src/main/java/com/java110/job/adapt/hcIot/car/DeleteCarToIotAdapt.java

@@ -102,10 +102,21 @@ public class DeleteCarToIotAdapt extends DatabusAdaptImpl {
         List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
         Assert.listOnlyOne(ownerCarDtos, "未找到车位");
 
+        ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setOwnerId(ownerCarPo.getOwnerId());
+        ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
+        ownerCarDto.setStatusCd(StatusConstant.STATUS_CD_VALID);
+        long parkingSpaceCount = ownerCarInnerServiceSMOImpl.queryOwnerParkingSpaceCount(ownerCarDto);
+
         JSONObject postParameters = new JSONObject();
         postParameters.put("extCarId", ownerCarDtos.get(0).getCarId());
         postParameters.put("carNum", ownerCarDtos.get(0).getCarNum());
         postParameters.put("extPaId", parkingSpaceDtos.get(0).getPaId());
+        postParameters.put("personName", ownerCarDtos.get(0).getOwnerName());
+        postParameters.put("personTel", ownerCarDtos.get(0).getLink());
+        postParameters.put("personId", ownerCarDtos.get(0).getOwnerId());
+        postParameters.put("extCarId", ownerCarDtos.get(0).getCarId());
+        postParameters.put("parkingNum", parkingSpaceCount);
         postParameters.put("extCommunityId", ownerCarDtos.get(0).getCommunityId());
         hcOwnerCarAsynImpl.deleteOwnerCar(postParameters);
     }

service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarToIotAdapt.java

@@ -25,6 +25,7 @@ import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.car.OwnerCarPo;
+import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
@@ -116,8 +117,9 @@ public class ModifyCarToIotAdapt extends DatabusAdaptImpl {
         Assert.listOnlyOne(ownerCarDtos, "未找到车位");
 
         ownerCarDto = new OwnerCarDto();
-        ownerCarDto.setCarNum(ownerCarPo.getCarNum());
+        ownerCarDto.setOwnerId(ownerCarPo.getOwnerId());
         ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
+        ownerCarDto.setStatusCd(StatusConstant.STATUS_CD_VALID);
         long parkingSpaceCount = ownerCarInnerServiceSMOImpl.queryOwnerParkingSpaceCount(ownerCarDto);
         JSONObject postParameters = new JSONObject();
 

service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java

@@ -70,6 +70,7 @@ public class GetReportOwnerPayFeeBMOImpl implements IGetReportOwnerPayFeeBMO {
         ReportOwnerPayFeeDto reportOwnerPayFeeDto = new ReportOwnerPayFeeDto();
         reportOwnerPayFeeDto.setFeeIds(feeIds.toArray(new String[feeIds.size()]));
         reportOwnerPayFeeDto.setPfYear(tmpReportOwnerPayFeeDto.getPfYear());
+        reportOwnerPayFeeDto.setConfigId(tmpReportOwnerPayFeeDto.getConfigId());
 
         if(StringUtil.isEmpty(reportOwnerPayFeeDto.getPfYear())){
             reportOwnerPayFeeDto.setPfYear(DateUtil.getYear()+"");