Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2022-01-17 48c9414db4b7c44a43524115570796025d38a653

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

 java110-bean/src/main/java/com/java110/dto/parkingSpaceApply/ParkingSpaceApplyDto.java

@@ -29,8 +29,12 @@
private String endTime;
private String state;
private String communityId;


private String feeId;
private String num;
private String paId;
private String parkingTypeName;
private String stateName;
private String carId;
    private Date createTime;

    private String statusCd = "0";
@@ -143,4 +147,52 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String getFeeId() {
        return feeId;
    }

    public void setFeeId(String feeId) {
        this.feeId = feeId;
    }

    public String getNum() {
        return num;
    }

    public void setNum(String num) {
        this.num = num;
    }

    public String getPaId() {
        return paId;
    }

    public void setPaId(String paId) {
        this.paId = paId;
    }

    public String getParkingTypeName() {
        return parkingTypeName;
    }

    public void setParkingTypeName(String parkingTypeName) {
        this.parkingTypeName = parkingTypeName;
    }

    public String getStateName() {
        return stateName;
    }

    public void setStateName(String stateName) {
        this.stateName = stateName;
    }

    public String getCarId() {
        return carId;
    }

    public void setCarId(String carId) {
        this.carId = carId;
    }
}

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

@@ -5,9 +5,6 @@
<mapper namespace="parkingSpaceApplyV1ServiceDaoImpl">





    <!-- 保存车位申请信息 add by wuxw 2018-07-03 -->
    <insert id="saveParkingSpaceApplyInfo" parameterType="Map">
        insert into parking_space_apply(
@@ -18,11 +15,22 @@
    </insert>



    <!-- 查询车位申请信息 add by wuxw 2018-07-03 -->
    <select id="getParkingSpaceApplyInfo" parameterType="Map" resultType="Map">
        select  t.car_brand,t.car_brand carBrand,t.apply_person_name,t.apply_person_name applyPersonName,t.car_num,t.car_num carNum,t.ps_id,t.ps_id psId,t.remark,t.status_cd,t.status_cd statusCd,t.apply_id,t.apply_id applyId,t.car_color,t.car_color carColor,t.car_type,t.car_type carType,t.create_time,t.create_time createTime,t.config_id,t.config_id configId,t.apply_person_link,t.apply_person_link applyPersonLink,t.start_time,t.start_time startTime,t.apply_person_id,t.apply_person_id applyPersonId,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId 
        select t.car_brand,t.car_brand carBrand,t.apply_person_name,t.apply_person_name
        applyPersonName,t.car_num,t.car_num carNum,t.ps_id,t.ps_id psId,t.remark,t.status_cd,t.status_cd
        statusCd,t.apply_id,t.apply_id applyId,t.car_color,t.car_color carColor,t.car_type,t.car_type
        carType,t.create_time,t.create_time createTime,t.config_id,t.config_id
        configId,t.apply_person_link,t.apply_person_link applyPersonLink,t.start_time,t.start_time
        startTime,t.apply_person_id,t.apply_person_id applyPersonId,t.end_time,t.end_time
        endTime,t.state,t.community_id,t.community_id communityId,
        t1.num ,t1.pa_id paId,t3.name parkingTypeName,t4.name stateName,
        t2.car_id carId
from parking_space_apply t 
        left join parking_space t1 on t.ps_id = t1.ps_id  and t1.status_cd =0
        left join owner_car t2 on t.apply_person_id = t2.owner_id and t.community_id =t2.community_id  and t.car_num = t2.car_num and t2.status_cd =0
        left join t_dict t3 on t1.parking_type  = t3.status_cd and t3.table_name ='parking_space' and t3.table_columns ='parking_type'
        left join t_dict t4 on t1.state  = t4.status_cd and t4.table_name ='parking_space' and t4.table_columns ='state'
where 1 =1 
<if test="carBrand !=null and carBrand != ''">
   and t.car_brand= #{carBrand}
@@ -57,6 +65,9 @@
<if test="configId !=null and configId != ''">
   and t.config_id= #{configId}
</if> 
        <if test="feeId !=null and feeId != ''">
            and t.fee_id= #{feeId}
        </if>
<if test="applyPersonLink !=null and applyPersonLink != ''">
   and t.apply_person_link= #{applyPersonLink}
</if> 
@@ -81,8 +92,6 @@
</if> 

    </select>




    <!-- 修改车位申请信息 add by wuxw 2018-07-03 -->
@@ -139,7 +148,8 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if> 
 where 1=1 <if test="applyId !=null and applyId != ''">
        where 1=1
        <if test="applyId !=null and applyId != ''">
and t.apply_id= #{applyId}
</if> 

@@ -183,6 +193,9 @@
<if test="configId !=null and configId != ''">
   and t.config_id= #{configId}
</if> 
        <if test="feeId !=null and feeId != ''">
            and t.fee_id= #{feeId}
        </if>
<if test="applyPersonLink !=null and applyPersonLink != ''">
   and t.apply_person_link= #{applyPersonLink}
</if> 

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

@@ -5,23 +5,25 @@
<mapper namespace="payFeeNewV1ServiceDaoImpl">





    <!-- 保存费用明细信息 add by wuxw 2018-07-03 -->
    <insert id="savePayFeeNewInfo" parameterType="Map">
        insert into pay_fee(
amount,fee_type_cd,batch_id,fee_id,user_id,income_obj_id,config_id,fee_flag,start_time,end_time,state,community_id,payer_obj_type,payer_obj_id
        amount,fee_type_cd,batch_id,fee_id,user_id,income_obj_id,config_id,fee_flag,start_time,
        end_time,state,community_id,payer_obj_type,payer_obj_id,b_id
) values (
#{amount},#{feeTypeCd},#{batchId},#{feeId},#{userId},#{incomeObjId},#{configId},#{feeFlag},#{startTime},#{endTime},#{state},#{communityId},#{payerObjType},#{payerObjId}
        #{amount},#{feeTypeCd},#{batchId},#{feeId},#{userId},#{incomeObjId},#{configId},#{feeFlag},#{startTime},
        #{endTime},#{state},#{communityId},#{payerObjType},#{payerObjId},#{bId}
)
    </insert>



    <!-- 查询费用明细信息 add by wuxw 2018-07-03 -->
    <select id="getPayFeeNewInfo" parameterType="Map" resultType="Map">
        select  t.amount,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.status_cd,t.status_cd statusCd,t.batch_id,t.batch_id batchId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id userId,t.income_obj_id,t.income_obj_id incomeObjId,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag feeFlag,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId 
        select t.amount,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.status_cd,t.status_cd statusCd,t.batch_id,t.batch_id
        batchId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id userId,t.income_obj_id,t.income_obj_id
        incomeObjId,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag feeFlag,t.start_time,t.start_time
        startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id
        communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId
from pay_fee t 
where 1 =1 
<if test="amount !=null and amount != ''">
@@ -77,8 +79,6 @@
    </select>




    <!-- 修改费用明细信息 add by wuxw 2018-07-03 -->
    <update id="updatePayFeeNewInfo" parameterType="Map">
        update  pay_fee t set t.status_cd = #{statusCd}
@@ -124,7 +124,8 @@
<if test="payerObjId !=null and payerObjId != ''">
, t.payer_obj_id= #{payerObjId}
</if> 
 where 1=1 <if test="feeId !=null and feeId != ''">
        where 1=1
        <if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if> 


 service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java

@@ -161,7 +161,7 @@
        payFeePo.setStartTime(parkingSpaceApply.getStartTime());
        payFeePo.setEndTime(parkingSpaceApply.getEndTime());
        payFeePo.setAmount("0");
        payFeePo.setFeeFlag("1003006");
        payFeePo.setFeeFlag(feeConfig.getFeeFlag());
        payFeePo.setState("2009001");
        payFeePo.setPayerObjType("6666");
        payFeePo.setBatchId("-1");

 service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java

@@ -15,12 +15,14 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parkingSpaceApply.ParkingSpaceApplyDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.fee.bmo.fee.IFeeBMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
@@ -30,8 +32,10 @@
import com.java110.po.car.OwnerCarPo;
import com.java110.po.couponUser.CouponUserPo;
import com.java110.po.couponUserDetail.CouponUserDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.po.parkingSpaceApply.ParkingSpaceApplyPo;
import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.exception.CmdException;
@@ -94,7 +98,8 @@
    private ICouponUserV1InnerServiceSMO couponUserV1InnerServiceSMOImpl;
    @Autowired
    private ICouponUserDetailV1InnerServiceSMO couponUserDetailV1InnerServiceSMOImpl;

    @Autowired
    private IParkingSpaceApplyV1InnerServiceSMO parkingSpaceApplyV1InnerServiceSMOImpl;
    @Autowired
    private IAccountInnerServiceSMO accountInnerServiceSMOImpl;

@@ -224,6 +229,21 @@
            }

        }
        //回调判断 车位申请表是否有数据，有数据则刷新申请表状态为 3003 完成状态即可
        //判断车辆是否已经有申请单
        ParkingSpaceApplyDto parkingSpaceApplyDto = new ParkingSpaceApplyDto();
        parkingSpaceApplyDto.setFeeId(paramObj.getString("feeId"));
        parkingSpaceApplyDto.setState("2002");//审核中
        List<ParkingSpaceApplyDto> parkingSpaceApplyDtos = parkingSpaceApplyV1InnerServiceSMOImpl.queryParkingSpaceApplys(parkingSpaceApplyDto);
        if (parkingSpaceApplyDtos != null && parkingSpaceApplyDtos.size() > 0) {
            ParkingSpaceApplyPo parkingSpaceApplyPo = new ParkingSpaceApplyPo();
            parkingSpaceApplyPo.setApplyId(parkingSpaceApplyDtos.get(0).getApplyId());
            parkingSpaceApplyPo.setState("3003");
            int flag = parkingSpaceApplyV1InnerServiceSMOImpl.updateParkingSpaceApply(parkingSpaceApplyPo);
            if (flag < 1) {
                throw new CmdException("更新车位申请表状态失败");
            }
        }

        cmdDataFlowContext.setResponseEntity(ResultVo.success());
    }