合并远程分支，并处理冲突

xiaogang

2021-07-17 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f

合并远程分支，并处理冲突

 java110-bean/src/main/java/com/java110/dto/accountBond/AccountBondDto.java

New file
@@ -0,0 +1,90 @@
package com.java110.dto.accountBond;

import com.java110.dto.PageDto;
import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName FloorDto
 * @Description 保证金数据层封装
 * @Author wuxw
 * @Date 2019/4/24 8:52
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
public class AccountBondDto extends PageDto implements Serializable {

    private String amount;
private String bondId;
private String bondMonth;
private String bondType;
private String objId;
private String remark;
private String bondName;


    private Date createTime;

    private String statusCd = "0";


    public String getAmount() {
        return amount;
    }
public void setAmount(String amount) {
        this.amount = amount;
    }
public String getBondId() {
        return bondId;
    }
public void setBondId(String bondId) {
        this.bondId = bondId;
    }
public String getBondMonth() {
        return bondMonth;
    }
public void setBondMonth(String bondMonth) {
        this.bondMonth = bondMonth;
    }
public String getBondType() {
        return bondType;
    }
public void setBondType(String bondType) {
        this.bondType = bondType;
    }
public String getObjId() {
        return objId;
    }
public void setObjId(String objId) {
        this.objId = objId;
    }
public String getRemark() {
        return remark;
    }
public void setRemark(String remark) {
        this.remark = remark;
    }
public String getBondName() {
        return bondName;
    }
public void setBondName(String bondName) {
        this.bondName = bondName;
    }


    public Date getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }

    public String getStatusCd() {
        return statusCd;
    }

    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }
}

 java110-bean/src/main/java/com/java110/dto/accountBondObj/AccountBondObjDto.java

New file
@@ -0,0 +1,120 @@
package com.java110.dto.accountBondObj;

import com.java110.dto.PageDto;
import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName FloorDto
 * @Description 保证金对象数据层封装
 * @Author wuxw
 * @Date 2019/4/24 8:52
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
public class AccountBondObjDto extends PageDto implements Serializable {

    private String bondId;
private String bobjId;
private String objId;
private String objName;
private String bondType;
private String receivableAmount;
private String remark;
private String startTime;
private String receivedAmount;
private String state;
private String endTime;


    private Date createTime;

    private String statusCd = "0";


    public String getBondId() {
        return bondId;
    }
public void setBondId(String bondId) {
        this.bondId = bondId;
    }
public String getBobjId() {
        return bobjId;
    }
public void setBobjId(String bobjId) {
        this.bobjId = bobjId;
    }
public String getObjId() {
        return objId;
    }
public void setObjId(String objId) {
        this.objId = objId;
    }
public String getBondType() {
        return bondType;
    }
public void setBondType(String bondType) {
        this.bondType = bondType;
    }
public String getReceivableAmount() {
        return receivableAmount;
    }
public void setReceivableAmount(String receivableAmount) {
        this.receivableAmount = receivableAmount;
    }
public String getRemark() {
        return remark;
    }
public void setRemark(String remark) {
        this.remark = remark;
    }
public String getStartTime() {
        return startTime;
    }
public void setStartTime(String startTime) {
        this.startTime = startTime;
    }
public String getReceivedAmount() {
        return receivedAmount;
    }
public void setReceivedAmount(String receivedAmount) {
        this.receivedAmount = receivedAmount;
    }
public String getState() {
        return state;
    }
public void setState(String state) {
        this.state = state;
    }
public String getEndTime() {
        return endTime;
    }
public void setEndTime(String endTime) {
        this.endTime = endTime;
    }


    public Date getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }

    public String getStatusCd() {
        return statusCd;
    }

    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String getObjName() {
        return objName;
    }

    public void setObjName(String objName) {
        this.objName = objName;
    }
}

 java110-bean/src/main/java/com/java110/dto/accountBondObjDetail/AccountBondObjDetailDto.java

New file
@@ -0,0 +1,120 @@
package com.java110.dto.accountBondObjDetail;

import com.java110.dto.PageDto;
import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName FloorDto
 * @Description 保证金明细数据层封装
 * @Author wuxw
 * @Date 2019/4/24 8:52
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
public class AccountBondObjDetailDto extends PageDto implements Serializable {

    private String bobjId;
private String objId;
private String objName;
private String bondType;
private String detailId;
private String receivableAmount;
private String remark;
private String startTime;
private String receivedAmount;
private String state;
private String endTime;


    private Date createTime;

    private String statusCd = "0";


    public String getBobjId() {
        return bobjId;
    }
public void setBobjId(String bobjId) {
        this.bobjId = bobjId;
    }
public String getObjId() {
        return objId;
    }
public void setObjId(String objId) {
        this.objId = objId;
    }
public String getBondType() {
        return bondType;
    }
public void setBondType(String bondType) {
        this.bondType = bondType;
    }
public String getDetailId() {
        return detailId;
    }
public void setDetailId(String detailId) {
        this.detailId = detailId;
    }
public String getReceivableAmount() {
        return receivableAmount;
    }
public void setReceivableAmount(String receivableAmount) {
        this.receivableAmount = receivableAmount;
    }
public String getRemark() {
        return remark;
    }
public void setRemark(String remark) {
        this.remark = remark;
    }
public String getStartTime() {
        return startTime;
    }
public void setStartTime(String startTime) {
        this.startTime = startTime;
    }
public String getReceivedAmount() {
        return receivedAmount;
    }
public void setReceivedAmount(String receivedAmount) {
        this.receivedAmount = receivedAmount;
    }
public String getState() {
        return state;
    }
public void setState(String state) {
        this.state = state;
    }
public String getEndTime() {
        return endTime;
    }
public void setEndTime(String endTime) {
        this.endTime = endTime;
    }


    public Date getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }

    public String getStatusCd() {
        return statusCd;
    }

    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String getObjName() {
        return objName;
    }

    public void setObjName(String objName) {
        this.objName = objName;
    }
}

 java110-bean/src/main/java/com/java110/dto/activities/ActivitiesDto.java

@@ -28,6 +28,7 @@
    private String context;
    private String startTime;
    private String endTime;
    private String endTimeFlag;
    private String communityId;
    private String headerImg;
    private String state;
@@ -133,6 +134,14 @@
        this.endTime = endTime;
    }

    public String getEndTimeFlag() {
        return endTimeFlag;
    }

    public void setEndTimeFlag(String endTimeFlag) {
        this.endTimeFlag = endTimeFlag;
    }

    public String getCommunityId() {
        return communityId;
    }

 java110-bean/src/main/java/com/java110/dto/advert/AdvertDto.java

@@ -36,6 +36,8 @@
    private String roomNum;
    private String bId;
    private String viewType ;
    private String advertType ;
    private String pageUrl ;


    private String createTime;
@@ -233,4 +235,20 @@
    public void setViewType(String viewType) {
        this.viewType = viewType;
    }

    public String getAdvertType() {
        return advertType;
    }

    public void setAdvertType(String advertType) {
        this.advertType = advertType;
    }

    public String getPageUrl() {
        return pageUrl;
    }

    public void setPageUrl(String pageUrl) {
        this.pageUrl = pageUrl;
    }
}

 java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDetailDto.java

@@ -30,6 +30,8 @@
    private String squarePrice;
    private String remark;
    private String feeFlag;
    private String preDegrees;
    private String curDegrees;


    private Date createTime;
@@ -173,4 +175,20 @@
    public void setDetailIds(String[] detailIds) {
        this.detailIds = detailIds;
    }

    public String getPreDegrees() {
        return preDegrees;
    }

    public void setPreDegrees(String preDegrees) {
        this.preDegrees = preDegrees;
    }

    public String getCurDegrees() {
        return curDegrees;
    }

    public void setCurDegrees(String curDegrees) {
        this.curDegrees = curDegrees;
    }
}

 java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java

@@ -94,6 +94,8 @@

    private String remark;

    private String isNow;


    private Date createTime;

@@ -255,4 +257,12 @@
    public void setMachineName(String machineName) {
        this.machineName = machineName;
    }

    public String getIsNow() {
        return isNow;
    }

    public void setIsNow(String isNow) {
        this.isNow = isNow;
    }
}

 java110-bean/src/main/java/com/java110/dto/owner/OwnerAttrDto.java

@@ -15,6 +15,8 @@
 **/
public class OwnerAttrDto extends PageDto implements Serializable {

    public static final String SPEC_CD_MACHINE_OPEN_COUNT = "7967001983";

    private String attrId;
    private String specCd;
    private String communityId;

 java110-bean/src/main/java/com/java110/po/accountBond/AccountBondPo.java

New file
@@ -0,0 +1,67 @@
package com.java110.po.accountBond;

import java.io.Serializable;
import java.util.Date;

public class AccountBondPo implements Serializable {

    private String amount;
private String bondId;
private String bondMonth;
private String bondType;
private String objId;
private String remark;
private String statusCd = "0";
private String bondName;
public String getAmount() {
        return amount;
    }
public void setAmount(String amount) {
        this.amount = amount;
    }
public String getBondId() {
        return bondId;
    }
public void setBondId(String bondId) {
        this.bondId = bondId;
    }
public String getBondMonth() {
        return bondMonth;
    }
public void setBondMonth(String bondMonth) {
        this.bondMonth = bondMonth;
    }
public String getBondType() {
        return bondType;
    }
public void setBondType(String bondType) {
        this.bondType = bondType;
    }
public String getObjId() {
        return objId;
    }
public void setObjId(String objId) {
        this.objId = objId;
    }
public String getRemark() {
        return remark;
    }
public void setRemark(String remark) {
        this.remark = remark;
    }
public String getStatusCd() {
        return statusCd;
    }
public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }
public String getBondName() {
        return bondName;
    }
public void setBondName(String bondName) {
        this.bondName = bondName;
    }



}

 java110-bean/src/main/java/com/java110/po/accountBondObj/AccountBondObjPo.java

New file
@@ -0,0 +1,94 @@
package com.java110.po.accountBondObj;

import java.io.Serializable;
import java.util.Date;

public class AccountBondObjPo implements Serializable {

    private String bondId;
private String bobjId;
private String objId;
private String objName;
private String bondType;
private String receivableAmount;
private String remark;
private String startTime;
private String statusCd = "0";
private String receivedAmount;
private String state;
private String endTime;
public String getBondId() {
        return bondId;
    }
public void setBondId(String bondId) {
        this.bondId = bondId;
    }
public String getBobjId() {
        return bobjId;
    }
public void setBobjId(String bobjId) {
        this.bobjId = bobjId;
    }
public String getObjId() {
        return objId;
    }
public void setObjId(String objId) {
        this.objId = objId;
    }
public String getBondType() {
        return bondType;
    }
public void setBondType(String bondType) {
        this.bondType = bondType;
    }
public String getReceivableAmount() {
        return receivableAmount;
    }
public void setReceivableAmount(String receivableAmount) {
        this.receivableAmount = receivableAmount;
    }
public String getRemark() {
        return remark;
    }
public void setRemark(String remark) {
        this.remark = remark;
    }
public String getStartTime() {
        return startTime;
    }
public void setStartTime(String startTime) {
        this.startTime = startTime;
    }
public String getStatusCd() {
        return statusCd;
    }
public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }
public String getReceivedAmount() {
        return receivedAmount;
    }
public void setReceivedAmount(String receivedAmount) {
        this.receivedAmount = receivedAmount;
    }
public String getState() {
        return state;
    }
public void setState(String state) {
        this.state = state;
    }
public String getEndTime() {
        return endTime;
    }
public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public String getObjName() {
        return objName;
    }

    public void setObjName(String objName) {
        this.objName = objName;
    }
}

 java110-bean/src/main/java/com/java110/po/accountBondObjDetail/AccountBondObjDetailPo.java

New file
@@ -0,0 +1,94 @@
package com.java110.po.accountBondObjDetail;

import java.io.Serializable;
import java.util.Date;

public class AccountBondObjDetailPo implements Serializable {

    private String bobjId;
private String objId;
private String objName;
private String bondType;
private String detailId;
private String receivableAmount;
private String remark;
private String startTime;
private String statusCd = "0";
private String receivedAmount;
private String state;
private String endTime;
public String getBobjId() {
        return bobjId;
    }
public void setBobjId(String bobjId) {
        this.bobjId = bobjId;
    }
public String getObjId() {
        return objId;
    }
public void setObjId(String objId) {
        this.objId = objId;
    }
public String getBondType() {
        return bondType;
    }
public void setBondType(String bondType) {
        this.bondType = bondType;
    }
public String getDetailId() {
        return detailId;
    }
public void setDetailId(String detailId) {
        this.detailId = detailId;
    }
public String getReceivableAmount() {
        return receivableAmount;
    }
public void setReceivableAmount(String receivableAmount) {
        this.receivableAmount = receivableAmount;
    }
public String getRemark() {
        return remark;
    }
public void setRemark(String remark) {
        this.remark = remark;
    }
public String getStartTime() {
        return startTime;
    }
public void setStartTime(String startTime) {
        this.startTime = startTime;
    }
public String getStatusCd() {
        return statusCd;
    }
public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }
public String getReceivedAmount() {
        return receivedAmount;
    }
public void setReceivedAmount(String receivedAmount) {
        this.receivedAmount = receivedAmount;
    }
public String getState() {
        return state;
    }
public void setState(String state) {
        this.state = state;
    }
public String getEndTime() {
        return endTime;
    }
public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public String getObjName() {
        return objName;
    }

    public void setObjName(String objName) {
        this.objName = objName;
    }
}

 java110-bean/src/main/java/com/java110/po/advert/AdvertPo.java

@@ -25,7 +25,8 @@
    private String endTime;
    private String createTime;
    private String viewType;

    private String advertType ;
    private String pageUrl ;

    public String getAdvertId() {
        return advertId;
@@ -130,4 +131,20 @@
    public void setViewType(String viewType) {
        this.viewType = viewType;
    }

    public String getAdvertType() {
        return advertType;
    }

    public void setAdvertType(String advertType) {
        this.advertType = advertType;
    }

    public String getPageUrl() {
        return pageUrl;
    }

    public void setPageUrl(String pageUrl) {
        this.pageUrl = pageUrl;
    }
}

 java110-bean/src/main/java/com/java110/po/machine/MachineRecordPo.java

@@ -28,6 +28,7 @@
    private String resOrderType;
    private String noticeState;
    private String auditMessage;
    private String similar;

    public String getMachineRecordId() {
        return machineRecordId;
@@ -156,4 +157,12 @@
    public void setAuditMessage(String auditMessage) {
        this.auditMessage = auditMessage;
    }

    public String getSimilar() {
        return similar;
    }

    public void setSimilar(String similar) {
        this.similar = similar;
    }
}

 java110-bean/src/main/java/com/java110/vo/api/advert/ApiAdvertDataVo.java

@@ -27,6 +27,8 @@
    private String createTime;

    private String viewType;
    private String advertType ;
    private String pageUrl ;


    public String getAdvertId() {
@@ -196,4 +198,20 @@
    public void setViewType(String viewType) {
        this.viewType = viewType;
    }

    public String getAdvertType() {
        return advertType;
    }

    public void setAdvertType(String advertType) {
        this.advertType = advertType;
    }

    public String getPageUrl() {
        return pageUrl;
    }

    public void setPageUrl(String pageUrl) {
        this.pageUrl = pageUrl;
    }
}

 java110-core/src/main/java/com/java110/core/base/controller/BaseController.java

@@ -129,7 +129,8 @@

        headers.put("IP", getIpAddr(request));

        headers.put("hostName", request.getLocalName());
        //headers.put("hostName", request.getLocalName()); 这里导致部分主机 速度比较慢
        headers.put("hostName", "localhost");
        headers.put("port", request.getLocalPort() + "");

        //处理app-id

 java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -207,6 +207,8 @@
    public static final String CODE_PREFIX_rssId = "33";
    public static final String CODE_PREFIX_pfId = "34";
    public static final String CODE_PREFIX_bankId = "74";
    public static final String CODE_PREFIX_bondId = "76";
    public static final String CODE_PREFIX_bobjId = "77";




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

@@ -350,6 +350,66 @@
                    feeReceiptDetailPo.setSquarePrice(feeDto.getMwPrice() + "/" + feeDto.getAdditionalAmount());
                }
            } else {

            }
        } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeDto.getPayerObjType())) {//车位相关
            String computingFormula = feeDto.getComputingFormula();
            ContractRoomDto contractRoomDto = new ContractRoomDto();
            contractRoomDto.setContractId(feeDto.getPayerObjId());
            contractRoomDto.setCommunityId(feeDto.getCommunityId());
            List<ContractRoomDto> contractRoomDtos = contractRoomInnerServiceSMOImpl.queryContractRooms(contractRoomDto);
            if (contractRoomDtos == null || contractRoomDtos.size() == 0) {
                feeReceiptDetailPo.setArea("");
                feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
                return;
            }
            if ("1001".equals(computingFormula)) { //面积*单价+附加费
                BigDecimal builtUpArea = new BigDecimal(0);
                for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
                    builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getBuiltUpArea())));
                }
                feeReceiptDetailPo.setArea(builtUpArea.doubleValue() + "");
                feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
            } else if ("2002".equals(computingFormula)) { // 固定费用
                feeReceiptDetailPo.setArea("");
                feeReceiptDetailPo.setSquarePrice(feeDto.getAdditionalAmount());
            } else if ("4004".equals(computingFormula)) {
            } else if ("5005".equals(computingFormula)) {
                if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
                } else {
                    BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
                    BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
                    BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                    feeReceiptDetailPo.setArea(sub.doubleValue() + "");
                    feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
                }
            } else if ("6006".equals(computingFormula)) {
                String value = "";
                List<FeeAttrDto> feeAttrDtos = feeDto.getFeeAttrDtos();
                for (FeeAttrDto feeAttrDto : feeAttrDtos) {
                    if (feeAttrDto.getSpecCd().equals(FeeAttrDto.SPEC_CD_PROXY_CONSUMPTION)) {
                        value = feeAttrDto.getValue();
                    }
                }
                feeReceiptDetailPo.setArea(value);
                feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
            } else if ("7007".equals(computingFormula)) { //自定义公式
                BigDecimal builtUpArea = new BigDecimal(0);
                for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
                    builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getBuiltUpArea())));
                }
                feeReceiptDetailPo.setArea(builtUpArea.doubleValue() + "");
                feeReceiptDetailPo.setSquarePrice(feeDto.getComputingFormulaText());
            } else if ("9009".equals(computingFormula)) {
                if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
                } else {
                    BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
                    BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
                    BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                    feeReceiptDetailPo.setArea(sub.doubleValue() + "");
                    feeReceiptDetailPo.setSquarePrice(feeDto.getMwPrice() + "/" + feeDto.getAdditionalAmount());
                }
            } else {
            }
        }
    }
