|
|
@@ -243,15 +243,15 @@ public class AsyncTaskImportService {
|
|
|
PayBaseCustomerandmeterrela customer = new PayBaseCustomerandmeterrela();//实例化开户实体
|
|
|
PayControlValve valve = new PayControlValve();//实例化阀控实体
|
|
|
//根据客户编码寻找客户id
|
|
|
- PayBaseAccount accounts = payBaseCustomerandmeterrelaMapper.getAccountId(loginUser.getSiteId(),loginUser.getCustomerId(),accountnumber);
|
|
|
+ PayBaseAccount accounts = payBaseCustomerandmeterrelaMapper.getAccountId(loginUser.getTenantId(),accountnumber);
|
|
|
//根据水表电子号寻找水表id
|
|
|
- PayBaseCustomerandmeterrela device = payBaseCustomerandmeterrelaMapper.getDeviceId(loginUser.getSiteId(),loginUser.getCustomerId(),metercode);
|
|
|
+ PayBaseCustomerandmeterrela device = payBaseCustomerandmeterrelaMapper.getDeviceId(loginUser.getTenantId(),metercode);
|
|
|
//根据用水性质名称寻找用水性质id
|
|
|
PayBaseCustomerandmeterrela property = payBaseCustomerandmeterrelaMapper.getWaterPropertyId(loginUser.getSiteId(),loginUser.getCustomerId(),propertyName);
|
|
|
List<PayControlRule> contollList = newArrayList();
|
|
|
if(StringUtils.isNotBlank(contollName)){
|
|
|
//根据阀控规则查找ID
|
|
|
- contollList =payControlRuleMapper.findList(null,contollName,customerId);
|
|
|
+ contollList =payControlRuleMapper.findList(null,contollName,loginUser.getTenantId());
|
|
|
if(contollList != null && contollList.size() > 0){
|
|
|
if(contollList.get(0).getConditionId() == 5){
|
|
|
//插入阀控记录
|
|
|
@@ -324,7 +324,7 @@ public class AsyncTaskImportService {
|
|
|
}
|
|
|
|
|
|
//判断客户是否销户后在开户
|
|
|
- PayBaseCustomerandmeterrela baseCustomer = payBaseCustomerandmeterrelaMapper.queryCancelInfo(loginUser.getSiteId(),loginUser.getCustomerId(),accountnumber,metercode);
|
|
|
+ PayBaseCustomerandmeterrela baseCustomer = payBaseCustomerandmeterrelaMapper.queryCancelInfo(loginUser.getTenantId(),accountnumber,metercode);
|
|
|
if(baseCustomer != null && baseCustomer.getBusinessstate() != 1){
|
|
|
//修改开户信息开户状态为已开户
|
|
|
customer.setId(baseCustomer.getId());
|
|
|
@@ -413,7 +413,7 @@ public class AsyncTaskImportService {
|
|
|
|
|
|
//计算可用水量
|
|
|
if(property.getWaterPropertyId() != null){
|
|
|
- Boolean flag = payBaseCustomerandmeterrelaService.UpdateAccountInfo(property.getWaterPropertyId(),accounts.getId(),null,loginUser.getSiteId(),loginUser.getCustomerId());
|
|
|
+ Boolean flag = payBaseCustomerandmeterrelaService.UpdateAccountInfo(property.getWaterPropertyId(),accounts.getId(),null,loginUser.getTenantId());
|
|
|
/*if (!flag){
|
|
|
throw new ServiceException(ResultStatus.PAY_ADD_CUSTOMER_UPDATEAMOUNT);
|
|
|
}*/
|
hym