wuxw
2020-01-31 a3efde2c2b9aad266ad2fce88761135782560c35
优化费用功能
3个文件已修改
17 ■■■■■ 已修改文件
Api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/feePackage/roomCreateFee/roomCreateFee.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/feePackage/roomCreateFeeAdd/roomCreateFeeAdd.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java
@@ -78,7 +78,8 @@
        feeConfigDto.setConfigId(reqJson.getString("configId"));
        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
        Assert.listOnlyOne(feeConfigDtos, "当前费用项ID不存在或存在多条" + reqJson.getString("configId"));
        reqJson.put("feeTypeCd", reqJson.getString("feeTypeCd"));
        reqJson.put("feeTypeCd", feeConfigDtos.get(0).getFeeTypeCd());
        reqJson.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
        //判断收费范围
        RoomDto roomDto = new RoomDto();
        if (reqJson.containsKey("roomState") && "2001".equals(reqJson.getString("roomState"))) {
@@ -130,7 +131,7 @@
        //添加单元信息
        for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) {
            businesses.add(addFee(roomDtos.get(0), reqJson, context));
            businesses.add(addFee(roomDtos.get(roomIndex), reqJson, context));
            if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
                paramInObj = super.restToCenterProtocol(businesses, context.getRequestCurrentHeaders());
@@ -191,6 +192,8 @@
        businessUnit.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
        businessUnit.put("communityId", paramInJson.getString("communityId"));
        businessUnit.put("payerObjId", roomDto.getRoomId());
        businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
        businessUnit.put("state", "2008001");
        businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessUnit);
WebService/src/main/resources/components/feePackage/roomCreateFee/roomCreateFee.html
@@ -82,10 +82,10 @@
                                style="margin-left:10px" v-on:click="_openRoomCreateFeeAddModal(null,true)">
                            <i class="glyphicon glyphicon-plus"></i> 批量创建收费
                        </button>
                        <button type="button" class="btn btn-primary btn-sm"
                                style="margin-left:10px" v-on:click="_openAddRoom()">
                            <i class="glyphicon glyphicon-plus"></i> 批量取消收费
                        </button>
<!--                        <button type="button" class="btn btn-primary btn-sm"-->
<!--                                style="margin-left:10px" v-on:click="_openAddRoom()">-->
<!--                            <i class="glyphicon glyphicon-plus"></i> 批量取消收费-->
<!--                        </button>-->
                    </div>
                </div>
                <div class="ibox-content">
WebService/src/main/resources/components/feePackage/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -127,7 +127,7 @@
                        //关闭model
                        $('#roomCreateFeeAddModel').modal('hide');
                        vc.component.clearAddFeeConfigInfo();
                        vc.toast("收费成功");
                        vc.toast("创建收费成功,总共["+res.totalRoom+"]房屋,成功["+res.successRoom+"],失败["+res.errorRoom+"]",8000);
                        return;
                    }
                    vc.message(json);