@@ -1140,22 +1200,22 @@
            Date startDate = feeDto.getStartTime();
            //到期时间
            Date endDate = feeDto.getEndTime();
            if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
                if (ownerCarDto == null) {
                    targetEndDateAndOweMonth.put("oweMonth", 0);
                    targetEndDateAndOweMonth.put("targetEndDate", "");
                    return targetEndDateAndOweMonth;
                }
                targetEndDate = ownerCarDto.getEndTime();
                //说明没有欠费
                if (endDate.getTime() >= targetEndDate.getTime()) {
                    // 目标到期时间 - 到期时间 = 欠费月份
                    oweMonth = 0;
                    targetEndDateAndOweMonth.put("oweMonth", oweMonth);
                    targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
                    return targetEndDateAndOweMonth;
                }
            }
//            if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
//                if (ownerCarDto == null) {
//                    targetEndDateAndOweMonth.put("oweMonth", 0);
//                    targetEndDateAndOweMonth.put("targetEndDate", "");
//                    return targetEndDateAndOweMonth;
//                }
//                targetEndDate = ownerCarDto.getEndTime();
//                //说明没有欠费
//                if (endDate.getTime() >= targetEndDate.getTime()) {
//                    // 目标到期时间 - 到期时间 = 欠费月份
//                    oweMonth = 0;
//                    targetEndDateAndOweMonth.put("oweMonth", oweMonth);
//                    targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
//                    return targetEndDateAndOweMonth;
//                }
//            }

            //缴费周期
            long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
@@ -1194,13 +1254,13 @@

    public Map getTargetEndDateAndOweMonth(FeeDto feeDto) {

        if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
            OwnerCarDto ownerCarDto = new OwnerCarDto();
            ownerCarDto.setCommunityId(feeDto.getCommunityId());
            ownerCarDto.setCarId(feeDto.getPayerObjId());
            List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
            return getTargetEndDateAndOweMonth(feeDto, ownerCarDtos == null || ownerCarDtos.size() < 1 ? null : ownerCarDtos.get(0));
        }
//        if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
//            OwnerCarDto ownerCarDto = new OwnerCarDto();
//            ownerCarDto.setCommunityId(feeDto.getCommunityId());
//            ownerCarDto.setCarId(feeDto.getPayerObjId());
//            List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
//            return getTargetEndDateAndOweMonth(feeDto, ownerCarDtos == null || ownerCarDtos.size() < 1 ? null : ownerCarDtos.get(0));
//        }
        return getTargetEndDateAndOweMonth(feeDto, null);
    }


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

New file
@@ -0,0 +1,165 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="accountBondObjDetailServiceDaoImpl">





    <!-- 保存保证金明细信息 add by wuxw 2018-07-03 -->
    <insert id="saveAccountBondObjDetailInfo" parameterType="Map">
        insert into account_bond_obj_detail(
bobj_id,obj_id,bond_type,detail_id,receivable_amount,remark,start_time,received_amount,state,end_time,obj_name
) values (
#{bobjId},#{objId},#{bondType},#{detailId},#{receivableAmount},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime},#{objName}
)
    </insert>



    <!-- 查询保证金明细信息 add by wuxw 2018-07-03 -->
    <select id="getAccountBondObjDetailInfo" parameterType="Map" resultType="Map">
        select  t.bobj_id,t.bobj_id bobjId,t.create_time,t.create_time createTime,t.obj_id,t.obj_id objId,t.bond_type,t.bond_type bondType,
        t.detail_id,t.detail_id detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,t.start_time,t.start_time startTime,
        t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.state,t.end_time,t.end_time endTime,t.obj_name objName
from account_bond_obj_detail t 
where 1 =1 
<if test="bobjId !=null and bobjId != ''">
   and t.bobj_id= #{bobjId}
</if> 
<if test="createTime !=null and createTime != ''">
   and t.create_time= #{createTime}
</if> 
<if test="objId !=null and objId != ''">
   and t.obj_id= #{objId}
</if> 
<if test="bondType !=null and bondType != ''">
   and t.bond_type= #{bondType}
</if> 
<if test="detailId !=null and detailId != ''">
   and t.detail_id= #{detailId}
</if> 
<if test="receivableAmount !=null and receivableAmount != ''">
   and t.receivable_amount= #{receivableAmount}
</if> 
<if test="remark !=null and remark != ''">
   and t.remark= #{remark}
</if> 
<if test="startTime !=null and startTime != ''">
   and t.start_time= #{startTime}
</if> 
<if test="statusCd !=null and statusCd != ''">
   and t.status_cd= #{statusCd}
</if> 
<if test="receivedAmount !=null and receivedAmount != ''">
   and t.received_amount= #{receivedAmount}
</if> 
<if test="state !=null and state != ''">
   and t.state= #{state}
</if> 
<if test="endTime !=null and endTime != ''">
   and t.end_time= #{endTime}
</if> 
order by t.create_time desc
<if test="page != -1 and page != null ">
   limit #{page}, #{row}
</if> 

    </select>




    <!-- 修改保证金明细信息 add by wuxw 2018-07-03 -->
    <update id="updateAccountBondObjDetailInfo" parameterType="Map">
        update  account_bond_obj_detail t set t.status_cd = #{statusCd}
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if> 
<if test="bobjId !=null and bobjId != ''">
, t.bobj_id= #{bobjId}
</if> 
<if test="createTime !=null and createTime != ''">
, t.create_time= #{createTime}
</if> 
<if test="objId !=null and objId != ''">
, t.obj_id= #{objId}
</if>
        <if test="objName !=null and objName != ''">
            , t.obj_name= #{objName}
        </if>
        <if test="bondType !=null and bondType != ''">
, t.bond_type= #{bondType}
</if> 
<if test="receivableAmount !=null and receivableAmount != ''">
, t.receivable_amount= #{receivableAmount}
</if> 
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
</if> 
<if test="startTime !=null and startTime != ''">
, t.start_time= #{startTime}
</if> 
<if test="receivedAmount !=null and receivedAmount != ''">
, t.received_amount= #{receivedAmount}
</if> 
<if test="state !=null and state != ''">
, t.state= #{state}
</if> 
<if test="endTime !=null and endTime != ''">
, t.end_time= #{endTime}
</if> 
 where 1=1 <if test="detailId !=null and detailId != ''">
and t.detail_id= #{detailId}
</if> 

    </update>

    <!-- 查询保证金明细数量 add by wuxw 2018-07-03 -->
     <select id="queryAccountBondObjDetailsCount" parameterType="Map" resultType="Map">
        select  count(1) count 
from account_bond_obj_detail t 
where 1 =1 
<if test="bobjId !=null and bobjId != ''">
   and t.bobj_id= #{bobjId}
</if> 
<if test="createTime !=null and createTime != ''">
   and t.create_time= #{createTime}
</if> 
<if test="objId !=null and objId != ''">
   and t.obj_id= #{objId}
</if> 
<if test="bondType !=null and bondType != ''">
   and t.bond_type= #{bondType}
</if> 
<if test="detailId !=null and detailId != ''">
   and t.detail_id= #{detailId}
</if> 
<if test="receivableAmount !=null and receivableAmount != ''">
   and t.receivable_amount= #{receivableAmount}
</if> 
<if test="remark !=null and remark != ''">
   and t.remark= #{remark}
</if> 
<if test="startTime !=null and startTime != ''">
   and t.start_time= #{startTime}
</if> 
<if test="statusCd !=null and statusCd != ''">
   and t.status_cd= #{statusCd}
</if> 
<if test="receivedAmount !=null and receivedAmount != ''">
   and t.received_amount= #{receivedAmount}
</if> 
<if test="state !=null and state != ''">
   and t.state= #{state}
</if> 
<if test="endTime !=null and endTime != ''">
   and t.end_time= #{endTime}
</if> 


     </select>

</mapper>

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

New file
@@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="accountBondObjServiceDaoImpl">





    <!-- 保存保证金对象信息 add by wuxw 2018-07-03 -->
    <insert id="saveAccountBondObjInfo" parameterType="Map">
        insert into account_bond_obj(
bond_id,bobj_id,obj_id,bond_type,receivable_amount,remark,start_time,received_amount,state,end_time,obj_name
) values (
#{bondId},#{bobjId},#{objId},#{bondType},#{receivableAmount},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime},#{objName}
)
    </insert>



    <!-- 查询保证金对象信息 add by wuxw 2018-07-03 -->
    <select id="getAccountBondObjInfo" parameterType="Map" resultType="Map">
        select  t.bond_id,t.bond_id bondId,t.bobj_id,t.bobj_id bobjId,t.create_time,t.create_time createTime,t.obj_id,
        t.obj_id objId,t.bond_type,t.bond_type bondType,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,
        t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
        t.state,t.end_time,t.end_time endTime,t.obj_name objName
from account_bond_obj t 
where 1 =1 
<if test="bondId !=null and bondId != ''">
   and t.bond_id= #{bondId}
</if> 
<if test="bobjId !=null and bobjId != ''">
   and t.bobj_id= #{bobjId}
</if> 
<if test="createTime !=null and createTime != ''">
   and t.create_time= #{createTime}
</if> 
<if test="objId !=null and objId != ''">
   and t.obj_id= #{objId}
</if>
        <if test="objName !=null and objName != ''">
            and t.obj_name= #{objName}
        </if>
        <if test="bondType !=null and bondType != ''">
   and t.bond_type= #{bondType}
</if> 
<if test="receivableAmount !=null and receivableAmount != ''">
   and t.receivable_amount= #{receivableAmount}
</if> 
<if test="remark !=null and remark != ''">
   and t.remark= #{remark}
</if> 
<if test="startTime !=null and startTime != ''">
   and t.start_time= #{startTime}
</if> 
<if test="statusCd !=null and statusCd != ''">
   and t.status_cd= #{statusCd}
</if> 
<if test="receivedAmount !=null and receivedAmount != ''">
   and t.received_amount= #{receivedAmount}
</if> 
<if test="state !=null and state != ''">
   and t.state= #{state}
</if> 
<if test="endTime !=null and endTime != ''">
   and t.end_time= #{endTime}
</if> 
order by t.create_time desc
<if test="page != -1 and page != null ">
   limit #{page}, #{row}
</if> 

    </select>




    <!-- 修改保证金对象信息 add by wuxw 2018-07-03 -->
    <update id="updateAccountBondObjInfo" parameterType="Map">
        update  account_bond_obj t set t.status_cd = #{statusCd}
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if> 
<if test="bondId !=null and bondId != ''">
, t.bond_id= #{bondId}
</if> 
<if test="createTime !=null and createTime != ''">
, t.create_time= #{createTime}
</if> 
<if test="objId !=null and objId != ''">
, t.obj_id= #{objId}
</if>
        <if test="objName !=null and objName != ''">
            , t.obj_name= #{objName}
        </if>
        <if test="bondType !=null and bondType != ''">
, t.bond_type= #{bondType}
</if> 
<if test="receivableAmount !=null and receivableAmount != ''">
, t.receivable_amount= #{receivableAmount}
</if> 
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
</if> 
<if test="startTime !=null and startTime != ''">
, t.start_time= #{startTime}
</if> 
<if test="receivedAmount !=null and receivedAmount != ''">
, t.received_amount= #{receivedAmount}
</if> 
<if test="state !=null and state != ''">
, t.state= #{state}
</if> 
<if test="endTime !=null and endTime != ''">
, t.end_time= #{endTime}
</if> 
 where 1=1 <if test="bobjId !=null and bobjId != ''">
and t.bobj_id= #{bobjId}
</if> 

    </update>

    <!-- 查询保证金对象数量 add by wuxw 2018-07-03 -->
     <select id="queryAccountBondObjsCount" parameterType="Map" resultType="Map">
        select  count(1) count 
from account_bond_obj t 
where 1 =1 
<if test="bondId !=null and bondId != ''">
   and t.bond_id= #{bondId}
</if> 
<if test="bobjId !=null and bobjId != ''">
   and t.bobj_id= #{bobjId}
</if> 
<if test="createTime !=null and createTime != ''">
   and t.create_time= #{createTime}
</if> 
<if test="objId !=null and objId != ''">
   and t.obj_id= #{objId}
</if> 
<if test="bondType !=null and bondType != ''">
   and t.bond_type= #{bondType}
</if> 
<if test="receivableAmount !=null and receivableAmount != ''">
   and t.receivable_amount= #{receivableAmount}
</if> 
<if test="remark !=null and remark != ''">
   and t.remark= #{remark}
</if> 
<if test="startTime !=null and startTime != ''">
   and t.start_time= #{startTime}
</if> 
<if test="statusCd !=null and statusCd != ''">
   and t.status_cd= #{statusCd}
</if> 
<if test="receivedAmount !=null and receivedAmount != ''">
   and t.received_amount= #{receivedAmount}
</if> 
<if test="state !=null and state != ''">
   and t.state= #{state}
</if> 
<if test="endTime !=null and endTime != ''">
   and t.end_time= #{endTime}
</if> 


     </select>

</mapper>

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

New file
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="accountBondServiceDaoImpl">





    <!-- 保存保证金信息 add by wuxw 2018-07-03 -->
    <insert id="saveAccountBondInfo" parameterType="Map">
        insert into account_bond(
amount,bond_id,bond_month,bond_type,obj_id,remark,bond_name
) values (
#{amount},#{bondId},#{bondMonth},#{bondType},#{objId},#{remark},#{bondName}
)
    </insert>



    <!-- 查询保证金信息 add by wuxw 2018-07-03 -->
    <select id="getAccountBondInfo" parameterType="Map" resultType="Map">
        select  t.amount,t.bond_id,t.bond_id bondId,t.bond_month,t.bond_month bondMonth,t.create_time,t.create_time createTime,t.bond_type,t.bond_type bondType,t.obj_id,t.obj_id objId,t.remark,t.status_cd,t.status_cd statusCd,t.bond_name,t.bond_name bondName 
from account_bond t 
where 1 =1 
<if test="amount !=null and amount != ''">
   and t.amount= #{amount}
</if> 
<if test="bondId !=null and bondId != ''">
   and t.bond_id= #{bondId}
</if> 
<if test="bondMonth !=null and bondMonth != ''">
   and t.bond_month= #{bondMonth}
</if> 
<if test="createTime !=null and createTime != ''">
   and t.create_time= #{createTime}
</if> 
<if test="bondType !=null and bondType != ''">
   and t.bond_type= #{bondType}
</if> 
<if test="objId !=null and objId != ''">
   and t.obj_id= #{objId}
</if> 
<if test="remark !=null and remark != ''">
   and t.remark= #{remark}
</if> 
<if test="statusCd !=null and statusCd != ''">
   and t.status_cd= #{statusCd}
</if> 
<if test="bondName !=null and bondName != ''">
   and t.bond_name= #{bondName}
</if> 
order by t.create_time desc
<if test="page != -1 and page != null ">
   limit #{page}, #{row}
</if> 

    </select>




    <!-- 修改保证金信息 add by wuxw 2018-07-03 -->
    <update id="updateAccountBondInfo" parameterType="Map">
        update  account_bond t set t.status_cd = #{statusCd}
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if> 
<if test="amount !=null and amount != ''">
, t.amount= #{amount}
</if> 
<if test="bondMonth !=null and bondMonth != ''">
, t.bond_month= #{bondMonth}
</if> 
<if test="createTime !=null and createTime != ''">
, t.create_time= #{createTime}
</if> 
<if test="bondType !=null and bondType != ''">
, t.bond_type= #{bondType}
</if> 
<if test="objId !=null and objId != ''">
, t.obj_id= #{objId}
</if> 
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
</if> 
<if test="bondName !=null and bondName != ''">
, t.bond_name= #{bondName}
</if> 
 where 1=1 <if test="bondId !=null and bondId != ''">
and t.bond_id= #{bondId}
</if> 

    </update>

    <!-- 查询保证金数量 add by wuxw 2018-07-03 -->
     <select id="queryAccountBondsCount" parameterType="Map" resultType="Map">
        select  count(1) count 
from account_bond t 
where 1 =1 
<if test="amount !=null and amount != ''">
   and t.amount= #{amount}
