曾成
2020-05-12 46e12e1992e036bc8cd811b2d5c11db6d3573887
调整退费
7个文件已修改
190 ■■■■ 已修改文件
Api/src/main/java/com/java110/api/bmo/returnPayFee/IReturnPayFeeBMO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/returnPayFee/impl/ReturnPayFeeBMOImpl.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/returnPayFee/SaveReturnPayFeeListener.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/returnPayFee/UpdateReturnPayFeeListener.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/returnPayFee/IReturnPayFeeBMO.java
@@ -24,6 +24,7 @@
     * @return 订单服务能够接受的报文
     */
    JSONObject updateReturnPayFee(JSONObject paramInJson, DataFlowContext dataFlowContext);
    JSONObject updateFeeDetail(JSONObject paramInJson, DataFlowContext dataFlowContext);
    JSONObject addFeeDetail(JSONObject paramInJson, DataFlowContext dataFlowContext);
Api/src/main/java/com/java110/api/bmo/returnPayFee/impl/ReturnPayFeeBMOImpl.java
@@ -5,9 +5,11 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.returnPayFee.IReturnPayFeeBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.fee.IFeeDetailInnerServiceSMO;
import com.java110.core.smo.file.IFileInnerServiceSMO;
import com.java110.core.smo.file.IFileRelInnerServiceSMO;
import com.java110.core.smo.returnPayFee.IReturnPayFeeInnerServiceSMO;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.returnPayFee.ReturnPayFeeDto;
import com.java110.utils.constant.BusinessTypeConstant;
@@ -24,6 +26,8 @@
    @Autowired
    private IReturnPayFeeInnerServiceSMO returnPayFeeInnerServiceSMOImpl;
    @Autowired
    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
    /**
     * 添加小区信息
@@ -76,6 +80,26 @@
        return business;
    }
    public JSONObject updateFeeDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        FeeDetailDto feeDetailDto = new FeeDetailDto();
        feeDetailDto.setDetailId(paramInJson.getString("detailId"));
        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
        Assert.listOnlyOne(feeDetailDtos, "未找到需要修改的活动 或多条数据");
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_DETAIL);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessReturnPayFee = new JSONObject();
        businessReturnPayFee.putAll(BeanConvertUtil.beanCovertMap(feeDetailDtos.get(0)));
        businessReturnPayFee.putAll(paramInJson);
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeDetail", businessReturnPayFee);
        return business;
    }
    public JSONObject addFeeDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
Api/src/main/java/com/java110/api/listener/returnPayFee/SaveReturnPayFeeListener.java
@@ -47,6 +47,8 @@
        //添加单元信息
        businesses.add(returnPayFeeBMOImpl.addReturnPayFee(reqJson, context));
        reqJson.put("state","1000");
        businesses.add(returnPayFeeBMOImpl.updateFeeDetail(reqJson, context));
        ResponseEntity<String> responseEntity = returnPayFeeBMOImpl.callService(context, service.getServiceCode(), businesses);
Api/src/main/java/com/java110/api/listener/returnPayFee/UpdateReturnPayFeeListener.java
@@ -42,9 +42,28 @@
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        businesses.add(returnPayFeeBMOImpl.updateReturnPayFee(reqJson, context));
        if("1100".equals( reqJson.getString("state"))){
        //退费审核通过
        if("1100".equals(reqJson.getString("state"))){
            reqJson.put("state","1300");
            businesses.add(returnPayFeeBMOImpl.addFeeDetail(reqJson, context));
            reqJson.put("state","1100");
            String cycles = (String) reqJson.get("cycles");
            String receivableAmount = (String) reqJson.get("receivableAmount");
            String receivedAmount = (String) reqJson.get("receivedAmount");
            reqJson.put("cycles",cycles.split("-")[1]);
            reqJson.put("receivableAmount",receivableAmount.split("-")[1]);
            reqJson.put("receivedAmount",receivedAmount.split("-")[1]);
            reqJson.put("createTime",reqJson.get("payTime"));
            businesses.add(returnPayFeeBMOImpl.updateFeeDetail(reqJson, context));
        }
        //不通过
        if("1200".equals(reqJson.getString("state"))){
            reqJson.put("state","1200");
            businesses.add(returnPayFeeBMOImpl.updateFeeDetail(reqJson, context));
        }
        ResponseEntity<String> responseEntity = returnPayFeeBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
    }
java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
@@ -16,13 +16,13 @@
public class FeeDetailDto extends PageDto implements Serializable {
    private String primeRate;
private String detailId;
private String receivableAmount;
private String cycles;
private String remark;
private String receivedAmount;
private String communityId;
private String feeId;
    private String detailId;
    private String receivableAmount;
    private String cycles;
    private String remark;
    private String receivedAmount;
    private String communityId;
    private String feeId;
    private Date createTime;
@@ -30,54 +30,71 @@
    private Date endTime;
    private String statusCd = "0";
    private String state;
    private String stateName;
    public String getPrimeRate() {
        return primeRate;
    }
public void setPrimeRate(String primeRate) {
    public void setPrimeRate(String primeRate) {
        this.primeRate = primeRate;
    }
public String getDetailId() {
    public String getDetailId() {
        return detailId;
    }
public void setDetailId(String detailId) {
    public void setDetailId(String detailId) {
        this.detailId = detailId;
    }
public String getReceivableAmount() {
    public String getReceivableAmount() {
        return receivableAmount;
    }
public void setReceivableAmount(String receivableAmount) {
    public void setReceivableAmount(String receivableAmount) {
        this.receivableAmount = receivableAmount;
    }
public String getCycles() {
    public String getCycles() {
        return cycles;
    }
public void setCycles(String cycles) {
    public void setCycles(String cycles) {
        this.cycles = cycles;
    }
public String getRemark() {
    public String getRemark() {
        return remark;
    }
public void setRemark(String remark) {
    public void setRemark(String remark) {
        this.remark = remark;
    }
public String getReceivedAmount() {
    public String getReceivedAmount() {
        return receivedAmount;
    }
public void setReceivedAmount(String receivedAmount) {
    public void setReceivedAmount(String receivedAmount) {
        this.receivedAmount = receivedAmount;
    }
public String getCommunityId() {
    public String getCommunityId() {
        return communityId;
    }
public void setCommunityId(String communityId) {
    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
public String getFeeId() {
    public String getFeeId() {
        return feeId;
    }
public void setFeeId(String feeId) {
    public void setFeeId(String feeId) {
        this.feeId = feeId;
    }
@@ -113,4 +130,20 @@
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    public String getStateName() {
        return stateName;
    }
    public void setStateName(String stateName) {
        this.stateName = stateName;
    }
}
java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java
@@ -26,6 +26,8 @@
    private String createTime;
    private String state;
    private String stateName;
    public String getPrimeRate() {
@@ -100,4 +102,20 @@
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    public String getStateName() {
        return stateName;
    }
    public void setStateName(String stateName) {
        this.stateName = stateName;
    }
}
java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
@@ -6,20 +6,25 @@
    <!-- 保存费用明细信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessFeeDetailInfo" parameterType="Map">
           insert into business_pay_fee_detail(
operate,prime_rate,detail_id,receivable_amount,cycles,remark,received_amount,community_id,b_id,fee_id
) values (
#{operate},#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId}
)
        insert into
        business_pay_fee_detail(
            operate,prime_rate,detail_id,
            receivable_amount,cycles,remark,
            received_amount,community_id,b_id,fee_id,state) values (
            #{operate},#{primeRate},#{detailId},#{receivableAmount},
            #{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state})
       </insert>
    <!-- 查询费用明细信息(Business) add by wuxw 2018-07-03 -->
    <select id="getBusinessFeeDetailInfo" parameterType="Map" resultType="Map">
        select t.operate,t.prime_rate,t.prime_rate primeRate,t.detail_id,t.detail_id
        detailId,t.receivable_amount,t.receivable_amount
        receivableAmount,t.cycles,t.remark,t.received_amount,t.received_amount
        receivedAmount,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId
        select
            t.operate,t.prime_rate,t.prime_rate primeRate,t.detail_id,
            t.detail_id detailId,t.receivable_amount,
            t.receivable_amount receivableAmount,t.cycles,
            t.remark,t.received_amount,t.received_amount receivedAmount,
            t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
            t.fee_id,t.fee_id feeId,t.state
        from business_pay_fee_detail t
        where 1 =1
        <if test="operate !=null and operate != ''">
@@ -58,10 +63,10 @@
    <!-- 保存费用明细信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveFeeDetailInfoInstance" parameterType="Map">
        insert into pay_fee_detail(
        prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id
        ) select
        t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id
        insert into
            pay_fee_detail(
                prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state) select
        t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state
        from business_pay_fee_detail t where 1=1
        and t.operate= 'ADD'
        <if test="primeRate !=null and primeRate != ''">
@@ -97,12 +102,15 @@
    <!-- 查询费用明细信息 add by wuxw 2018-07-03 -->
    <select id="getFeeDetailInfo" parameterType="Map" resultType="Map">
        select t.prime_rate,t.prime_rate primeRate,t.detail_id,t.detail_id
        detailId,t.receivable_amount,t.receivable_amount receivableAmount,
        t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
        receivedAmount,t.community_id,
        t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime
        select
            t.prime_rate,t.prime_rate primeRate,
            t.detail_id,t.detail_id detailId,
            t.receivable_amount,t.receivable_amount receivableAmount,
            t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
            t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime,
            t.state,d.name stateName
        from pay_fee_detail t
        left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
        where 1 =1
        <if test="primeRate !=null and primeRate != ''">
            and t.prime_rate= #{primeRate}
@@ -173,6 +181,9 @@
        <if test="communityId !=null and communityId != ''">
            , t.community_id= #{communityId}
        </if>
        <if test="state !=null and state != ''">
            , t.state= #{state}
        </if>
        <if test="feeId !=null and feeId != ''">
            , t.fee_id= #{feeId}
        </if>