</if> 
<if test="bondId !=null and bondId != ''">
   and t.bond_id= #{bondId}
</if> 
<if test="bondMonth !=null and bondMonth != ''">
   and t.bond_month= #{bondMonth}
</if> 
<if test="createTime !=null and createTime != ''">
   and t.create_time= #{createTime}
</if> 
<if test="bondType !=null and bondType != ''">
   and t.bond_type= #{bondType}
</if> 
<if test="objId !=null and objId != ''">
   and t.obj_id= #{objId}
</if> 
<if test="remark !=null and remark != ''">
   and t.remark= #{remark}
</if> 
<if test="statusCd !=null and statusCd != ''">
   and t.status_cd= #{statusCd}
</if> 
<if test="bondName !=null and bondName != ''">
   and t.bond_name= #{bondName}
</if> 


     </select>

</mapper>

 java110-db/src/main/resources/mapper/common/AdvertServiceDaoImplMapper.xml

@@ -6,9 +6,9 @@

    <!-- 保存广告信息信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessAdvertInfo" parameterType="Map">
    insert into business_advert(classify,ad_name,location_type_cd,ad_type_cd,advert_id,operate,start_time,state,end_time,community_id,b_id,location_obj_id,seq,view_type)
    insert into business_advert(classify,ad_name,location_type_cd,ad_type_cd,advert_id,operate,start_time,state,end_time,community_id,b_id,location_obj_id,seq,view_type,advert_type,page_url)
    values
    (#{classify},#{adName},#{locationTypeCd},#{adTypeCd},#{advertId},#{operate},#{startTime},#{state},#{endTime},#{communityId},#{bId},#{locationObjId},#{seq},#{viewType})
    (#{classify},#{adName},#{locationTypeCd},#{adTypeCd},#{advertId},#{operate},#{startTime},#{state},#{endTime},#{communityId},#{bId},#{locationObjId},#{seq},#{viewType},#{advertType},#{pageUrl})
    </insert>

    <!-- 查询广告信息信息（Business） add by wuxw 2018-07-03 -->
@@ -17,7 +17,7 @@
        locationTypeCd,t.ad_type_cd,t.ad_type_cd adTypeCd,t.advert_id,t.advert_id
        advertId,t.operate,t.start_time,t.start_time startTime,t.state,t.end_time,t.end_time
        endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.location_obj_id,t.location_obj_id
        locationObjId,t.seq,t.view_type,t.view_type viewType
        locationObjId,t.seq,t.view_type,t.view_type viewType,t.advert_type,t.advert_type advertType,t.page_url,t.page_url pageUrl
        from business_advert t
        where 1 =1
        <if test="classify !=null and classify != ''">
@@ -56,6 +56,12 @@
        <if test="locationObjId !=null and locationObjId != ''">
            and t.location_obj_id= #{locationObjId}
        </if>
        <if test="advertType !=null and advertType != ''">
            and t.advert_type = #{advertType}
        </if>
        <if test="pageUrl !=null and pageUrl != ''">
            and t.page_url= #{pageUrl}
        </if>
        <if test="seq !=null and seq != ''">
            and t.seq= #{seq}
        </if>
@@ -64,9 +70,9 @@
    <!-- 保存广告信息信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveAdvertInfoInstance" parameterType="Map">
        insert into advert(
        classify,ad_name,location_type_cd,status_cd,ad_type_cd,advert_id,start_time,state,end_time,community_id,b_id,location_obj_id,seq,view_type
        classify,ad_name,location_type_cd,status_cd,ad_type_cd,advert_id,start_time,state,end_time,community_id,b_id,location_obj_id,seq,view_type,advert_type,page_url
        ) select
        t.classify,t.ad_name,t.location_type_cd,'0',t.ad_type_cd,t.advert_id,t.start_time,t.state,t.end_time,t.community_id,t.b_id,t.location_obj_id,t.seq,t.view_type
        t.classify,t.ad_name,t.location_type_cd,'0',t.ad_type_cd,t.advert_id,t.start_time,t.state,t.end_time,t.community_id,t.b_id,t.location_obj_id,t.seq,t.view_type,t.advert_type,t.page_url
        from business_advert t where 1=1
        <if test="classify !=null and classify != ''">
            and t.classify= #{classify}
@@ -101,6 +107,12 @@
        </if>
        <if test="locationObjId !=null and locationObjId != ''">
            and t.location_obj_id= #{locationObjId}
        </if>
        <if test="advertType !=null and advertType != ''">
            and t.advert_type = #{advertType}
        </if>
        <if test="pageUrl !=null and pageUrl != ''">
            and t.page_url= #{pageUrl}
        </if>
        <if test="seq !=null and seq != ''">
            and t.seq= #{seq}
@@ -146,6 +158,12 @@
        <if test="viewType != null and viewType != ''">
            , t.view_type = #{viewType}
        </if>
        <if test="advertType !=null and advertType != ''">
            , t.advert_type = #{advertType}
        </if>
        <if test="pageUrl !=null and pageUrl != ''">
            , t.page_url= #{pageUrl}
        </if>
        where 1=1
        <if test="advertId !=null and advertId != ''">
            and t.advert_id= #{advertId}
@@ -161,7 +179,7 @@
        locationTypeCd,t.status_cd,t.status_cd statusCd,t.ad_type_cd,t.ad_type_cd adTypeCd,t.advert_id,t.advert_id
        advertId,t.start_time,t.start_time startTime,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id
        communityId,t.b_id,t.b_id bId,t.location_obj_id,t.location_obj_id locationObjId,t.seq,td1.name
        classifyName,td2.name stateName,t.create_time createTime,td3.name locationObjName,t.view_type,t.view_type viewType
        classifyName,td2.name stateName,t.create_time createTime,td3.name locationObjName,t.view_type,t.view_type viewType,t.advert_type,t.advert_type advertType,t.page_url,t.page_url pageUrl
        from advert t
        left join t_dict td1 on  t.classify = td1.status_cd and td1.table_name = 'advert' and td1.table_columns = 'classify'
        left join t_dict td2 on t.state = td2.status_cd and td2.table_name = 'advert' and td2.table_columns = 'state'
@@ -209,6 +227,12 @@
        <if test="viewType != null and viewType != ''">
            and t.view_type = #{viewType}
        </if>
        <if test="advertType !=null and advertType != ''">
            and t.advert_type = #{advertType}
        </if>
        <if test="pageUrl !=null and pageUrl != ''">
            and t.page_url= #{pageUrl}
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
@@ -250,6 +274,12 @@
        </if>
        <if test="viewType != null and viewType != ''">
            , t.view_type = #{viewType}
        </if>
        <if test="advertType !=null and advertType != ''">
            ,  t.advert_type = #{advertType}
        </if>
        <if test="pageUrl !=null and pageUrl != ''">
            ,  t.page_url= #{pageUrl}
        </if>
        where 1=1
        <if test="advertId !=null and advertId != ''">
@@ -301,6 +331,12 @@
        <if test="seq !=null and seq != ''">
            and t.seq= #{seq}
        </if>
        <if test="advertType !=null and advertType != ''">
            and t.advert_type = #{advertType}
        </if>
        <if test="pageUrl !=null and pageUrl != ''">
            and t.page_url= #{pageUrl}
        </if>
        <if test="viewType != null and viewType != ''">
            and t.view_type = #{viewType}
        </if>

 java110-db/src/main/resources/mapper/common/MachineRecordServiceDaoImplMapper.xml

@@ -7,10 +7,10 @@
    <!-- 保存设备上报信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessMachineRecordInfo" parameterType="Map">
        insert into business_machine_record(
        file_time,machine_code,open_type_cd,id_card,machine_record_id,machine_id,operate,`name`,tel,community_id,b_id,file_id,record_type_cd
        file_time,machine_code,open_type_cd,id_card,machine_record_id,machine_id,operate,`name`,tel,community_id,b_id,file_id,record_type_cd,similar
        ) values (
        #{fileTime},#{machineCode},#{openTypeCd},#{idCard},#{machineRecordId},#{machineId},#{operate},#{name},#{tel},#{communityId},#{bId},#{fileId}
        ,#{recordTypeCd}
        ,#{recordTypeCd},#{similar}
        )
    </insert>

@@ -20,7 +20,7 @@
        select t.file_time,t.file_time fileTime,t.machine_code,t.machine_code machineCode,t.open_type_cd,t.open_type_cd
        openTypeCd,t.id_card,t.id_card idCard,t.machine_record_id,t.machine_record_id
        machineRecordId,t.machine_id,t.machine_id machineId,t.operate,t.name,t.tel,t.community_id,t.community_id
        communityId,t.b_id,t.b_id bId,t.file_id,t.file_id fileId,t.record_type_cd,t.record_type_cd recordTypeCd
        communityId,t.b_id,t.b_id bId,t.file_id,t.file_id fileId,t.record_type_cd,t.record_type_cd recordTypeCd,t.similar
        from business_machine_record t
        where 1 =1
        <if test="fileTime !=null and fileTime != ''">
@@ -69,9 +69,9 @@
    <!-- 保存设备上报信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveMachineRecordInfoInstance" parameterType="Map">
        insert into machine_record(
        file_time,machine_code,open_type_cd,id_card,status_cd,machine_record_id,machine_id,`name`,tel,community_id,b_id,file_id,record_type_cd
        file_time,machine_code,open_type_cd,id_card,status_cd,machine_record_id,machine_id,`name`,tel,community_id,b_id,file_id,record_type_cd,similar
        ) select
        t.file_time,t.machine_code,t.open_type_cd,t.id_card,'0',t.machine_record_id,t.machine_id,t.name,t.tel,t.community_id,t.b_id,t.file_id,t.record_type_cd
        t.file_time,t.machine_code,t.open_type_cd,t.id_card,'0',t.machine_record_id,t.machine_id,t.name,t.tel,t.community_id,t.b_id,t.file_id,t.record_type_cd,t.similar
        from business_machine_record t where 1=1
        <if test="fileTime !=null and fileTime != ''">
            and t.file_time= #{fileTime}
@@ -120,7 +120,7 @@
        openTypeCd,t.id_card,t.id_card idCard,t.status_cd,t.status_cd statusCd,t.machine_record_id,t.machine_record_id
        machineRecordId,t.machine_id,t.machine_id machineId,t.name,t.tel,t.community_id,t.community_id
        communityId,t.b_id,t.b_id bId,t.file_id,t.file_id fileId,t.record_type_cd,t.record_type_cd recordTypeCd,td1.name
        openTypeName,t.create_time createTime
        openTypeName,t.create_time createTime,t.similar
        from machine_record t,t_dict td1
        where 1 =1
        and t.open_type_cd = td1.status_cd
@@ -283,12 +283,12 @@
    <!-- 保存设备上报信息 add by wuxw 2018-07-03 -->
    <insert id="saveMachineRecords" parameterType="Map">
        insert into machine_record(
        file_time,machine_code,open_type_cd,id_card,machine_record_id,machine_id,`name`,tel,community_id,b_id,file_id,record_type_cd
        file_time,machine_code,open_type_cd,id_card,machine_record_id,machine_id,`name`,tel,community_id,b_id,file_id,record_type_cd,similar
        ) values
        <foreach collection="machineRecords" item="item" separator=",">
            (
            #{item.fileTime},#{item.machineCode},#{item.openTypeCd},#{item.idCard},#{item.machineRecordId},#{item.machineId},#{item.name},#{item.tel},#{item.communityId},'-1',#{item.fileId}
            ,#{item.recordTypeCd}
            ,#{item.recordTypeCd},#{item.similar}
            )
        </foreach>
    </insert>

 java110-db/src/main/resources/mapper/common/MachineTranslateServiceDaoImplMapper.xml

@@ -164,6 +164,12 @@
        <if test="objId !=null and objId != ''">
            and t.obj_id= #{objId}
        </if>
        <if test="machineCmd !=null and machineCmd != ''">
            and t.machine_cmd= #{machineCmd}
        </if>
        <if test='isNow !=null and isNow == "Y"'>
            and to_days(t.create_time) = to_days(now())
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
@@ -252,6 +258,13 @@
        <if test="objId !=null and objId != ''">
            and t.obj_id= #{objId}
        </if>
        <if test="machineCmd !=null and machineCmd != ''">
            and t.machine_cmd= #{machineCmd}
        </if>
        <if test='isNow !=null and isNow == "Y"'>
            and to_days(t.create_time) = to_days(now())
        </if>

        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>

 java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml

@@ -140,9 +140,9 @@
        typeCd,t.context,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
        communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state,act.type_name typeCdName,t.create_time createTime
        from activities t
        left join activities_type act on t.type_cd = act.type_cd and act.status_cd = '0' and t.community_id = act.community_id
        left join activities_type act on t.type_cd = act.type_cd and t.community_id = act.community_id
        where 1 =1
        and t.status_cd= '0'
        and t.status_cd= '0' and act.status_cd = '0'
        <if test="collectCount !=null and collectCount != ''">
            and t.collect_count= #{collectCount}
        </if>
@@ -183,6 +183,9 @@
        <if test="headerImg !=null and headerImg != ''">
            and t.header_img= #{headerImg}
        </if>
        <if test="endTimeFlag == null or endTimeFlag == ''">
            and t.end_time > now()
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>

 java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -749,7 +749,7 @@
        statusCd,t.remark,t.user_id,
        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
        unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type
        unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type,f.floor_id floorId
        FROM
        building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
        WHERE

 java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml

@@ -32,11 +32,12 @@
        select t.area,t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,t.start_time,t.start_time
        startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
        communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice,
        pfd.remark,pf.fee_flag feeFlag
        pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees
        from fee_receipt_detail t
        left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0' and t.community_id =
        pfd.community_id
        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and t.community_id = pf.community_id
        LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and t.community_id = mw.community_id
        where 1 =1

        <if test="area !=null and area != ''">

 java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml

@@ -73,7 +73,7 @@
        <if test="payerObjId !=null and payerObjId != ''">
            and t.payer_obj_id= #{payerObjId}
        </if>
        order by t.create_time desc
        order by t.payer_obj_name
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>
@@ -84,9 +84,6 @@
    <update id="updateReportOweFeeInfo" parameterType="Map">
        update report_owe_fee t
        <set>
            <if test="newBId != null and newBId != ''">
                t.b_id = #{newBId},
            </if>
            <if test="configName !=null and configName != ''">
                t.config_name= #{configName},
            </if>
@@ -134,7 +131,26 @@
            </if>
        </set>
        where 1=1
        and t.owe_id= #{oweId}
            and t.owe_id= #{oweId}
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
    </update>


    <!-- 修改欠费统计信息 add by wuxw 2018-07-03 -->
    <update id="deleteReportOweFeeInfo" parameterType="Map">
        delete from report_owe_fee
        where 1=1
        <if test="oweId !=null and oweId != ''">
            and owe_id= #{oweId}
        </if>
        <if test="feeId !=null and feeId != ''">
            and fee_id = #{feeId}
        </if>
        <if test="communityId !=null and communityId != ''">
            and community_id= #{communityId}
        </if>
    </update>

    <!-- 查询欠费统计数量 add by wuxw 2018-07-03 -->
@@ -270,7 +286,7 @@
                #{item}
            </foreach>
        </if>
        order by t.create_time desc
        order by t.payer_obj_name
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>

 java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -214,8 +214,14 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="valid == '1'">
        <if test="valid == 1">
            and t.end_time &gt; now()
        </if>
        <if test="valid == 3">
            and t.end_time &lt; now()
        </if>
        <if test="valid == 2">
            and t.ps_id= '-1'
        </if>
        group by t.car_id
        order by t.create_time desc
@@ -362,11 +368,16 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="valid == '1'">
        <if test="valid == 1">
            and t.end_time &gt; now()
        </if>
        <if test="valid == 3">
            and t.end_time &lt; now()
        </if>
        <if test="valid == 2">
            and t.ps_id= '-1'
        </if>
        group by t.car_id


    </select>


 java110-generator/src/main/resources/newBack/template_1.json

@@ -1,37 +1,54 @@
{
  "autoMove": true,
  "id": "bankId",
  "name": "accountBank",
  "desc": "开户行",
  "shareParam": "shopId",
  "shareColumn": "shop_id",
  "id": "detailId",
  "name": "accountBondObjDetail",
  "desc": "保证金明细",
  "shareParam": "detailId",
  "shareColumn": "detail_id",
  "shareName": "acct",
  "tableName": "account_bank",
  "tableName": "account_bond_obj_detail",
  "param": {
    "bankId": "bank_id",
    "bankCode": "bank_code",
    "personName": "person_name",
    "personTel": "person_tel",
    "bankName": "bank_name",
    "shopId": "shop_id",
    "detailId": "detail_id",
    "bobjId": "bobj_id",
    "objId": "obj_id",
    "bondType": "bond_type",
    "receivableAmount": "receivable_amount",
    "receivedAmount": "received_amount",
    "remark": "remark",
    "state": "state",
    "startTime": "start_time",
    "endTime": "end_time",
    "createTime": "create_time",
    "statusCd": "status_cd"
  },
  "required": [
    {
      "code": "bankCode",
      "msg": "账号不能为空"
      "code": "bobjId",
      "msg": "保证金ID不能为空"
    },
    {
      "code": "personName",
      "msg": "持卡人名称不能为空"
      "code": "objId",
      "msg": "保证对象ID类型不能为空"
    },
    {
      "code": "bankName",
      "msg": "开户行不能为空"
      "code": "bondType",
      "msg": "保证对象类型不能为空"
    },{
      "code": "shopId",
      "msg": "商铺ID不能为空"
      "code": "receivableAmount",
      "msg": "应收金额不能为空"
    },{
      "code": "receivedAmount",
      "msg": "实收金额不能为空"
    },
    {
      "code": "state",
      "msg": "状态不能为空"
    },{
      "code": "startTime",
      "msg": "开始时间不能为空"
    },{
      "code": "endTime",
      "msg": "结束时间不能为空"
    }
  ]
}

 java110-generator/src/main/resources/web/template_1.json

@@ -1,60 +1,60 @@
{
  "templateName":"开户行",
  "templateCode":"accountBank",
  "templateKey":"bankId",
  "templateKeyName":"银行ID",
  "searchCode": "bankId",
  "searchName": "银行ID",
  "templateName":"保证金对象",
  "templateCode":"accountBondObj",
  "templateKey":"bobjId",
  "templateKeyName":"保证金对象ID",
  "searchCode": "bobjId",
  "searchName": "保证金对象ID",
  "directories": "acct",
  "conditions": [
  ],
  "columns":[
    {
      "code":"bankCode",
      "cnCode":"银行账号",
      "desc":"必填，请填写银行账号",
      "code":"bondId",
      "cnCode":"保证金",
      "desc":"必填，请填写保证金",
      "required":true,
      "hasDefaultValue":false,
      "inputType":"input",
      "limit":"maxin",
      "limitParam":"1,20",
      "limitErrInfo":"银行账号超长了",
      "limitErrInfo":"保证金名称超长了",
      "show": true
    },
    {
      "code": "personName",
      "cnCode":"持卡人",
      "desc":"必填，请填写持卡人",
      "code": "objId",
      "cnCode":"保证金对象ID",
      "desc":"必填，请填写保证金对象ID",
      "required":true,
      "hasDefaultValue":false,
      "inputType": "input",
      "limit":"maxLength",
      "limitParam":"20",
      "limitErrInfo":"持卡人名称不能超过20位",
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"保证金金额格式有误",
      "show": true
    },
    {
      "code": "personTel",
      "cnCode":"手机号",
      "desc":"必填，请填写手机号",
      "code": "receivableAmount",
      "cnCode":"应收金额",
      "desc":"必填，请填写应收金额",
      "required":false,
      "hasDefaultValue":false,
      "inputType": "input",
      "limit":"phone",
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"电话格式错误",
      "limitErrInfo":"不是有效数字格式",
      "show": true
    },
    {
      "code": "bankName",
      "cnCode":"开户行",
      "desc":"必填，请填写开户行",
      "required":true,
      "code": "receivedAmount",
      "cnCode":"实收金额",
      "desc":"必填，请填写实收金额",
      "required":false,
      "hasDefaultValue":false,
      "inputType": "input",
      "limit":"maxLength",
      "limitParam":"100",
      "limitErrInfo":"开户行名称不能超过100位",
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"不是有效数字格式",
      "show": true
    }
  ]

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

@@ -1,4 +1,4 @@
package com.java110.intf;
package com.java110.intf.acct;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.accountBank.AccountBankDto;
@@ -18,7 +18,7 @@
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
@FeignClient(name = "acct-service", configuration = {FeignConfiguration.class})
@RequestMapping("/accountBankApi")
public interface IAccountBankInnerServiceSMO {


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

New file
@@ -0,0 +1,53 @@
package com.java110.intf.acct;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.accountBond.AccountBondDto;
import com.java110.po.accountBond.AccountBondPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

import java.util.List;

/**
 * @ClassName IAccountBondInnerServiceSMO
 * @Description 保证金接口类
 * @Author wuxw
 * @Date 2019/4/24 9:04
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@FeignClient(name = "acct-service", configuration = {FeignConfiguration.class})
@RequestMapping("/accountBondApi")
public interface IAccountBondInnerServiceSMO {


    @RequestMapping(value = "/saveAccountBond", method = RequestMethod.POST)
    public int saveAccountBond(@RequestBody AccountBondPo accountBondPo);

    @RequestMapping(value = "/updateAccountBond", method = RequestMethod.POST)
    public int updateAccountBond(@RequestBody  AccountBondPo accountBondPo);

    @RequestMapping(value = "/deleteAccountBond", method = RequestMethod.POST)
    public int deleteAccountBond(@RequestBody  AccountBondPo accountBondPo);

    /**
     * <p>查询小区楼信息</p>
     *
     *
     * @param accountBondDto 数据对象分享
     * @return AccountBondDto 对象数据
     */
    @RequestMapping(value = "/queryAccountBonds", method = RequestMethod.POST)
    List<AccountBondDto> queryAccountBonds(@RequestBody AccountBondDto accountBondDto);

    /**
     * 查询<p>小区楼</p>总记录数
     *
     * @param accountBondDto 数据对象分享
     * @return 小区下的小区楼记录数
     */
    @RequestMapping(value = "/queryAccountBondsCount", method = RequestMethod.POST)
    int queryAccountBondsCount(@RequestBody AccountBondDto accountBondDto);
}

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

New file
@@ -0,0 +1,53 @@
package com.java110.intf.acct;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto;
import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

import java.util.List;

/**
 * @ClassName IAccountBondObjDetailInnerServiceSMO
 * @Description 保证金明细接口类
 * @Author wuxw
 * @Date 2019/4/24 9:04
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@FeignClient(name = "acct-service", configuration = {FeignConfiguration.class})
@RequestMapping("/accountBondObjDetailApi")
public interface IAccountBondObjDetailInnerServiceSMO {


    @RequestMapping(value = "/saveAccountBondObjDetail", method = RequestMethod.POST)
    public int saveAccountBondObjDetail(@RequestBody AccountBondObjDetailPo accountBondObjDetailPo);

    @RequestMapping(value = "/updateAccountBondObjDetail", method = RequestMethod.POST)
    public int updateAccountBondObjDetail(@RequestBody  AccountBondObjDetailPo accountBondObjDetailPo);

    @RequestMapping(value = "/deleteAccountBondObjDetail", method = RequestMethod.POST)
    public int deleteAccountBondObjDetail(@RequestBody  AccountBondObjDetailPo accountBondObjDetailPo);

    /**
     * <p>查询小区楼信息</p>
     *
     *
     * @param accountBondObjDetailDto 数据对象分享
     * @return AccountBondObjDetailDto 对象数据
     */
    @RequestMapping(value = "/queryAccountBondObjDetails", method = RequestMethod.POST)
    List<AccountBondObjDetailDto> queryAccountBondObjDetails(@RequestBody AccountBondObjDetailDto accountBondObjDetailDto);

    /**
     * 查询<p>小区楼</p>总记录数
     *
     * @param accountBondObjDetailDto 数据对象分享
     * @return 小区下的小区楼记录数
     */
    @RequestMapping(value = "/queryAccountBondObjDetailsCount", method = RequestMethod.POST)
    int queryAccountBondObjDetailsCount(@RequestBody AccountBondObjDetailDto accountBondObjDetailDto);
}

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

New file
@@ -0,0 +1,53 @@
package com.java110.intf.acct;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.accountBondObj.AccountBondObjDto;
import com.java110.po.accountBondObj.AccountBondObjPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

import java.util.List;

/**
 * @ClassName IAccountBondObjInnerServiceSMO
 * @Description 保证金对象接口类
 * @Author wuxw
 * @Date 2019/4/24 9:04
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@FeignClient(name = "acct-service", configuration = {FeignConfiguration.class})
@RequestMapping("/accountBondObjApi")
public interface IAccountBondObjInnerServiceSMO {


    @RequestMapping(value = "/saveAccountBondObj", method = RequestMethod.POST)
    public int saveAccountBondObj(@RequestBody AccountBondObjPo accountBondObjPo);

    @RequestMapping(value = "/updateAccountBondObj", method = RequestMethod.POST)
    public int updateAccountBondObj(@RequestBody  AccountBondObjPo accountBondObjPo);

    @RequestMapping(value = "/deleteAccountBondObj", method = RequestMethod.POST)
    public int deleteAccountBondObj(@RequestBody  AccountBondObjPo accountBondObjPo);

    /**
     * <p>查询小区楼信息</p>
     *
     *
     * @param accountBondObjDto 数据对象分享
     * @return AccountBondObjDto 对象数据
     */
    @RequestMapping(value = "/queryAccountBondObjs", method = RequestMethod.POST)
    List<AccountBondObjDto> queryAccountBondObjs(@RequestBody AccountBondObjDto accountBondObjDto);

    /**
     * 查询<p>小区楼</p>总记录数
     *
     * @param accountBondObjDto 数据对象分享
     * @return 小区下的小区楼记录数
     */
    @RequestMapping(value = "/queryAccountBondObjsCount", method = RequestMethod.POST)
    int queryAccountBondObjsCount(@RequestBody AccountBondObjDto accountBondObjDto);
}

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

New file
@@ -0,0 +1,112 @@
package com.java110.acct.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.acct.bmo.accountBond.IDeleteAccountBondBMO;
import com.java110.acct.bmo.accountBond.IGetAccountBondBMO;
import com.java110.acct.bmo.accountBond.ISaveAccountBondBMO;
import com.java110.acct.bmo.accountBond.IUpdateAccountBondBMO;
import com.java110.dto.accountBond.AccountBondDto;
import com.java110.po.accountBond.AccountBondPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping(value = "/accountBond")
public class AccountBondApi {

    @Autowired
    private ISaveAccountBondBMO saveAccountBondBMOImpl;
    @Autowired
    private IUpdateAccountBondBMO updateAccountBondBMOImpl;
    @Autowired
    private IDeleteAccountBondBMO deleteAccountBondBMOImpl;

    @Autowired
    private IGetAccountBondBMO getAccountBondBMOImpl;

    /**
     * 微信保存消息模板
     * @serviceCode /accountBond/saveAccountBond
     * @path /app/accountBond/saveAccountBond
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/saveAccountBond", method = RequestMethod.POST)
    public ResponseEntity<String> saveAccountBond(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "bondName", "请求报文中未包含bondName");
        Assert.hasKeyAndValue(reqJson, "bondType", "请求报文中未包含bondType");
        Assert.hasKeyAndValue(reqJson, "amount", "请求报文中未包含amount");
        Assert.hasKeyAndValue(reqJson, "objId", "请求报文中未包含objId");
        Assert.hasKeyAndValue(reqJson, "bondMonth", "请求报文中未包含bondMonth");


        AccountBondPo accountBondPo = BeanConvertUtil.covertBean(reqJson, AccountBondPo.class);
        //保证金类型默认未店铺类型，为6006，暂时写死方便后期扩展其他类型。
        accountBondPo.setBondType( "6006" );
        return saveAccountBondBMOImpl.save(accountBondPo);
    }

    /**
     * 微信修改消息模板
     * @serviceCode /accountBond/updateAccountBond
     * @path /app/accountBond/updateAccountBond
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/updateAccountBond", method = RequestMethod.POST)
    public ResponseEntity<String> updateAccountBond(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "bondName", "请求报文中未包含bondName");
        Assert.hasKeyAndValue(reqJson, "bondType", "请求报文中未包含bondType");
        Assert.hasKeyAndValue(reqJson, "amount", "请求报文中未包含amount");
        Assert.hasKeyAndValue(reqJson, "objId", "请求报文中未包含objId");
        Assert.hasKeyAndValue(reqJson, "bondMonth", "请求报文中未包含bondMonth");
        Assert.hasKeyAndValue(reqJson, "bondId", "bondId不能为空");


        AccountBondPo accountBondPo = BeanConvertUtil.covertBean(reqJson, AccountBondPo.class);
        return updateAccountBondBMOImpl.update(accountBondPo);
    }

    /**
     * 微信删除消息模板
     * @serviceCode /accountBond/deleteAccountBond
     * @path /app/accountBond/deleteAccountBond
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/deleteAccountBond", method = RequestMethod.POST)
    public ResponseEntity<String> deleteAccountBond(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "bondId", "bondId不能为空");
        Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");


        AccountBondPo accountBondPo = BeanConvertUtil.covertBean(reqJson, AccountBondPo.class);
        return deleteAccountBondBMOImpl.delete(accountBondPo);
    }

    /**
     * 微信删除消息模板
     * @serviceCode /accountBond/queryAccountBond
     * @path /app/accountBond/queryAccountBond
     * @param
     * @return
     */
        @RequestMapping(value = "/queryAccountBond", method = RequestMethod.GET)
    public ResponseEntity<String> queryAccountBond(@RequestParam(value = "bondName",required = false) String bondName,
                                                      @RequestParam(value = "objId",required = false) String objId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
        AccountBondDto accountBondDto = new AccountBondDto();
        accountBondDto.setPage(page);
        accountBondDto.setRow(row);
        accountBondDto.setBondName(bondName);
        accountBondDto.setObjId(objId);
        return getAccountBondBMOImpl.get(accountBondDto);
    }
}

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

New file
@@ -0,0 +1,111 @@
package com.java110.acct.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.acct.bmo.accountBondObj.IDeleteAccountBondObjBMO;
import com.java110.acct.bmo.accountBondObj.IGetAccountBondObjBMO;
import com.java110.acct.bmo.accountBondObj.ISaveAccountBondObjBMO;
import com.java110.acct.bmo.accountBondObj.IUpdateAccountBondObjBMO;
import com.java110.dto.accountBondObj.AccountBondObjDto;
import com.java110.po.accountBondObj.AccountBondObjPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping(value = "/accountBondObj")
public class AccountBondObjApi {

    @Autowired
    private ISaveAccountBondObjBMO saveAccountBondObjBMOImpl;
    @Autowired
    private IUpdateAccountBondObjBMO updateAccountBondObjBMOImpl;
    @Autowired
    private IDeleteAccountBondObjBMO deleteAccountBondObjBMOImpl;

    @Autowired
    private IGetAccountBondObjBMO getAccountBondObjBMOImpl;

    /**
     * 微信保存消息模板
     * @serviceCode /accountBondObj/saveAccountBondObj
     * @path /app/accountBondObj/saveAccountBondObj
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/saveAccountBondObj", method = RequestMethod.POST)
    public ResponseEntity<String> saveAccountBondObj(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "bondId", "请求报文中未包含bondId");
        Assert.hasKeyAndValue(reqJson, "objId", "请求报文中未包含objId");
        Assert.hasKeyAndValue(reqJson, "bondType", "请求报文中未包含bondType");
        Assert.hasKeyAndValue(reqJson, "receivableAmount", "请求报文中未包含receivableAmount");
        Assert.hasKeyAndValue(reqJson, "receivedAmount", "请求报文中未包含receivedAmount");
        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");


        AccountBondObjPo accountBondObjPo = BeanConvertUtil.covertBean(reqJson, AccountBondObjPo.class);
        return saveAccountBondObjBMOImpl.save(accountBondObjPo);
    }

    /**
     * 微信修改消息模板
     * @serviceCode /accountBondObj/updateAccountBondObj
     * @path /app/accountBondObj/updateAccountBondObj
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/updateAccountBondObj", method = RequestMethod.POST)
    public ResponseEntity<String> updateAccountBondObj(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "bobjId", "bobjId不能为空");
        Assert.hasKeyAndValue(reqJson, "receivedAmount", "请求报文中未包含receivedAmount");
        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");


        AccountBondObjPo accountBondObjPo = BeanConvertUtil.covertBean(reqJson, AccountBondObjPo.class);
        return updateAccountBondObjBMOImpl.update(accountBondObjPo);
    }

    /**
     * 微信删除消息模板
     * @serviceCode /accountBondObj/deleteAccountBondObj
     * @path /app/accountBondObj/deleteAccountBondObj
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/deleteAccountBondObj", method = RequestMethod.POST)
    public ResponseEntity<String> deleteAccountBondObj(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "bobjId", "bobjId不能为空");
        Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");


        AccountBondObjPo accountBondObjPo = BeanConvertUtil.covertBean(reqJson, AccountBondObjPo.class);
        return deleteAccountBondObjBMOImpl.delete(accountBondObjPo);
    }

    /**
     * 微信删除消息模板
     * @serviceCode /accountBondObj/queryAccountBondObj
     * @path /app/accountBondObj/queryAccountBondObj
     * @param
     * @return
     */
    @RequestMapping(value = "/queryAccountBondObj", method = RequestMethod.GET)
    public ResponseEntity<String> queryAccountBondObj(@RequestParam(value = "bobjId",required = false) String bobjId,
                                                      @RequestParam(value = "state",required = false) String state,
                                                      @RequestParam(value = "objId",required = false) String objId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
        AccountBondObjDto accountBondObjDto = new AccountBondObjDto();
        accountBondObjDto.setPage(page);
        accountBondObjDto.setRow(row);
        accountBondObjDto.setBobjId(bobjId);
        accountBondObjDto.setState(state);
        accountBondObjDto.setObjId( objId );
        return getAccountBondObjBMOImpl.get(accountBondObjDto);
    }
}

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

New file
@@ -0,0 +1,119 @@
package com.java110.acct.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.acct.bmo.accountBondObjDetail.IDeleteAccountBondObjDetailBMO;
import com.java110.acct.bmo.accountBondObjDetail.IGetAccountBondObjDetailBMO;
import com.java110.acct.bmo.accountBondObjDetail.ISaveAccountBondObjDetailBMO;
import com.java110.acct.bmo.accountBondObjDetail.IUpdateAccountBondObjDetailBMO;
import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto;
import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping(value = "/accountBondObjDetail")
public class AccountBondObjDetailApi {

    @Autowired
    private ISaveAccountBondObjDetailBMO saveAccountBondObjDetailBMOImpl;
    @Autowired
    private IUpdateAccountBondObjDetailBMO updateAccountBondObjDetailBMOImpl;
    @Autowired
    private IDeleteAccountBondObjDetailBMO deleteAccountBondObjDetailBMOImpl;

    @Autowired
    private IGetAccountBondObjDetailBMO getAccountBondObjDetailBMOImpl;

    /**
     * 微信保存消息模板
     * @serviceCode /accountBondObjDetail/saveAccountBondObjDetail
     * @path /app/accountBondObjDetail/saveAccountBondObjDetail
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/saveAccountBondObjDetail", method = RequestMethod.POST)
    public ResponseEntity<String> saveAccountBondObjDetail(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "bobjId", "请求报文中未包含bobjId");
        Assert.hasKeyAndValue(reqJson, "objId", "请求报文中未包含objId");
        Assert.hasKeyAndValue(reqJson, "bondType", "请求报文中未包含bondType");
        Assert.hasKeyAndValue(reqJson, "receivableAmount", "请求报文中未包含receivableAmount");
        Assert.hasKeyAndValue(reqJson, "receivedAmount", "请求报文中未包含receivedAmount");
        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");


        AccountBondObjDetailPo accountBondObjDetailPo = BeanConvertUtil.covertBean(reqJson, AccountBondObjDetailPo.class);
        return saveAccountBondObjDetailBMOImpl.save(accountBondObjDetailPo);
    }

    /**
     * 微信修改消息模板
     * @serviceCode /accountBondObjDetail/updateAccountBondObjDetail
     * @path /app/accountBondObjDetail/updateAccountBondObjDetail
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/updateAccountBondObjDetail", method = RequestMethod.POST)
    public ResponseEntity<String> updateAccountBondObjDetail(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "bobjId", "请求报文中未包含bobjId");
        Assert.hasKeyAndValue(reqJson, "objId", "请求报文中未包含objId");
        Assert.hasKeyAndValue(reqJson, "bondType", "请求报文中未包含bondType");
        Assert.hasKeyAndValue(reqJson, "receivableAmount", "请求报文中未包含receivableAmount");
        Assert.hasKeyAndValue(reqJson, "receivedAmount", "请求报文中未包含receivedAmount");
        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");


        AccountBondObjDetailPo accountBondObjDetailPo = BeanConvertUtil.covertBean(reqJson, AccountBondObjDetailPo.class);
        return updateAccountBondObjDetailBMOImpl.update(accountBondObjDetailPo);
    }

    /**
     * 微信删除消息模板
     * @serviceCode /accountBondObjDetail/deleteAccountBondObjDetail
     * @path /app/accountBondObjDetail/deleteAccountBondObjDetail
     * @param reqJson
     * @return
     */
    @RequestMapping(value = "/deleteAccountBondObjDetail", method = RequestMethod.POST)
    public ResponseEntity<String> deleteAccountBondObjDetail(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");
        Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");


        AccountBondObjDetailPo accountBondObjDetailPo = BeanConvertUtil.covertBean(reqJson, AccountBondObjDetailPo.class);
        return deleteAccountBondObjDetailBMOImpl.delete(accountBondObjDetailPo);
    }

    /**
     * 微信删除消息模板
     * @serviceCode /accountBondObjDetail/queryAccountBondObjDetail
     * @path /app/accountBondObjDetail/queryAccountBondObjDetail
     * @param
     * @return
     */
    @RequestMapping(value = "/queryAccountBondObjDetail", method = RequestMethod.GET)
    public ResponseEntity<String> queryAccountBondObjDetail(@RequestParam(value = "detailId" , required = false) String detailId,
                                                            @RequestParam(value = "bobjId" , required = false) String bobjId,
                                                            @RequestParam(value = "state" , required = false) String state,
                                                            @RequestParam(value = "objId" , required = false) String objId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
        AccountBondObjDetailDto accountBondObjDetailDto = new AccountBondObjDetailDto();
        accountBondObjDetailDto.setPage(page);
        accountBondObjDetailDto.setRow(row);
        accountBondObjDetailDto.setDetailId( detailId );
        accountBondObjDetailDto.setBobjId( bobjId );
        accountBondObjDetailDto.setState( state );
        accountBondObjDetailDto.setObjId( objId );
        return getAccountBondObjDetailBMOImpl.get(accountBondObjDetailDto);
    }
}

 service-acct/src/main/java/com/java110/acct/bmo/accountBank/impl/DeleteAccountBankBMOImpl.java

@@ -2,7 +2,7 @@

import com.java110.acct.bmo.accountBank.IDeleteAccountBankBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.intf.IAccountBankInnerServiceSMO;
import com.java110.intf.acct.IAccountBankInnerServiceSMO;
import com.java110.po.accountBank.AccountBankPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

 service-acct/src/main/java/com/java110/acct/bmo/accountBank/impl/GetAccountBankBMOImpl.java

@@ -1,7 +1,7 @@
package com.java110.acct.bmo.accountBank.impl;

import com.java110.acct.bmo.accountBank.IGetAccountBankBMO;
import com.java110.intf.IAccountBankInnerServiceSMO;
import com.java110.intf.acct.IAccountBankInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;

 service-acct/src/main/java/com/java110/acct/bmo/accountBank/impl/SaveAccountBankBMOImpl.java

@@ -4,7 +4,7 @@
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;

import com.java110.intf.IAccountBankInnerServiceSMO;
import com.java110.intf.acct.IAccountBankInnerServiceSMO;
import com.java110.po.accountBank.AccountBankPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

 service-acct/src/main/java/com/java110/acct/bmo/accountBank/impl/UpdateAccountBankBMOImpl.java

@@ -3,7 +3,7 @@
import com.java110.acct.bmo.accountBank.IUpdateAccountBankBMO;
import com.java110.core.annotation.Java110Transactional;

import com.java110.intf.IAccountBankInnerServiceSMO;
import com.java110.intf.acct.IAccountBankInnerServiceSMO;
import com.java110.po.accountBank.AccountBankPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

 service-acct/src/main/java/com/java110/acct/bmo/accountBond/IDeleteAccountBondBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBond;
import com.java110.po.accountBond.AccountBondPo;
import org.springframework.http.ResponseEntity;

public interface IDeleteAccountBondBMO {


    /**
     * 修改保证金
     * add by wuxw
     * @param accountBondPo
     * @return
     */
    ResponseEntity<String> delete(AccountBondPo accountBondPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBond/IGetAccountBondBMO.java

New file
@@ -0,0 +1,16 @@
package com.java110.acct.bmo.accountBond;
import com.java110.dto.accountBond.AccountBondDto;
import org.springframework.http.ResponseEntity;
public interface IGetAccountBondBMO {


    /**
     * 查询保证金
     * add by wuxw
     * @param  accountBondDto
     * @return
     */
    ResponseEntity<String> get(AccountBondDto accountBondDto);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBond/ISaveAccountBondBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBond;

import com.java110.po.accountBond.AccountBondPo;
import org.springframework.http.ResponseEntity;
public interface ISaveAccountBondBMO {


    /**
     * 添加保证金
     * add by wuxw
     * @param accountBondPo
     * @return
     */
    ResponseEntity<String> save(AccountBondPo accountBondPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBond/IUpdateAccountBondBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBond;
import com.java110.po.accountBond.AccountBondPo;
import org.springframework.http.ResponseEntity;

public interface IUpdateAccountBondBMO {


    /**
     * 修改保证金
     * add by wuxw
     * @param accountBondPo
     * @return
     */
    ResponseEntity<String> update(AccountBondPo accountBondPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBond/impl/DeleteAccountBondBMOImpl.java

New file
@@ -0,0 +1,34 @@
package com.java110.acct.bmo.accountBond.impl;

import com.java110.acct.bmo.accountBond.IDeleteAccountBondBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.intf.acct.IAccountBondInnerServiceSMO;
import com.java110.po.accountBond.AccountBondPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

@Service("deleteAccountBondBMOImpl")
public class DeleteAccountBondBMOImpl implements IDeleteAccountBondBMO {

    @Autowired
    private IAccountBondInnerServiceSMO accountBondInnerServiceSMOImpl;

    /**
     * @param accountBondPo 数据
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> delete(AccountBondPo accountBondPo) {

        int flag = accountBondInnerServiceSMOImpl.deleteAccountBond(accountBondPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBond/impl/GetAccountBondBMOImpl.java

New file
@@ -0,0 +1,46 @@
package com.java110.acct.bmo.accountBond.impl;

import com.java110.acct.bmo.accountBond.IGetAccountBondBMO;
import com.java110.intf.acct.IAccountBondInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import com.java110.dto.accountBond.AccountBondDto;

import java.util.ArrayList;
import java.util.List;

@Service("getAccountBondBMOImpl")
public class GetAccountBondBMOImpl implements IGetAccountBondBMO {

    @Autowired
    private IAccountBondInnerServiceSMO accountBondInnerServiceSMOImpl;

    /**
     *
     *
     * @param  accountBondDto
     * @return 订单服务能够接受的报文
     */
    public ResponseEntity<String> get(AccountBondDto accountBondDto) {


        int count = accountBondInnerServiceSMOImpl.queryAccountBondsCount(accountBondDto);

        List<AccountBondDto> accountBondDtos = null;
        if (count > 0) {
            accountBondDtos = accountBondInnerServiceSMOImpl.queryAccountBonds(accountBondDto);
        } else {
            accountBondDtos = new ArrayList<>();
        }

        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) accountBondDto.getRow()), count, accountBondDtos);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

        return responseEntity;
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBond/impl/SaveAccountBondBMOImpl.java

New file
@@ -0,0 +1,45 @@
package com.java110.acct.bmo.accountBond.impl;

import com.java110.acct.bmo.accountBond.ISaveAccountBondBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.accountBond.AccountBondDto;
import com.java110.intf.acct.IAccountBondInnerServiceSMO;
import com.java110.po.accountBond.AccountBondPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

@Service("saveAccountBondBMOImpl")
public class SaveAccountBondBMOImpl implements ISaveAccountBondBMO {

    @Autowired
    private IAccountBondInnerServiceSMO accountBondInnerServiceSMOImpl;

    /**
     * 添加小区信息
     *
     * @param accountBondPo
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> save(AccountBondPo accountBondPo) {

        AccountBondDto accountBondDto = new AccountBondDto();
        accountBondDto.setObjId( accountBondPo.getObjId() );
        int listFag= accountBondInnerServiceSMOImpl.queryAccountBondsCount( accountBondDto );
        if (listFag > 0) {
            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "一种商铺类型只能设置一种保证金");
        }
        accountBondPo.setBondId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_bondId));
        int flag = accountBondInnerServiceSMOImpl.saveAccountBond(accountBondPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBond/impl/UpdateAccountBondBMOImpl.java

New file
@@ -0,0 +1,37 @@
package com.java110.acct.bmo.accountBond.impl;


import com.java110.acct.bmo.accountBond.IUpdateAccountBondBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.intf.acct.IAccountBondInnerServiceSMO;
import com.java110.po.accountBond.AccountBondPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

@Service("updateAccountBondBMOImpl")
public class UpdateAccountBondBMOImpl implements IUpdateAccountBondBMO {

    @Autowired
    private IAccountBondInnerServiceSMO accountBondInnerServiceSMOImpl;

    /**
     *
     *
     * @param accountBondPo
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> update(AccountBondPo accountBondPo) {

        int flag = accountBondInnerServiceSMOImpl.updateAccountBond(accountBondPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/IDeleteAccountBondObjBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBondObj;
import com.java110.po.accountBondObj.AccountBondObjPo;
import org.springframework.http.ResponseEntity;

public interface IDeleteAccountBondObjBMO {


    /**
     * 修改保证金对象
     * add by wuxw
     * @param accountBondObjPo
     * @return
     */
    ResponseEntity<String> delete(AccountBondObjPo accountBondObjPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/IGetAccountBondObjBMO.java

New file
@@ -0,0 +1,16 @@
package com.java110.acct.bmo.accountBondObj;
import com.java110.dto.accountBondObj.AccountBondObjDto;
import org.springframework.http.ResponseEntity;
public interface IGetAccountBondObjBMO {


    /**
     * 查询保证金对象
     * add by wuxw
     * @param  accountBondObjDto
     * @return
     */
    ResponseEntity<String> get(AccountBondObjDto accountBondObjDto);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/ISaveAccountBondObjBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBondObj;

import com.java110.po.accountBondObj.AccountBondObjPo;
import org.springframework.http.ResponseEntity;
public interface ISaveAccountBondObjBMO {


    /**
     * 添加保证金对象
     * add by wuxw
     * @param accountBondObjPo
     * @return
     */
    ResponseEntity<String> save(AccountBondObjPo accountBondObjPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/IUpdateAccountBondObjBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBondObj;
import com.java110.po.accountBondObj.AccountBondObjPo;
import org.springframework.http.ResponseEntity;

public interface IUpdateAccountBondObjBMO {


    /**
     * 修改保证金对象
     * add by wuxw
     * @param accountBondObjPo
     * @return
     */
    ResponseEntity<String> update(AccountBondObjPo accountBondObjPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/impl/DeleteAccountBondObjBMOImpl.java

New file
@@ -0,0 +1,34 @@
package com.java110.acct.bmo.accountBondObj.impl;

import com.java110.acct.bmo.accountBondObj.IDeleteAccountBondObjBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.intf.acct.IAccountBondObjInnerServiceSMO;
import com.java110.po.accountBondObj.AccountBondObjPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

@Service("deleteAccountBondObjBMOImpl")
public class DeleteAccountBondObjBMOImpl implements IDeleteAccountBondObjBMO {

    @Autowired
    private IAccountBondObjInnerServiceSMO accountBondObjInnerServiceSMOImpl;

    /**
     * @param accountBondObjPo 数据
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> delete(AccountBondObjPo accountBondObjPo) {

        int flag = accountBondObjInnerServiceSMOImpl.deleteAccountBondObj(accountBondObjPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/impl/GetAccountBondObjBMOImpl.java

New file
@@ -0,0 +1,46 @@
package com.java110.acct.bmo.accountBondObj.impl;

import com.java110.acct.bmo.accountBondObj.IGetAccountBondObjBMO;
import com.java110.intf.acct.IAccountBondObjInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import com.java110.dto.accountBondObj.AccountBondObjDto;

import java.util.ArrayList;
import java.util.List;

@Service("getAccountBondObjBMOImpl")
public class GetAccountBondObjBMOImpl implements IGetAccountBondObjBMO {

    @Autowired
    private IAccountBondObjInnerServiceSMO accountBondObjInnerServiceSMOImpl;

    /**
     *
     *
     * @param  accountBondObjDto
     * @return 订单服务能够接受的报文
     */
    public ResponseEntity<String> get(AccountBondObjDto accountBondObjDto) {


        int count = accountBondObjInnerServiceSMOImpl.queryAccountBondObjsCount(accountBondObjDto);

        List<AccountBondObjDto> accountBondObjDtos = null;
        if (count > 0) {
            accountBondObjDtos = accountBondObjInnerServiceSMOImpl.queryAccountBondObjs(accountBondObjDto);
        } else {
            accountBondObjDtos = new ArrayList<>();
        }

        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) accountBondObjDto.getRow()), count, accountBondObjDtos);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

        return responseEntity;
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/impl/SaveAccountBondObjBMOImpl.java

New file
@@ -0,0 +1,38 @@
package com.java110.acct.bmo.accountBondObj.impl;

import com.java110.acct.bmo.accountBondObj.ISaveAccountBondObjBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.intf.acct.IAccountBondObjInnerServiceSMO;
import com.java110.po.accountBondObj.AccountBondObjPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

@Service("saveAccountBondObjBMOImpl")
public class SaveAccountBondObjBMOImpl implements ISaveAccountBondObjBMO {

    @Autowired
    private IAccountBondObjInnerServiceSMO accountBondObjInnerServiceSMOImpl;

    /**
     * 添加小区信息
     *
     * @param accountBondObjPo
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> save(AccountBondObjPo accountBondObjPo) {

        accountBondObjPo.setBobjId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_bobjId));
        int flag = accountBondObjInnerServiceSMOImpl.saveAccountBondObj(accountBondObjPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/impl/UpdateAccountBondObjBMOImpl.java

New file
@@ -0,0 +1,37 @@
package com.java110.acct.bmo.accountBondObj.impl;

import com.java110.acct.bmo.accountBondObj.IUpdateAccountBondObjBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.intf.acct.IAccountBondObjInnerServiceSMO;
import com.java110.po.accountBondObj.AccountBondObjPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;


@Service("updateAccountBondObjBMOImpl")
public class UpdateAccountBondObjBMOImpl implements IUpdateAccountBondObjBMO {

    @Autowired
    private IAccountBondObjInnerServiceSMO accountBondObjInnerServiceSMOImpl;

    /**
     *
     *
     * @param accountBondObjPo
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> update(AccountBondObjPo accountBondObjPo) {

        int flag = accountBondObjInnerServiceSMOImpl.updateAccountBondObj(accountBondObjPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/IDeleteAccountBondObjDetailBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBondObjDetail;
import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import org.springframework.http.ResponseEntity;

public interface IDeleteAccountBondObjDetailBMO {


    /**
     * 修改保证金明细
     * add by wuxw
     * @param accountBondObjDetailPo
     * @return
     */
    ResponseEntity<String> delete(AccountBondObjDetailPo accountBondObjDetailPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/IGetAccountBondObjDetailBMO.java

New file
@@ -0,0 +1,16 @@
package com.java110.acct.bmo.accountBondObjDetail;
import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto;
import org.springframework.http.ResponseEntity;
public interface IGetAccountBondObjDetailBMO {


    /**
     * 查询保证金明细
     * add by wuxw
     * @param  accountBondObjDetailDto
     * @return
     */
    ResponseEntity<String> get(AccountBondObjDetailDto accountBondObjDetailDto);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/ISaveAccountBondObjDetailBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBondObjDetail;

import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import org.springframework.http.ResponseEntity;
public interface ISaveAccountBondObjDetailBMO {


    /**
     * 添加保证金明细
     * add by wuxw
     * @param accountBondObjDetailPo
     * @return
     */
    ResponseEntity<String> save(AccountBondObjDetailPo accountBondObjDetailPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/IUpdateAccountBondObjDetailBMO.java

New file
@@ -0,0 +1,17 @@
package com.java110.acct.bmo.accountBondObjDetail;
import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import org.springframework.http.ResponseEntity;

public interface IUpdateAccountBondObjDetailBMO {


    /**
     * 修改保证金明细
     * add by wuxw
     * @param accountBondObjDetailPo
     * @return
     */
    ResponseEntity<String> update(AccountBondObjDetailPo accountBondObjDetailPo);


}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/impl/DeleteAccountBondObjDetailBMOImpl.java

New file
@@ -0,0 +1,35 @@
package com.java110.acct.bmo.accountBondObjDetail.impl;

import com.java110.acct.bmo.accountBondObjDetail.IDeleteAccountBondObjDetailBMO;
import com.java110.core.annotation.Java110Transactional;

import com.java110.intf.acct.IAccountBondObjDetailInnerServiceSMO;
import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

@Service("deleteAccountBondObjDetailBMOImpl")
public class DeleteAccountBondObjDetailBMOImpl implements IDeleteAccountBondObjDetailBMO {

    @Autowired
    private IAccountBondObjDetailInnerServiceSMO accountBondObjDetailInnerServiceSMOImpl;

    /**
     * @param accountBondObjDetailPo 数据
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> delete(AccountBondObjDetailPo accountBondObjDetailPo) {

        int flag = accountBondObjDetailInnerServiceSMOImpl.deleteAccountBondObjDetail(accountBondObjDetailPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/impl/GetAccountBondObjDetailBMOImpl.java

New file
@@ -0,0 +1,46 @@
package com.java110.acct.bmo.accountBondObjDetail.impl;

import com.java110.acct.bmo.accountBondObjDetail.IGetAccountBondObjDetailBMO;
import com.java110.intf.acct.IAccountBondObjDetailInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto;

import java.util.ArrayList;
import java.util.List;

@Service("getAccountBondObjDetailBMOImpl")
public class GetAccountBondObjDetailBMOImpl implements IGetAccountBondObjDetailBMO {

    @Autowired
    private IAccountBondObjDetailInnerServiceSMO accountBondObjDetailInnerServiceSMOImpl;

    /**
     *
     *
     * @param  accountBondObjDetailDto
     * @return 订单服务能够接受的报文
     */
    public ResponseEntity<String> get(AccountBondObjDetailDto accountBondObjDetailDto) {


        int count = accountBondObjDetailInnerServiceSMOImpl.queryAccountBondObjDetailsCount(accountBondObjDetailDto);

        List<AccountBondObjDetailDto> accountBondObjDetailDtos = null;
        if (count > 0) {
            accountBondObjDetailDtos = accountBondObjDetailInnerServiceSMOImpl.queryAccountBondObjDetails(accountBondObjDetailDto);
        } else {
            accountBondObjDetailDtos = new ArrayList<>();
        }

        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) accountBondObjDetailDto.getRow()), count, accountBondObjDetailDtos);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

        return responseEntity;
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/impl/SaveAccountBondObjDetailBMOImpl.java

New file
@@ -0,0 +1,39 @@
package com.java110.acct.bmo.accountBondObjDetail.impl;

import com.java110.acct.bmo.accountBondObjDetail.ISaveAccountBondObjDetailBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;

import com.java110.intf.acct.IAccountBondObjDetailInnerServiceSMO;
import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

@Service("saveAccountBondObjDetailBMOImpl")
public class SaveAccountBondObjDetailBMOImpl implements ISaveAccountBondObjDetailBMO {

    @Autowired
    private IAccountBondObjDetailInnerServiceSMO accountBondObjDetailInnerServiceSMOImpl;

    /**
     * 添加小区信息
     *
     * @param accountBondObjDetailPo
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> save(AccountBondObjDetailPo accountBondObjDetailPo) {

        accountBondObjDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        int flag = accountBondObjDetailInnerServiceSMOImpl.saveAccountBondObjDetail(accountBondObjDetailPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

 service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/impl/UpdateAccountBondObjDetailBMOImpl.java

New file
@@ -0,0 +1,36 @@
package com.java110.acct.bmo.accountBondObjDetail.impl;

import com.java110.acct.bmo.accountBondObjDetail.IUpdateAccountBondObjDetailBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.intf.acct.IAccountBondObjDetailInnerServiceSMO;
import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

@Service("updateAccountBondObjDetailBMOImpl")
public class UpdateAccountBondObjDetailBMOImpl implements IUpdateAccountBondObjDetailBMO {

    @Autowired
    private IAccountBondObjDetailInnerServiceSMO accountBondObjDetailInnerServiceSMOImpl;

    /**
     *
     *
     * @param accountBondObjDetailPo
     * @return 订单服务能够接受的报文
     */
    @Java110Transactional
    public ResponseEntity<String> update(AccountBondObjDetailPo accountBondObjDetailPo) {

        int flag = accountBondObjDetailInnerServiceSMOImpl.updateAccountBondObjDetail(accountBondObjDetailPo);

        if (flag > 0) {
        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
    }

}

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

New file
@@ -0,0 +1,61 @@
package com.java110.acct.dao;


import com.java110.utils.exception.DAOException;
import com.java110.entity.merchant.BoMerchant;
import com.java110.entity.merchant.BoMerchantAttr;
import com.java110.entity.merchant.Merchant;
import com.java110.entity.merchant.MerchantAttr;


import java.util.List;
import java.util.Map;

/**
 * 保证金明细组件内部之间使用，没有给外围系统提供服务能力
 * 保证金明细服务接口类，要求全部以字符串传输，方便微服务化
 * 新建客户，修改客户，删除客户，查询客户等功能
 *
 * Created by wuxw on 2016/12/27.
 */
public interface IAccountBondObjDetailServiceDao {


    /**
     * 保存 保证金明细信息
     * @param info
     * @throws DAOException DAO异常
     */
    void saveAccountBondObjDetailInfo(Map info) throws DAOException;




    /**
     * 查询保证金明细信息（instance过程）
     * 根据bId 查询保证金明细信息
     * @param info bId 信息
     * @return 保证金明细信息
     * @throws DAOException DAO异常
     */
    List<Map> getAccountBondObjDetailInfo(Map info) throws DAOException;



    /**
     * 修改保证金明细信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    void updateAccountBondObjDetailInfo(Map info) throws DAOException;


    /**
     * 查询保证金明细总数
     *
     * @param info 保证金明细信息
     * @return 保证金明细数量
     */
    int queryAccountBondObjDetailsCount(Map info);

}

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

New file
@@ -0,0 +1,61 @@
package com.java110.acct.dao;


import com.java110.utils.exception.DAOException;
import com.java110.entity.merchant.BoMerchant;
import com.java110.entity.merchant.BoMerchantAttr;
import com.java110.entity.merchant.Merchant;
import com.java110.entity.merchant.MerchantAttr;


import java.util.List;
import java.util.Map;

/**
 * 保证金对象组件内部之间使用，没有给外围系统提供服务能力
 * 保证金对象服务接口类，要求全部以字符串传输，方便微服务化
 * 新建客户，修改客户，删除客户，查询客户等功能
 *
 * Created by wuxw on 2016/12/27.
 */
public interface IAccountBondObjServiceDao {


    /**
     * 保存 保证金对象信息
     * @param info
     * @throws DAOException DAO异常
     */
    void saveAccountBondObjInfo(Map info) throws DAOException;




    /**
     * 查询保证金对象信息（instance过程）
     * 根据bId 查询保证金对象信息
     * @param info bId 信息
     * @return 保证金对象信息
     * @throws DAOException DAO异常
     */
    List<Map> getAccountBondObjInfo(Map info) throws DAOException;



    /**
     * 修改保证金对象信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    void updateAccountBondObjInfo(Map info) throws DAOException;


    /**
     * 查询保证金对象总数
     *
     * @param info 保证金对象信息
     * @return 保证金对象数量
     */
    int queryAccountBondObjsCount(Map info);

}

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

New file
@@ -0,0 +1,61 @@
package com.java110.acct.dao;


import com.java110.utils.exception.DAOException;
import com.java110.entity.merchant.BoMerchant;
import com.java110.entity.merchant.BoMerchantAttr;
import com.java110.entity.merchant.Merchant;
import com.java110.entity.merchant.MerchantAttr;


import java.util.List;
import java.util.Map;

/**
 * 保证金组件内部之间使用，没有给外围系统提供服务能力
 * 保证金服务接口类，要求全部以字符串传输，方便微服务化
 * 新建客户，修改客户，删除客户，查询客户等功能
 *
 * Created by wuxw on 2016/12/27.
 */
public interface IAccountBondServiceDao {


    /**
     * 保存 保证金信息
     * @param info
     * @throws DAOException DAO异常
     */
    void saveAccountBondInfo(Map info) throws DAOException;




    /**
     * 查询保证金信息（instance过程）
     * 根据bId 查询保证金信息
     * @param info bId 信息
     * @return 保证金信息
     * @throws DAOException DAO异常
     */
    List<Map> getAccountBondInfo(Map info) throws DAOException;



    /**
     * 修改保证金信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    void updateAccountBondInfo(Map info) throws DAOException;


    /**
     * 查询保证金总数
     *
     * @param info 保证金信息
     * @return 保证金数量
     */
    int queryAccountBondsCount(Map info);

}

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

New file
@@ -0,0 +1,98 @@
package com.java110.acct.dao.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.DAOException;
import com.java110.utils.util.DateUtil;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.acct.dao.IAccountBondObjDetailServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;

/**
 * 保证金明细服务 与数据库交互
 * Created by wuxw on 2017/4/5.
 */
@Service("accountBondObjDetailServiceDaoImpl")
//@Transactional
public class AccountBondObjDetailServiceDaoImpl extends BaseServiceDao implements IAccountBondObjDetailServiceDao {

    private static Logger logger = LoggerFactory.getLogger(AccountBondObjDetailServiceDaoImpl.class);





    /**
     * 保存保证金明细信息 到 instance
     * @param info   bId 信息
     * @throws DAOException DAO异常
     */
    @Override
    public void saveAccountBondObjDetailInfo(Map info) throws DAOException {
        logger.debug("保存保证金明细信息Instance 入参 info : {}",info);

        int saveFlag = sqlSessionTemplate.insert("accountBondObjDetailServiceDaoImpl.saveAccountBondObjDetailInfo",info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存保证金明细信息Instance数据失败："+ JSONObject.toJSONString(info));
        }
    }


    /**
     * 查询保证金明细信息（instance）
     * @param info bId 信息
     * @return List<Map>
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getAccountBondObjDetailInfo(Map info) throws DAOException {
        logger.debug("查询保证金明细信息 入参 info : {}",info);

        List<Map> businessAccountBondObjDetailInfos = sqlSessionTemplate.selectList("accountBondObjDetailServiceDaoImpl.getAccountBondObjDetailInfo",info);

        return businessAccountBondObjDetailInfos;
    }


    /**
     * 修改保证金明细信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    @Override
    public void updateAccountBondObjDetailInfo(Map info) throws DAOException {
        logger.debug("修改保证金明细信息Instance 入参 info : {}",info);

        int saveFlag = sqlSessionTemplate.update("accountBondObjDetailServiceDaoImpl.updateAccountBondObjDetailInfo",info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改保证金明细信息Instance数据失败："+ JSONObject.toJSONString(info));
        }
    }

     /**
     * 查询保证金明细数量
     * @param info 保证金明细信息
     * @return 保证金明细数量
     */
    @Override
    public int queryAccountBondObjDetailsCount(Map info) {
        logger.debug("查询保证金明细数据 入参 info : {}",info);

        List<Map> businessAccountBondObjDetailInfos = sqlSessionTemplate.selectList("accountBondObjDetailServiceDaoImpl.queryAccountBondObjDetailsCount", info);
        if (businessAccountBondObjDetailInfos.size() < 1) {
            return 0;
        }

        return Integer.parseInt(businessAccountBondObjDetailInfos.get(0).get("count").toString());
    }


}

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

New file
@@ -0,0 +1,98 @@
package com.java110.acct.dao.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.DAOException;
import com.java110.utils.util.DateUtil;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.acct.dao.IAccountBondObjServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;

/**
 * 保证金对象服务 与数据库交互
 * Created by wuxw on 2017/4/5.
 */
@Service("accountBondObjServiceDaoImpl")
//@Transactional
public class AccountBondObjServiceDaoImpl extends BaseServiceDao implements IAccountBondObjServiceDao {

    private static Logger logger = LoggerFactory.getLogger(AccountBondObjServiceDaoImpl.class);





    /**
     * 保存保证金对象信息 到 instance
     * @param info   bId 信息
     * @throws DAOException DAO异常
     */
    @Override
    public void saveAccountBondObjInfo(Map info) throws DAOException {
        logger.debug("保存保证金对象信息Instance 入参 info : {}",info);

        int saveFlag = sqlSessionTemplate.insert("accountBondObjServiceDaoImpl.saveAccountBondObjInfo",info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存保证金对象信息Instance数据失败："+ JSONObject.toJSONString(info));
        }
    }


    /**
     * 查询保证金对象信息（instance）
     * @param info bId 信息
     * @return List<Map>
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getAccountBondObjInfo(Map info) throws DAOException {
        logger.debug("查询保证金对象信息 入参 info : {}",info);

        List<Map> businessAccountBondObjInfos = sqlSessionTemplate.selectList("accountBondObjServiceDaoImpl.getAccountBondObjInfo",info);

        return businessAccountBondObjInfos;
    }


    /**
     * 修改保证金对象信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    @Override
    public void updateAccountBondObjInfo(Map info) throws DAOException {
        logger.debug("修改保证金对象信息Instance 入参 info : {}",info);

        int saveFlag = sqlSessionTemplate.update("accountBondObjServiceDaoImpl.updateAccountBondObjInfo",info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改保证金对象信息Instance数据失败："+ JSONObject.toJSONString(info));
        }
    }

     /**
     * 查询保证金对象数量
     * @param info 保证金对象信息
     * @return 保证金对象数量
     */
    @Override
    public int queryAccountBondObjsCount(Map info) {
        logger.debug("查询保证金对象数据 入参 info : {}",info);

        List<Map> businessAccountBondObjInfos = sqlSessionTemplate.selectList("accountBondObjServiceDaoImpl.queryAccountBondObjsCount", info);
        if (businessAccountBondObjInfos.size() < 1) {
            return 0;
        }

        return Integer.parseInt(businessAccountBondObjInfos.get(0).get("count").toString());
    }


}

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

New file
@@ -0,0 +1,98 @@
package com.java110.acct.dao.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.DAOException;
import com.java110.utils.util.DateUtil;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.acct.dao.IAccountBondServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;

/**
 * 保证金服务 与数据库交互
 * Created by wuxw on 2017/4/5.
 */
@Service("accountBondServiceDaoImpl")
//@Transactional
public class AccountBondServiceDaoImpl extends BaseServiceDao implements IAccountBondServiceDao {

    private static Logger logger = LoggerFactory.getLogger(AccountBondServiceDaoImpl.class);





    /**
     * 保存保证金信息 到 instance
     * @param info   bId 信息
     * @throws DAOException DAO异常
     */
    @Override
    public void saveAccountBondInfo(Map info) throws DAOException {
        logger.debug("保存保证金信息Instance 入参 info : {}",info);

        int saveFlag = sqlSessionTemplate.insert("accountBondServiceDaoImpl.saveAccountBondInfo",info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存保证金信息Instance数据失败："+ JSONObject.toJSONString(info));
        }
    }


    /**
     * 查询保证金信息（instance）
     * @param info bId 信息
     * @return List<Map>
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getAccountBondInfo(Map info) throws DAOException {
        logger.debug("查询保证金信息 入参 info : {}",info);

        List<Map> businessAccountBondInfos = sqlSessionTemplate.selectList("accountBondServiceDaoImpl.getAccountBondInfo",info);

        return businessAccountBondInfos;
    }


    /**
     * 修改保证金信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    @Override
    public void updateAccountBondInfo(Map info) throws DAOException {
        logger.debug("修改保证金信息Instance 入参 info : {}",info);

        int saveFlag = sqlSessionTemplate.update("accountBondServiceDaoImpl.updateAccountBondInfo",info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改保证金信息Instance数据失败："+ JSONObject.toJSONString(info));
        }
    }

     /**
     * 查询保证金数量
     * @param info 保证金信息
     * @return 保证金数量
     */
    @Override
    public int queryAccountBondsCount(Map info) {
        logger.debug("查询保证金数据 入参 info : {}",info);

        List<Map> businessAccountBondInfos = sqlSessionTemplate.selectList("accountBondServiceDaoImpl.queryAccountBondsCount", info);
        if (businessAccountBondInfos.size() < 1) {
            return 0;
        }

        return Integer.parseInt(businessAccountBondInfos.get(0).get("count").toString());
    }


}

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

@@ -3,7 +3,7 @@

import com.java110.acct.dao.IAccountBankServiceDao;
import com.java110.dto.accountBank.AccountBankDto;
import com.java110.intf.IAccountBankInnerServiceSMO;
import com.java110.intf.acct.IAccountBankInnerServiceSMO;
import com.java110.po.accountBank.AccountBankPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;

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

New file
@@ -0,0 +1,82 @@
package com.java110.acct.smo.impl;


import com.java110.acct.dao.IAccountBondServiceDao;
import com.java110.dto.accountBond.AccountBondDto;
import com.java110.intf.acct.IAccountBondInnerServiceSMO;
import com.java110.po.accountBond.AccountBondPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * @ClassName FloorInnerServiceSMOImpl
 * @Description 保证金内部服务实现类
 * @Author wuxw
 * @Date 2019/4/24 9:20
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@RestController
public class AccountBondInnerServiceSMOImpl extends BaseServiceSMO implements IAccountBondInnerServiceSMO {

    @Autowired
    private IAccountBondServiceDao accountBondServiceDaoImpl;


    @Override
    public int saveAccountBond(@RequestBody AccountBondPo accountBondPo) {
        int saveFlag = 1;
        accountBondServiceDaoImpl.saveAccountBondInfo(BeanConvertUtil.beanCovertMap(accountBondPo));
        return saveFlag;
    }

     @Override
    public int updateAccountBond(@RequestBody  AccountBondPo accountBondPo) {
        int saveFlag = 1;
         accountBondServiceDaoImpl.updateAccountBondInfo(BeanConvertUtil.beanCovertMap(accountBondPo));
        return saveFlag;
    }

     @Override
    public int deleteAccountBond(@RequestBody  AccountBondPo accountBondPo) {
        int saveFlag = 1;
        accountBondPo.setStatusCd("1");
        accountBondServiceDaoImpl.updateAccountBondInfo(BeanConvertUtil.beanCovertMap(accountBondPo));
        return saveFlag;
    }

    @Override
    public List<AccountBondDto> queryAccountBonds(@RequestBody  AccountBondDto accountBondDto) {

        //校验是否传了 分页信息

        int page = accountBondDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            accountBondDto.setPage((page - 1) * accountBondDto.getRow());
        }

        List<AccountBondDto> accountBonds = BeanConvertUtil.covertBeanList(accountBondServiceDaoImpl.getAccountBondInfo(BeanConvertUtil.beanCovertMap(accountBondDto)), AccountBondDto.class);

        return accountBonds;
    }


    @Override
    public int queryAccountBondsCount(@RequestBody AccountBondDto accountBondDto) {
        return accountBondServiceDaoImpl.queryAccountBondsCount(BeanConvertUtil.beanCovertMap(accountBondDto));    }

    public IAccountBondServiceDao getAccountBondServiceDaoImpl() {
        return accountBondServiceDaoImpl;
    }

    public void setAccountBondServiceDaoImpl(IAccountBondServiceDao accountBondServiceDaoImpl) {
        this.accountBondServiceDaoImpl = accountBondServiceDaoImpl;
    }
}

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

New file
@@ -0,0 +1,82 @@
package com.java110.acct.smo.impl;


import com.java110.acct.dao.IAccountBondObjDetailServiceDao;
import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto;
import com.java110.intf.acct.IAccountBondObjDetailInnerServiceSMO;
import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * @ClassName FloorInnerServiceSMOImpl
 * @Description 保证金明细内部服务实现类
 * @Author wuxw
 * @Date 2019/4/24 9:20
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@RestController
public class AccountBondObjDetailInnerServiceSMOImpl extends BaseServiceSMO implements IAccountBondObjDetailInnerServiceSMO {

    @Autowired
    private IAccountBondObjDetailServiceDao accountBondObjDetailServiceDaoImpl;


    @Override
    public int saveAccountBondObjDetail(@RequestBody AccountBondObjDetailPo accountBondObjDetailPo) {
        int saveFlag = 1;
        accountBondObjDetailServiceDaoImpl.saveAccountBondObjDetailInfo(BeanConvertUtil.beanCovertMap(accountBondObjDetailPo));
        return saveFlag;
    }

     @Override
    public int updateAccountBondObjDetail(@RequestBody  AccountBondObjDetailPo accountBondObjDetailPo) {
        int saveFlag = 1;
         accountBondObjDetailServiceDaoImpl.updateAccountBondObjDetailInfo(BeanConvertUtil.beanCovertMap(accountBondObjDetailPo));
        return saveFlag;
    }

     @Override
    public int deleteAccountBondObjDetail(@RequestBody  AccountBondObjDetailPo accountBondObjDetailPo) {
        int saveFlag = 1;
        accountBondObjDetailPo.setStatusCd("1");
        accountBondObjDetailServiceDaoImpl.updateAccountBondObjDetailInfo(BeanConvertUtil.beanCovertMap(accountBondObjDetailPo));
        return saveFlag;
    }

    @Override
    public List<AccountBondObjDetailDto> queryAccountBondObjDetails(@RequestBody  AccountBondObjDetailDto accountBondObjDetailDto) {

        //校验是否传了 分页信息

        int page = accountBondObjDetailDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            accountBondObjDetailDto.setPage((page - 1) * accountBondObjDetailDto.getRow());
        }

        List<AccountBondObjDetailDto> accountBondObjDetails = BeanConvertUtil.covertBeanList(accountBondObjDetailServiceDaoImpl.getAccountBondObjDetailInfo(BeanConvertUtil.beanCovertMap(accountBondObjDetailDto)), AccountBondObjDetailDto.class);

        return accountBondObjDetails;
    }


    @Override
    public int queryAccountBondObjDetailsCount(@RequestBody AccountBondObjDetailDto accountBondObjDetailDto) {
        return accountBondObjDetailServiceDaoImpl.queryAccountBondObjDetailsCount(BeanConvertUtil.beanCovertMap(accountBondObjDetailDto));    }

    public IAccountBondObjDetailServiceDao getAccountBondObjDetailServiceDaoImpl() {
        return accountBondObjDetailServiceDaoImpl;
    }

    public void setAccountBondObjDetailServiceDaoImpl(IAccountBondObjDetailServiceDao accountBondObjDetailServiceDaoImpl) {
        this.accountBondObjDetailServiceDaoImpl = accountBondObjDetailServiceDaoImpl;
    }
}

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

New file
@@ -0,0 +1,82 @@
package com.java110.acct.smo.impl;


import com.java110.acct.dao.IAccountBondObjServiceDao;
import com.java110.dto.accountBondObj.AccountBondObjDto;
import com.java110.intf.acct.IAccountBondObjInnerServiceSMO;
import com.java110.po.accountBondObj.AccountBondObjPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * @ClassName FloorInnerServiceSMOImpl
 * @Description 保证金对象内部服务实现类
 * @Author wuxw
 * @Date 2019/4/24 9:20
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@RestController
public class AccountBondObjInnerServiceSMOImpl extends BaseServiceSMO implements IAccountBondObjInnerServiceSMO {

    @Autowired
    private IAccountBondObjServiceDao accountBondObjServiceDaoImpl;


    @Override
    public int saveAccountBondObj(@RequestBody AccountBondObjPo accountBondObjPo) {
        int saveFlag = 1;
        accountBondObjServiceDaoImpl.saveAccountBondObjInfo(BeanConvertUtil.beanCovertMap(accountBondObjPo));
        return saveFlag;
    }

     @Override
    public int updateAccountBondObj(@RequestBody  AccountBondObjPo accountBondObjPo) {
        int saveFlag = 1;
         accountBondObjServiceDaoImpl.updateAccountBondObjInfo(BeanConvertUtil.beanCovertMap(accountBondObjPo));
        return saveFlag;
    }

     @Override
    public int deleteAccountBondObj(@RequestBody  AccountBondObjPo accountBondObjPo) {
        int saveFlag = 1;
        accountBondObjPo.setStatusCd("1");
        accountBondObjServiceDaoImpl.updateAccountBondObjInfo(BeanConvertUtil.beanCovertMap(accountBondObjPo));
        return saveFlag;
    }

    @Override
    public List<AccountBondObjDto> queryAccountBondObjs(@RequestBody  AccountBondObjDto accountBondObjDto) {

        //校验是否传了 分页信息

        int page = accountBondObjDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            accountBondObjDto.setPage((page - 1) * accountBondObjDto.getRow());
        }

        List<AccountBondObjDto> accountBondObjs = BeanConvertUtil.covertBeanList(accountBondObjServiceDaoImpl.getAccountBondObjInfo(BeanConvertUtil.beanCovertMap(accountBondObjDto)), AccountBondObjDto.class);

        return accountBondObjs;
    }


    @Override
    public int queryAccountBondObjsCount(@RequestBody AccountBondObjDto accountBondObjDto) {
        return accountBondObjServiceDaoImpl.queryAccountBondObjsCount(BeanConvertUtil.beanCovertMap(accountBondObjDto));    }

    public IAccountBondObjServiceDao getAccountBondObjServiceDaoImpl() {
        return accountBondObjServiceDaoImpl;
    }

    public void setAccountBondObjServiceDaoImpl(IAccountBondObjServiceDao accountBondObjServiceDaoImpl) {
        this.accountBondObjServiceDaoImpl = accountBondObjServiceDaoImpl;
    }
}

 service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -441,6 +441,11 @@
        feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
        businessFee.putAll(feeMap);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);

        //为停车费单独处理
        paramInJson.put("carFeeEndTime", feeInfo.getEndTime());
        paramInJson.put("carPayerObjType", feeInfo.getPayerObjType());
        paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
        return business;
    }


 service-api/src/main/java/com/java110/api/listener/advert/ListAdvertPhotoListener.java

@@ -128,6 +128,8 @@
                    //photoAndVideo.put("url", "/callComponent/download/getFile/file?fileId=" + tmpAdvertItemDto.getUrl() + "&communityId=" + advertDto.getCommunityId());
                    photoAndVideo.put("url", imgUrl + tmpAdvertItemDto.getUrl());
                    photoAndVideo.put("seq", tmpAdvertItemDto.getSeq());
                    photoAndVideo.put("advertType", advertDto.getAdvertType());
                    photoAndVideo.put("pageUrl", advertDto.getPageUrl());
                    advertPhotoAndVideos.add(photoAndVideo);
                }
            }

 service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java

@@ -12,7 +12,9 @@
import com.java110.dto.app.AppDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.entity.center.AppService;
@@ -23,6 +25,8 @@
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeDiscountInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.utils.constant.BusinessTypeConstant;
@@ -42,6 +46,7 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

/**
@@ -80,6 +85,9 @@

    @Autowired
    private IRepairUserInnerServiceSMO repairUserInnerServiceSMO;

    @Autowired
    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;

    @Override
    public String getServiceCode() {
@@ -131,6 +139,8 @@
        if (discountPrice > 0) {
            addDiscount(paramObj, businesses, dataFlowContext);
        }

        dealOwnerCartEndTime(paramObj,businesses);

        //判断是否有派单属性ID
        FeeAttrDto feeAttrDto = new FeeAttrDto();
@@ -211,6 +221,34 @@
        dataFlowContext.setResponseEntity(responseEntity);
    }

    private void dealOwnerCartEndTime(JSONObject paramObj,JSONArray businesses) {
        //为停车费单独处理
        if (paramObj.containsKey("carPayerObjType")
                && FeeDto.PAYER_OBJ_TYPE_CAR.equals(paramObj.getString("carPayerObjType"))) {
            Date feeEndTime = (Date) paramObj.get("carFeeEndTime");
            OwnerCarDto ownerCarDto = new OwnerCarDto();
            ownerCarDto.setCommunityId(paramObj.getString("communityId"));
            ownerCarDto.setCarId(paramObj.getString("carPayerObjId"));
            List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
            //车位费用续租
            if (ownerCarDtos != null) {
                for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
                    if (tmpOwnerCarDto.getEndTime().getTime() < feeEndTime.getTime()) {
                        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
                        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_CAR);
                        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
                        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
                        OwnerCarPo ownerCarPo = new OwnerCarPo();
                        ownerCarPo.setMemberId(tmpOwnerCarDto.getMemberId());
                        ownerCarPo.setEndTime(DateUtil.getFormatTimeString(feeEndTime, DateUtil.DATE_FORMATE_STRING_A));
                        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(OwnerCarPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(ownerCarPo));
                        businesses.add(business);
                    }
                }
            }
        }
    }

    private void judgeDiscount(JSONObject paramObj) throws ParseException {
        FeeDetailDto feeDetailDto = new FeeDetailDto();
        feeDetailDto.setCommunityId(paramObj.getString("communityId"));

 service-api/src/main/java/com/java110/api/listener/owner/ListOwnerMachines.java

@@ -80,6 +80,7 @@
        for (RoomDto tmpRoomDto : rooms) {
            locationObjIds.add(tmpRoomDto.getUnitId());
            locationObjIds.add(tmpRoomDto.getRoomId());
            locationObjIds.add(tmpRoomDto.getFloorId());
        }
        machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));
        List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);

 service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java

@@ -117,7 +117,7 @@
        repairUserDto.setState(RepairUserDto.STATE_DOING);
        repairUserDto.setStaffId(userId);
        List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
        if (repairUserDtos.size() != 1) {
        if (repairUserDtos == null || repairUserDtos.size() != 1) {
            ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "当前用户没有需要处理订单！");
            context.setResponseEntity(responseEntity);
            return;
@@ -127,7 +127,7 @@
        String repairMaterial = "";
        //费用明细(单价 * 数量 = 总价)
        String repairFee = "";
        if (json != null && json.size() > 0 && (maintenanceType.equals("1001") || maintenanceType.equals("1003"))) {
        if (json != null && json.size() > 0 && ("1001".equals(maintenanceType) || "1003".equals(maintenanceType))) {
            Object[] objects = json.toArray();
            //数据前期校验
            for (int i = 0; i < objects.length; i++) {
@@ -318,7 +318,8 @@
        repairUserPo.setContext(reqJson.getString("context"));
        repairUserPo.setCommunityId(reqJson.getString("communityId"));
        super.update(context, repairUserPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR_USER);
        if (repairChannel.equals("Z") || (!StringUtil.isEmpty(maintenanceType) && maintenanceType.equals("1001"))) {  //如果是业主报修或者是有偿的就生成一条新状态，否则不变
        if ((!StringUtil.isEmpty(repairChannel) && "Z".equals(repairChannel))
                || (!StringUtil.isEmpty(maintenanceType) && "1001".equals(maintenanceType))) {  //如果是业主报修或者是有偿的就生成一条新状态，否则不变
            //2.0 给开始节点派支付单
            repairUserDto = new RepairUserDto();
            repairUserDto.setRepairId(reqJson.getString("repairId"));
@@ -333,7 +334,7 @@
            repairUserPo = new RepairUserPo();
            repairUserPo.setRuId("-1");
            repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
            if (maintenanceType.equals("1001")) { //如果是有偿的就走下面(业主报修有偿或者电话申请有偿或者员工报修有偿)
            if ("1001".equals(maintenanceType)) { //如果是有偿的就走下面(业主报修有偿或者电话申请有偿或者员工报修有偿)
                repairUserPo.setState(RepairUserDto.STATE_PAY_FEE);
                repairUserPo.setContext("待支付" + reqJson.getString("totalPrice") + "元");
            } else {
@@ -341,7 +342,7 @@
                repairUserPo.setContext("待评价");
            }
            repairUserPo.setRepairId(reqJson.getString("repairId"));
            if (repairChannel.equals("Z")) {  //如果是业主端报修的走下面的方法
            if ("Z".equals(repairChannel)) {  //如果是业主端报修的走下面的方法
                repairUserPo.setStaffId(repairUserDtos.get(0).getStaffId());
                repairUserPo.setStaffName(repairUserDtos.get(0).getStaffName());
            } else { //如果不是业主报修，并且有偿
@@ -435,7 +436,7 @@
                super.insert(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
            }
        }
        if (publicArea.equals("F") && "1002".equals(reqJson.getString("maintenanceType"))) { //如果不是公共区域且是无偿的走下面
        if ("F".equals(publicArea) && "1002".equals(reqJson.getString("maintenanceType"))) { //如果不是公共区域且是无偿的走下面
            //改变r_repair_pool表maintenance_type维修类型
            RepairPoolPo repairPoolPo = new RepairPoolPo();
            repairPoolPo.setRepairId(reqJson.getString("repairId"));
@@ -446,7 +447,7 @@
            } else if (repairChannel.equals("Z")) { //如果是业主自主报修结单后状态变为待评价
                ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_APPRAISE);
            }
        } else if (publicArea.equals("F") && "1001".equals(reqJson.getString("maintenanceType"))) { //如果不是公共区域且是有偿的走下面
        } else if ("F".equals(publicArea) && "1001".equals(reqJson.getString("maintenanceType"))) { //如果不是公共区域且是有偿的走下面
            //3.0 生成支付费用
            //查询默认费用项
            FeeConfigDto feeConfigDto = new FeeConfigDto();
@@ -502,9 +503,9 @@
            repairPoolPo.setRepairFee(repairFee.substring(0, repairFee.length() - 1));
            super.update(context, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
            ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_PAY);
        } else if (publicArea.equals("T")) {  //公共区域走这里
        } else if ("T".equals(publicArea)) {  //公共区域走这里
            //公共区域用料时修改维修类型和用料
            if (maintenanceType.equals("1003")) {
            if ("1003".equals(maintenanceType)) {
                //改变r_repair_pool表maintenance_type维修类型
                RepairPoolPo repairPoolPo = new RepairPoolPo();
                repairPoolPo.setRepairId(reqJson.getString("repairId"));
@@ -514,9 +515,9 @@
                repairPoolPo.setRepairMaterials(repairMaterial.substring(0, repairMaterial.length() - 1));
                super.update(context, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
            }
            if (repairChannel.equals("T") || repairChannel.equals("D")) { //如果是电话报修和员工代客报修结单后状态变为待回访
            if ("T".equals(repairChannel) || "D".equals(repairChannel)) { //如果是电话报修和员工代客报修结单后状态变为待回访
                ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_RETURN_VISIT);
            } else if (repairChannel.equals("Z")) { //如果是业主自主报修结单后状态变为待评价
            } else if ("Z".equals(repairChannel)) { //如果是业主自主报修结单后状态变为待评价
                ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_APPRAISE);
            }
        }

 service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java

@@ -17,11 +17,18 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.owner.OwnerAttrDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
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;

/**
 * 设备开门功能
@@ -34,6 +41,11 @@

    @Autowired
    IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
    @Autowired
    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;

    @Autowired
    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;

    /**
     * 开门功能
@@ -43,10 +55,57 @@
     */
    @Override
    public ResponseEntity<String> openDoor(JSONObject reqJson) {
        //如果是业主 限制开门次数
        if ("owner".equals(reqJson.getString("userRole"))) {
            OwnerDto ownerDto = new OwnerDto();
            ownerDto.setMemberId(reqJson.getString("userId"));
            ownerDto.setCommunityId(reqJson.getString("communityId"));
            List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
            if (ownerDtos == null || ownerDtos.size() < 1) {
                return ResultVo.error("没有权限开门");
            }

            if (!hasOpenDoorPri(ownerDtos.get(0), reqJson.getString("machineCode"))) {
                return ResultVo.error("今日开门次数已用完，请联系物业客服人员");
            }
        }
        ResultVo resultVo = dataBusInnerServiceSMOImpl.openDoor(reqJson);
        return ResultVo.createResponseEntity(resultVo);
    }

    private boolean hasOpenDoorPri(OwnerDto ownerDto, String machineCode) {

        List<OwnerAttrDto> ownerAttrDtos = ownerDto.getOwnerAttrDtos();

        if (ownerAttrDtos == null || ownerAttrDtos.size() < 1) {
            return true;
        }
        long openDoorCount = -1;
        for (OwnerAttrDto ownerAttrDto : ownerAttrDtos) {
            if (OwnerAttrDto.SPEC_CD_MACHINE_OPEN_COUNT.equals(ownerAttrDto.getSpecCd())) {
                openDoorCount = Long.parseLong(ownerAttrDto.getValue());
            }
        }

        if (openDoorCount == -1) { //说明没有配置 不限制
            return true;
        }

        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
        machineTranslateDto.setCommunityId(ownerDto.getCommunityId());
        machineTranslateDto.setMachineCode(machineCode);
        machineTranslateDto.setObjBId(ownerDto.getMemberId());
        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_OPEN_DOOR);
        machineTranslateDto.setIsNow("Y");
        long count = machineTranslateInnerServiceSMOImpl.queryMachineTranslatesCount(machineTranslateDto);

        if (openDoorCount > count) {
            return true;
        }

        return false;
    }

    /**
     * 重启设备
     *

 service-common/src/main/java/com/java110/common/listener/advert/AbstractAdvertBusinessServiceDataFlowListener.java

@@ -50,6 +50,8 @@
        businessAdvertInfo.put("locationObjId", businessAdvertInfo.get("location_obj_id"));
        businessAdvertInfo.put("seq", businessAdvertInfo.get("seq"));
        businessAdvertInfo.put("viewType", businessAdvertInfo.get("view_type"));
        businessAdvertInfo.put("advertType", businessAdvertInfo.get("advert_type"));
        businessAdvertInfo.put("pageUrl", businessAdvertInfo.get("page_url"));
        businessAdvertInfo.remove("bId");
        businessAdvertInfo.put("statusCd", statusCd);
    }
@@ -88,6 +90,9 @@
        currentAdvertInfo.put("seq", currentAdvertInfo.get("seq"));
        currentAdvertInfo.put("viewType", currentAdvertInfo.get("view_type"));

        currentAdvertInfo.put("advertType", currentAdvertInfo.get("advert_type"));
        currentAdvertInfo.put("pageUrl", currentAdvertInfo.get("page_url"));


        currentAdvertInfo.put("operate", StatusConstant.OPERATE_DEL);
        getAdvertServiceDaoImpl().saveBusinessAdvertInfo(currentAdvertInfo);

 service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java

@@ -105,10 +105,12 @@
                                                      @RequestParam(value = "typeCd", required=false) String typeCd,
                                                      @RequestParam(value = "typeName", required=false) String typeName,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "defaultShow", required = false) String defaultShow,
                                                      @RequestParam(value = "row") int row) {
        ActivitiesTypeDto activitiesTypeDto = new ActivitiesTypeDto();
        activitiesTypeDto.setPage(page);
        activitiesTypeDto.setRow(row);
        activitiesTypeDto.setDefaultShow(defaultShow);
        activitiesTypeDto.setCommunityId(communityId);
        if(!StringUtil.isEmpty(defaultShow)){
            activitiesTypeDto.setDefaultShow(defaultShow);

 service-front/src/main/java/com/java110/front/configuration/ServiceConfiguration.java

@@ -50,6 +50,7 @@
        exclusions.append("/app/loginStaffWechatAuth,");//查询大类
        exclusions.append("/app/staffAuth");//查询大类


        final FilterRegistrationBean registrationBean = new FilterRegistrationBean();
        registrationBean.setFilter(new JwtFilter());
        registrationBean.addUrlPatterns("/");

 service-job/src/main/java/com/java110/job/adapt/fee/DeleteFeeRefreshReportAdapt.java

New file
@@ -0,0 +1,112 @@
package com.java110.job.adapt.fee;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.entity.order.Business;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.report.IReportFeeMonthStatisticsInnerServiceSMO;
import com.java110.intf.report.IReportFeeYearCollectionInnerServiceSMO;
import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.po.fee.PayFeePo;
import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
import com.java110.po.reportFeeYearCollection.ReportFeeYearCollectionPo;
import com.java110.po.reportOweFee.ReportOweFeePo;
import com.java110.utils.util.BeanConvertUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.List;
import java.util.Map;

/**
 * 缴费收据处理
 *
 * @author fqz
 * @date 2020-12-11  18:54
 */
@Component(value = "deleteFeeRefreshReportAdapt")
public class DeleteFeeRefreshReportAdapt extends DatabusAdaptImpl {

    private static Logger logger = LoggerFactory.getLogger(DeleteFeeRefreshReportAdapt.class);

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMO;


    @Autowired
    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;


    @Autowired
    private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;

    @Autowired
    private IReportFeeYearCollectionInnerServiceSMO reportFeeYearCollectionInnerServiceSMOImpl;

    @Autowired
    private IReportFeeMonthStatisticsInnerServiceSMO reportFeeMonthStatisticsInnerServiceSMOImpl;

    //模板信息推送地址
    private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";

    public final static String ALI_SMS_DOMAIN = "ALI_SMS";

    @Override
    public void execute(Business business, List<Business> businesses) {
        JSONObject data = business.getData();
        JSONArray businessPayFees = null;
        if (data.containsKey(PayFeePo.class.getSimpleName())) {
            Object bObj = data.get(PayFeePo.class.getSimpleName());
            if (bObj instanceof JSONObject) {
                businessPayFees = new JSONArray();
                businessPayFees.add(bObj);
            } else if (bObj instanceof Map) {
                businessPayFees = new JSONArray();
                businessPayFees.add(JSONObject.parseObject(JSONObject.toJSONString(bObj)));
            } else if (bObj instanceof List) {
                businessPayFees = JSONArray.parseArray(JSONObject.toJSONString(bObj));
            } else {
                businessPayFees = (JSONArray) bObj;
            }
        } else {
            return;
        }

        if (businessPayFees == null) {
            return;
        }
        for (int bPayFeeIndex = 0; bPayFeeIndex < businessPayFees.size(); bPayFeeIndex++) {
            JSONObject businessPayFee = businessPayFees.getJSONObject(bPayFeeIndex);
            doPayFee(business, businessPayFee);
        }
    }

    private void doPayFee(Business business, JSONObject businessPayFee) {
        //查询缴费明细
        PayFeePo payFeePo = BeanConvertUtil.covertBean(businessPayFee, PayFeePo.class);
        //查询欠费报表
        ReportOweFeePo reportOweFeePo = new ReportOweFeePo();
        reportOweFeePo.setFeeId(payFeePo.getFeeId());
        reportOweFeePo.setCommunityId(payFeePo.getCommunityId());
        reportOweFeeInnerServiceSMOImpl.deleteReportOweFee(reportOweFeePo);


        ReportFeeYearCollectionPo reportFeeYearCollectionPo = new ReportFeeYearCollectionPo();
        reportFeeYearCollectionPo.setFeeId(payFeePo.getFeeId());
        reportFeeYearCollectionPo.setCommunityId(payFeePo.getCommunityId());
        reportFeeYearCollectionInnerServiceSMOImpl.deleteReportFeeYearCollection(reportFeeYearCollectionPo);

        ReportFeeMonthStatisticsPo reportFeeMonthStatisticsPo = new ReportFeeMonthStatisticsPo();
        reportFeeMonthStatisticsPo.setFeeId(payFeePo.getFeeId());
        reportFeeMonthStatisticsPo.setCommunityId(payFeePo.getCommunityId());
        reportFeeMonthStatisticsInnerServiceSMOImpl.deleteReportFeeMonthStatistics(reportFeeMonthStatisticsPo);


    }


}

 service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java

@@ -207,6 +207,17 @@
        } else if ("3000".equals(communityLocationDto.getLocationType())) {// 3000 房屋门
            ownerDto.setRoomId(machinePo.getLocationObjId());
            owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
        }else if ("6000".equals(communityLocationDto.getLocationType())) {// 3000 房屋门
            //先根据单元门ID 查询 房屋
            RoomDto roomDto = new RoomDto();
            roomDto.setFloorId(machinePo.getLocationObjId());
            roomDto.setCommunityId(machinePo.getCommunityId());
            List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
            if (roomDtos == null || roomDtos.size() == 0) { // 楼栋下没有房屋
                return ownerDtos;
            }
            ownerDto.setRoomIds(getRoomIds(roomDtos));
            owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
        }
        if (owners == null) {
            return ownerDtos;

 service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java

@@ -144,6 +144,7 @@
        for (RoomDto tRoomDto : rooms) {
            locationObjIds.add(tRoomDto.getUnitId());
            locationObjIds.add(tRoomDto.getRoomId());
            locationObjIds.add(tRoomDto.getFloorId());
        }

        machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));

 service-job/src/main/java/com/java110/job/adapt/hcIot/owner/EditOwnerToIotAdapt.java

@@ -144,6 +144,7 @@
        for (RoomDto tRoomDto : rooms) {
            locationObjIds.add(tRoomDto.getUnitId());
            locationObjIds.add(tRoomDto.getRoomId());
            locationObjIds.add(tRoomDto.getFloorId());
        }

        machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));

 service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java

@@ -151,6 +151,7 @@
        for (RoomDto tRoomDto : rooms) {
            locationObjIds.add(tRoomDto.getUnitId());
            locationObjIds.add(tRoomDto.getRoomId());
            locationObjIds.add(tRoomDto.getFloorId());
        }

        machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));

 service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java

@@ -130,6 +130,7 @@
        for (RoomDto tRoomDto : rooms) {
            locationObjIds.add(tRoomDto.getUnitId());
            locationObjIds.add(tRoomDto.getRoomId());
            locationObjIds.add(tRoomDto.getFloorId());
        }

        machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));

 service-job/src/main/java/com/java110/job/task/fee/GenerateBillProTemplate.java

@@ -5,6 +5,7 @@
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.*;
import com.java110.dto.logSystemError.LogSystemErrorDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.task.TaskDto;
@@ -16,9 +17,12 @@
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.po.logSystemError.LogSystemErrorPo;
import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.TaskTemplateException;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ExceptionUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -73,6 +77,9 @@
    @Autowired
    private IComputeFeeSMO computeFeeSMOImpl;

    @Autowired
    private ISaveSystemErrorSMO saveSystemErrorSMOImpl;


    @Override
    protected void process(TaskDto taskDto) throws Exception {
@@ -81,7 +88,17 @@
        List<CommunityDto> communityDtos = getAllCommunity();

        for (CommunityDto communityDto : communityDtos) {
            GenerateBill(taskDto, communityDto);
            try {
                GenerateBill(taskDto, communityDto);
            }catch (Throwable e){

                LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
                logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
                logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
                logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
                saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
                logger.error("费用出账失败" + communityDto.getCommunityId(), e);
            }
        }

    }
@@ -106,7 +123,12 @@
        for (FeeConfigDto tmpFeeConfigDto : feeConfigDtos) {
            try {
                GenerateBillByFeeConfig(taskDto, tmpFeeConfigDto);
            } catch (Exception e) {
            } catch (Throwable e) {
                LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
                logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
                logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
                logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
                saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
                logger.error("费用出账失败" + tmpFeeConfigDto.getConfigId(), e);
            }
        }
@@ -169,7 +191,12 @@
        for (FeeDto tmpFeeDto : feeDtos) {
            try {
                generateFee(startTime, tmpFeeDto, billDto, feeConfigDto);
            } catch (Exception e) {
            } catch (Throwable e) {
                LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
                logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
                logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
                logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
                saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
                logger.error("生成费用失败", e);
            }
        }

 service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java

@@ -208,7 +208,7 @@
                oldAmount = oldAmount.add(new BigDecimal(Double.parseDouble(reportOweFeeDto.getAmountOwed()))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                reportOweFeeItemDto.setAmountOwed(oldAmount.doubleValue() + "");
            }
            if (!StringUtil.isEmpty(reportOweFeeDto.getOwnerName())) {
            if(!StringUtil.isEmpty(reportOweFeeDto.getOwnerName()) && StringUtil.isEmpty(oldReportOweFeeDto.getOwnerName())) {
                oldReportOweFeeDto.setOwnerName(reportOweFeeDto.getOwnerName());
            }
            oldReportOweFeeDto.setUpdateTime(reportOweFeeDto.getUpdateTime());

 service-report/src/main/java/com/java110/report/dao/IReportOweFeeServiceDao.java

@@ -49,6 +49,8 @@
     */
    void updateReportOweFeeInfo(Map info) throws DAOException;

    void deleteReportOweFeeInfo(Map info) throws DAOException;


    /**
     * 查询欠费统计总数

 service-report/src/main/java/com/java110/report/dao/impl/ReportOweFeeServiceDaoImpl.java

@@ -73,6 +73,23 @@
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改欠费统计信息Instance数据失败：" + JSONObject.toJSONString(info));
        }
    }
    /**
     * 修改欠费统计信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    @Override
    public void deleteReportOweFeeInfo(Map info) throws DAOException {
        logger.debug("修改欠费统计信息Instance 入参 info : {}",info);

        int saveFlag = sqlSessionTemplate.update("reportOweFeeServiceDaoImpl.deleteReportOweFeeInfo",info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改欠费统计信息Instance数据失败："+ JSONObject.toJSONString(info));
        }
    }



    /**
     * 查询欠费统计数量

 service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java

@@ -230,7 +230,7 @@
        Calendar configEndTime = Calendar.getInstance();
        configStartTime.setTime(tmpReportFeeDto.getConfigEndTime());
        int endYear = configEndTime.get(Calendar.YEAR);
        int curYear = Calendar.getInstance().get(Calendar.YEAR);
        int curYear = Calendar.getInstance().get(Calendar.YEAR)+1;
        double feePrice = computeFeeSMOImpl.getReportFeePrice(tmpReportFeeDto, null, tmpReportCarDto);
        tmpReportFeeDto.setFeePrice(feePrice);

@@ -322,7 +322,7 @@
        int endYear = configEndTime.get(Calendar.YEAR);

        //当前年
        int curYear = Calendar.getInstance().get(Calendar.YEAR);
        int curYear = Calendar.getInstance().get(Calendar.YEAR)+1;

        double feePrice = computeFeeSMOImpl.getReportFeePrice(tmpReportFeeDto, reportRoomDto, null);
        tmpReportFeeDto.setFeePrice(feePrice);

 service-report/src/main/java/com/java110/report/smo/impl/ReportOweFeeInnerServiceSMOImpl.java

@@ -47,7 +47,7 @@
    public int deleteReportOweFee(@RequestBody ReportOweFeePo reportOweFeePo) {
        int saveFlag = 1;
        reportOweFeePo.setStatusCd("1");
        reportOweFeeServiceDaoImpl.updateReportOweFeeInfo(BeanConvertUtil.beanCovertMap(reportOweFeePo));
        reportOweFeeServiceDaoImpl.deleteReportOweFeeInfo(BeanConvertUtil.beanCovertMap(reportOweFeePo));
        return saveFlag;
    }