| @@ -238,7 +238,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||
| Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); | |||
| wxPropertyContract.setContractType(contractType); | |||
| wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode()); | |||
| return wxPropertyContractService.save(wxPropertyContract, user.getId(), user.getName(),false); | |||
| return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false); | |||
| } | |||
| //第二步,设置价格, | |||
| @@ -260,7 +260,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||
| if (null != wxPropertyContract.getFeeStandards() && wxPropertyContract.getFeeStandards().size() > 0 ) { | |||
| wxPropertyContract.setFeesStandardsInfo(JSON.toJSONString(wxPropertyContract.getFeeStandards())); | |||
| } | |||
| return wxPropertyContractService.updateMoney(wxPropertyContract, user.getId(), user.getName(),false); | |||
| return wxPropertyContractService.updateMoney(wxPropertyContract, user, user.getName(),false); | |||
| } | |||
| //物业合同-最后一步切换 按什么日期生成账单 | |||
| @@ -280,7 +280,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||
| if (null != wxPropertyContract.getFeeStandards() && wxPropertyContract.getFeeStandards().size() > 0 ) { | |||
| wxPropertyContract.setFeesStandardsInfo(JSON.toJSONString(wxPropertyContract.getFeeStandards())); | |||
| } | |||
| return wxPropertyContractService.updateMoney(propertyContract, user.getId(), user.getName(),false); | |||
| return wxPropertyContractService.updateMoney(propertyContract, user, user.getName(),false); | |||
| } | |||
| //第三步提交 | |||
| @@ -290,7 +290,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||
| MallUserInfo user = getUser(); | |||
| wxPropertyContract.updateTenantInfo(user); | |||
| wxPropertyContract.setAdjustPeriodHandle(); | |||
| return wxPropertyContractService.updateFile(wxPropertyContract, user.getId(), user.getName(),true); | |||
| return wxPropertyContractService.updateFile(wxPropertyContract, user, user.getName(),true); | |||
| } | |||
| @@ -343,6 +343,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||
| if (null == contract) { | |||
| return new ResultData(Result.ERROR, "合同不存在."); | |||
| } | |||
| MallUserInfo user = this.getUser(); | |||
| if (contract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue() || | |||
| contract.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || | |||
| (contract.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() | |||
| @@ -350,6 +351,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||
| contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { | |||
| contract.setStatus(EnumRentContractStatus.INVALID.getCode()); | |||
| contract.setUpdatetime(new Date()); | |||
| contract.setUpdateBy(user.getId()); | |||
| try { | |||
| wxPropertyContractService.updatePropertyContract(contract); | |||
| return new ResultData(contract); | |||
| @@ -566,7 +568,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||
| if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ | |||
| dbRent.setRentalStartDate(dbRent.getStartDate()); | |||
| } | |||
| List<WxBillProperty> result = wxPropertyContractService.buildProperty(new WxMerchant(),getUserId(),dbRent, EnumIsPreview.YES.getCode(), false); | |||
| List<WxBillProperty> result = wxPropertyContractService.buildProperty(new WxMerchant(),getUser(),dbRent, EnumIsPreview.YES.getCode(), false); | |||
| return new ResultData(result); | |||
| } | |||
| @@ -188,7 +188,7 @@ public class WxRentContractController extends WxContractBaseController { | |||
| if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ | |||
| wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); | |||
| } | |||
| return wxRentContractService.save(wxRentContract, user.getId(),user.getName(),oldDate); | |||
| return wxRentContractService.save(wxRentContract, user,user.getName(),oldDate); | |||
| } | |||
| @@ -226,7 +226,7 @@ public class WxRentContractController extends WxContractBaseController { | |||
| } | |||
| wxRentContract.setRentShopType(null); | |||
| wxRentContract.setOperationType(null); | |||
| return wxRentContractService.update(wxRentContract, user.getId(),user.getName(),EnumFromType.OTHER.getCode(),oldDate,false); | |||
| return wxRentContractService.update(wxRentContract, user,user.getName(),EnumFromType.OTHER.getCode(),oldDate,false); | |||
| } | |||
| /** | |||
| @@ -299,7 +299,7 @@ public class WxRentContractController extends WxContractBaseController { | |||
| } | |||
| ResultData update = null; | |||
| try { | |||
| update = wxRentContractService.updateOneStep(rentContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode(), oldDate,false); | |||
| update = wxRentContractService.updateOneStep(rentContract, user, user.getName(), EnumFromType.OTHER.getCode(), oldDate,false); | |||
| } catch (MallinkException e) { | |||
| return new ResultData(update.code,update.message); | |||
| } | |||
| @@ -430,6 +430,7 @@ public class WxRentContractController extends WxContractBaseController { | |||
| if (null == contract) { | |||
| return new ResultData(Result.ERROR, "合同不存在."); | |||
| } | |||
| MallUserInfo user = this.getUser(); | |||
| if (contract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue() || | |||
| contract.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || | |||
| (contract.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() | |||
| @@ -437,13 +438,16 @@ public class WxRentContractController extends WxContractBaseController { | |||
| contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { | |||
| contract.setStatus(EnumRentContractStatus.INVALID.getCode()); | |||
| contract.setUpdatetime(new Date()); | |||
| contract.setUpdateBy(user.getId()); | |||
| wxRentContractService.updateRentContract(contract); | |||
| if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { | |||
| if (null != wxRentContract.getPropertyId()) { | |||
| WxPropertyContract propertyContract = wxPropertyContractService.getSimpleDetail(wxRentContract.getPropertyId()); | |||
| propertyContract.setStatus(EnumRentContractStatus.INVALID.getCode()); | |||
| propertyContract.setUpdatetime(new Date()); | |||
| propertyContract.setUpdateBy(user.getId()); | |||
| wxPropertyContractService.updatePropertyContract(propertyContract); | |||
| } | |||
| } | |||
| @@ -800,7 +804,7 @@ public class WxRentContractController extends WxContractBaseController { | |||
| if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ | |||
| dbRent.setRentalStartDate(dbRent.getStartDate()); | |||
| } | |||
| List<WxBillRent> result = wxRentContractService.buildRent(getUserId(),dbRent, EnumIsPreview.YES.getCode(), false); | |||
| List<WxBillRent> result = wxRentContractService.buildRent(getUser(),dbRent, EnumIsPreview.YES.getCode(), false); | |||
| return new ResultData(result); | |||
| } | |||
| @@ -821,7 +825,7 @@ public class WxRentContractController extends WxContractBaseController { | |||
| rentContract.updateTenantInfo(user); | |||
| rentContract.setAdjustPeriodHandle(); | |||
| rentContract.setRentStartType(wxRentContract.getRentStartType()); | |||
| return wxRentContractService.update(rentContract, user.getId(),user.getName(), EnumFromType.SWITCH.getCode(),oldDate,false); | |||
| return wxRentContractService.update(rentContract, user,user.getName(), EnumFromType.SWITCH.getCode(),oldDate,false); | |||
| } | |||
| // @GetMapping("exportContract") | |||
| @@ -45,10 +45,6 @@ public class WxBillDaily extends WxBillBaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | |||
| private Date payDate; | |||
| @Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss") | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| private Date createtime; | |||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | |||
| private Long expiredDay; | |||
| @@ -66,8 +62,6 @@ public class WxBillDaily extends WxBillBaseEntity { | |||
| private Long shopId; | |||
| @io.swagger.annotations.ApiModelProperty(value="商铺",name="shopName") | |||
| private String shopName; | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | |||
| private Integer payWay; | |||
| @@ -36,9 +36,6 @@ public class WxBillDeposit extends WxBillBaseEntity { | |||
| @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12") | |||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | |||
| private Date payDate; | |||
| @Excel(name = "创建日期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13") | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| private Date createtime; | |||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | |||
| private Long expiredDay; | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus") | |||
| @@ -53,8 +50,6 @@ public class WxBillDeposit extends WxBillBaseEntity { | |||
| private Long userId; | |||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | |||
| private Long shopId; | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | |||
| private String returnPrice; | |||
| @@ -48,10 +48,6 @@ public class WxBillOther extends WxBillBaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | |||
| private Date payDate; | |||
| @Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss") | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| private Date createtime; | |||
| //@Excel(name = "逾期(天)", orderNum = "10", width = 20) | |||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | |||
| private Long expiredDay; | |||
| @@ -68,8 +64,6 @@ public class WxBillOther extends WxBillBaseEntity { | |||
| private Long userId; | |||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | |||
| private Long shopId; | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | |||
| private Integer payWay; | |||
| @@ -42,10 +42,6 @@ public class WxBillOtherDeposit extends WxBillBaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value = "到账日期", name = "payDate") | |||
| private Date payDate; | |||
| @Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss") | |||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime") | |||
| private Date createtime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "逾期天数", name = "expiredDay") | |||
| private Long expiredDay; | |||
| @@ -61,8 +57,6 @@ public class WxBillOtherDeposit extends WxBillBaseEntity { | |||
| private Long userId; | |||
| @io.swagger.annotations.ApiModelProperty(value = "商铺ID", name = "shopId") | |||
| private Long shopId; | |||
| @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | |||
| private String returnPrice; | |||
| @@ -45,8 +45,6 @@ public class WxBillProperty extends WxBillBaseEntity { | |||
| @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "11") | |||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | |||
| private Date payDate; | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| private Date createtime; | |||
| //@Excel(name = "逾期(天) ", width = 20, orderNum = "13") | |||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | |||
| @@ -66,9 +64,6 @@ public class WxBillProperty extends WxBillBaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | |||
| private Long shopId; | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") | |||
| private String revenue; | |||
| @@ -39,9 +39,6 @@ public class WxBillPropertyDeposit extends WxBillBaseEntity { | |||
| @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12") | |||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | |||
| private Date payDate; | |||
| @Excel(name = "创建日期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13") | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| private Date createtime; | |||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | |||
| private Long expiredDay; | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus") | |||
| @@ -56,8 +53,6 @@ public class WxBillPropertyDeposit extends WxBillBaseEntity { | |||
| private Long userId; | |||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | |||
| private Long shopId; | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | |||
| private String returnPrice; | |||
| @@ -43,9 +43,6 @@ public class WxBillRent extends WxBillBaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | |||
| private Date payDate; | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| private Date createtime; | |||
| //@Excel(name = "逾期(天) ", width = 20, orderNum = "14") | |||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | |||
| private Long expiredDay; | |||
| @@ -130,9 +127,6 @@ public class WxBillRent extends WxBillBaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | |||
| private Long shopId; | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") | |||
| private String revenue; | |||
| @@ -45,9 +45,6 @@ public class WxBillRentManage extends WxBillBaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | |||
| private Date payDate; | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| private Date createtime; | |||
| //@Excel(name = "逾期(天) ", width = 20, orderNum = "14") | |||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | |||
| private Long expiredDay; | |||
| @@ -71,9 +68,6 @@ public class WxBillRentManage extends WxBillBaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | |||
| private Long shopId; | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | |||
| private Integer latePayRatio; | |||
| @@ -145,7 +139,11 @@ public class WxBillRentManage extends WxBillBaseEntity { | |||
| this.userId = billRent.getUserId(); | |||
| this.shopId = billRent.getShopId(); | |||
| this.createtime = billRent.getCreatetime(); | |||
| this.createBy = billRent.getCreateBy(); | |||
| this.createByName = billRent.getCreateByName(); | |||
| this.updatetime = billRent.getUpdatetime(); | |||
| this.updateBy = billRent.getUpdateBy(); | |||
| this.updateByName = billRent.getUpdateByName(); | |||
| this.rentShopType = billRent.getRentShopType(); | |||
| this.period = billRent.getPeriod(); | |||
| this.shopInfo = billRent.getShopInfo(); | |||
| @@ -111,9 +111,12 @@ public class WxPropertyContract extends TenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy") | |||
| private Long updateBy; | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| private Date createtime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy") | |||
| private Long createBy; | |||
| @io.swagger.annotations.ApiModelProperty(value="计租面积",name="rentArea") | |||
| private String rentArea; | |||
| @@ -273,10 +273,12 @@ public class WxRentContract extends TenantEntity { | |||
| private String shopName; | |||
| @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") | |||
| private Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy") | |||
| private Long updateBy; | |||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime") | |||
| private Date createtime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy") | |||
| private Long createBy; | |||
| @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") | |||
| private String rentArea; | |||
| @@ -39,6 +39,28 @@ public class WxBillBaseEntity extends TenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") | |||
| protected Integer rentShopType; | |||
| @Excel(name = "制单时间", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13") | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | |||
| protected Date createtime; | |||
| @io.swagger.annotations.ApiModelProperty(value="创建用户编码",name="createBy") | |||
| protected Long createBy; | |||
| @Excel(name = "制单用户", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "14") | |||
| @io.swagger.annotations.ApiModelProperty(value="创建用户名称",name="createBy") | |||
| protected String createByName; | |||
| @Excel(name = "最后修改日期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "15") | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | |||
| protected Date updatetime; | |||
| @io.swagger.annotations.ApiModelProperty(value="创建用户编码",name="createBy") | |||
| protected Long updateBy; | |||
| @Excel(name = "最后修改用户", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "16") | |||
| @io.swagger.annotations.ApiModelProperty(value="创建用户名称",name="createBy") | |||
| protected String updateByName; | |||
| @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "8") | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额(做了减免之后和need可能不一样)",name="receivePay") | |||
| protected String receivePay; | |||
| @@ -43,11 +43,11 @@ public interface WxPropertyContractService { | |||
| * @param userName | |||
| * @return | |||
| */ | |||
| ResultData save(WxPropertyContract record, Long userId, String userName,boolean writeComplate); | |||
| ResultData save(WxPropertyContract record, MallUserInfo user, String userName,boolean writeComplate); | |||
| ResultData updateMoney(WxPropertyContract record, Long userId, String userName,boolean writeComplate); | |||
| ResultData updateMoney(WxPropertyContract record, MallUserInfo user, String userName,boolean writeComplate); | |||
| ResultData updateFile(WxPropertyContract record, Long userId, String userName,boolean writeComplate); | |||
| ResultData updateFile(WxPropertyContract record, MallUserInfo user, String userName,boolean writeComplate); | |||
| /** | |||
| * 根据Id删除实体 | |||
| * | |||
| @@ -78,7 +78,7 @@ public interface WxPropertyContractService { | |||
| //Map<String, Object> updateStatus(WxPropertyContract record); | |||
| List<WxBillProperty> buildProperty(WxMerchant wxMerchant, Long userId, WxPropertyContract propertyContract, Integer isPreview,boolean saveDb); | |||
| List<WxBillProperty> buildProperty(WxMerchant wxMerchant, MallUserInfo user, WxPropertyContract propertyContract, Integer isPreview,boolean saveDb); | |||
| WxPropertyContract getByBill(WxBillProperty billRent); | |||
| @@ -47,11 +47,11 @@ public interface WxRentContractService { | |||
| * @param userName | |||
| * @return | |||
| */ | |||
| ResultData save(WxRentContract record,Long userId,String userName,Date oldRentStartDate); | |||
| ResultData save(WxRentContract record,MallUserInfo user,String userName,Date oldRentStartDate); | |||
| ResultData update(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate,boolean writeComplate); | |||
| ResultData update(WxRentContract record, MallUserInfo user,String userName,int from,Date oldRentStartDate,boolean writeComplate); | |||
| ResultData updateOneStep(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate,boolean writeComplate); | |||
| ResultData updateOneStep(WxRentContract record, MallUserInfo user,String userName,int from,Date oldRentStartDate,boolean writeComplate); | |||
| /** | |||
| * 根据Id删除实体 | |||
| @@ -79,7 +79,7 @@ public interface WxRentContractService { | |||
| void updateApplyStatus(WxRentContract wxRentContract); | |||
| List<WxBillRent> buildRent(Long userId,WxRentContract rentContract,Integer isPreview,boolean saveDb); | |||
| List<WxBillRent> buildRent(MallUserInfo user,WxRentContract rentContract,Integer isPreview,boolean saveDb); | |||
| void buildDeposit(Long userId,Long rentContractId); | |||
| @@ -310,7 +310,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| @Override | |||
| //@Transactional(rollbackFor = {Exception.class}) | |||
| public ResultData save(WxPropertyContract record, Long userId, String userName,boolean writeComplate) { | |||
| public ResultData save(WxPropertyContract record, MallUserInfo user, String userName,boolean writeComplate) { | |||
| //保存物业合同信息 | |||
| if (record.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { | |||
| record.setEndDate(setEndDate(record.getStartDate(),record.getRentalStartDate())); | |||
| @@ -323,13 +323,16 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| record.setCreatetime(date); | |||
| record.setCreateBy(user.getId()); | |||
| record.setUpdatetime(date); | |||
| record.setUpdateBy(user.getId()); | |||
| record.setStatus(EnumRentContractStatus.UNWRITE.getCode()); | |||
| record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); | |||
| wxPropertyContractMapper.insert(record); | |||
| //编辑 | |||
| }else { | |||
| record.setUpdatetime(date); | |||
| record.setUpdateBy(user.getId()); | |||
| wxPropertyContractMapper.updateById(record); | |||
| } | |||
| } catch (Exception e) { | |||
| @@ -354,7 +357,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| @Override | |||
| //@Transactional(rollbackFor = {Exception.class}) | |||
| public ResultData updateMoney(WxPropertyContract record, Long userId, String userName,boolean writeComplate) { | |||
| public ResultData updateMoney(WxPropertyContract record, MallUserInfo user, String userName,boolean writeComplate) { | |||
| //保存物业合同信息 | |||
| WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(record.getId()); | |||
| if (wxPropertyContract == null) { | |||
| @@ -371,7 +374,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| //record.setPrice(StringUtils.isNotBlank(record.getPrice()) ? record.getPrice() : "0"); | |||
| record.setDeposit(StringUtils.isNotBlank(record.getDeposit()) ? record.getDeposit() : "0"); | |||
| record.setUpdatetime(new Date()); | |||
| record.setUpdateBy(user.getId()); | |||
| //如果是合并合同 物业合同的状态为 意向 | |||
| if (writeComplate) { | |||
| record.setStatus(EnumRentContractStatus.DRAFT.getCode()); | |||
| @@ -401,7 +404,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| record.setCreateType(wxPropertyContract.getCreateType()); | |||
| record.setShopIds(wxPropertyContract.getShopIds()); | |||
| record.setFeeStandards(wxPropertyContract.getFeesStardarsList()); | |||
| List<WxBillProperty> billList = buildProperty(new WxMerchant(),userId,record,EnumIsPreview.YES.getCode(),true); | |||
| List<WxBillProperty> billList = buildProperty(new WxMerchant(),user,record,EnumIsPreview.YES.getCode(),true); | |||
| record.setPreviewBillRentList(billList); | |||
| } | |||
| @@ -410,13 +413,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| @Override | |||
| //@Transactional(rollbackFor = {Exception.class}) | |||
| public ResultData updateFile(WxPropertyContract record, Long userId, String userName,boolean writeComplate) { | |||
| public ResultData updateFile(WxPropertyContract record, MallUserInfo user, String userName,boolean writeComplate) { | |||
| WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(record.getId()); | |||
| if (wxPropertyContract == null) { | |||
| return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); | |||
| } | |||
| record.setUpdatetime(new Date()); | |||
| record.setUpdateBy(user.getId()); | |||
| //如果是合并合同 物业合同的状态为 意向 | |||
| if (writeComplate) { | |||
| record.setStatus(EnumRentContractStatus.DRAFT.getCode()); | |||
| @@ -548,7 +551,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| return JSONObject.toJSONString(shopInfo); | |||
| } | |||
| public List<WxBillProperty> buildRentMonth(WxMerchant wxMerchant, Long userId,WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate, String price, Integer isPreview,boolean saveDb) { | |||
| public List<WxBillProperty> buildRentMonth(WxMerchant wxMerchant, MallUserInfo user,WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate, String price, Integer isPreview,boolean saveDb) { | |||
| String adjustRatio = wxPropertyContract.getAdjustRatio(); | |||
| Map<String, Object> shopInfo = new HashMap<>(); | |||
| if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { | |||
| @@ -633,13 +636,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| } | |||
| yearList.add(startDate); | |||
| } | |||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, userId, wxMerchant, billcount, isPreview, shopInfo,saveDb); | |||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, wxMerchant, billcount, isPreview, shopInfo,saveDb); | |||
| List<WxBillProperty> billRentList = (List<WxBillProperty>)resultMap.get("billList"); | |||
| resultList.addAll(billRentList); | |||
| return resultList; | |||
| } | |||
| public Map<String, Object> buildRent(int receivePeriod,String[] priceArrs, List<Date> yearList,int dayType, WxPropertyContract wxPropertyContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview,Map<String, Object> shopInfo,boolean saveDb) { | |||
| public Map<String, Object> buildRent(int receivePeriod,String[] priceArrs, List<Date> yearList,int dayType, WxPropertyContract wxPropertyContract, MallUserInfo user, WxMerchant wxMerchant, int billcount, Integer isPreview,Map<String, Object> shopInfo,boolean saveDb) { | |||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxPropertyContract); | |||
| SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); | |||
| Map<String,Object> resultMap = new HashedMap(); | |||
| @@ -733,7 +736,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| ++billcount; | |||
| //物业主账单 | |||
| WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal,"",null,null); | |||
| WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,user,billcount,shopInfo,standarsTotal,"",null,null); | |||
| //非一次性账单 | |||
| wxBillProperty.setUnFixedbillFeesStandardsList(unFixedList); | |||
| List<WxBillProperty> childList = null; | |||
| @@ -743,7 +746,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| for (int j = 0 ; j < unFixedList.size(); j ++ ) { | |||
| WxBillFeesStandardsListVo svo = unFixedList.get(j); | |||
| svo.setParentBillId(wxBillProperty.getId()); | |||
| WxBillProperty property = generateBillPropertyByBillStandards(wxPayAccountBill,wxPropertyContract,isPreview,userId,svo,billcount,shopInfo); | |||
| WxBillProperty property = generateBillPropertyByBillStandards(wxPayAccountBill,wxPropertyContract,isPreview,user,svo,billcount,shopInfo); | |||
| allResultList.add(property); | |||
| childList.add(property); | |||
| } | |||
| @@ -757,7 +760,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| if (null != fixedList && fixedList.size() > 0 ) { | |||
| for (int i = 0 ; i < fixedList.size(); i ++ ) { | |||
| WxBillFeesStandardsListVo svo = fixedList.get(i); | |||
| WxBillProperty property = generateBillPropertyByBillStandards(wxPayAccountBill,wxPropertyContract,isPreview,userId,svo,billcount,shopInfo); | |||
| WxBillProperty property = generateBillPropertyByBillStandards(wxPayAccountBill,wxPropertyContract,isPreview,user,svo,billcount,shopInfo); | |||
| allResultList.add(property); | |||
| } | |||
| } | |||
| @@ -775,14 +778,14 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| } | |||
| private WxBillProperty generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Long userId,WxBillFeesStandardsListVo svo, | |||
| private WxBillProperty generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,MallUserInfo user,WxBillFeesStandardsListVo svo, | |||
| Integer billcount,Map<String, Object> shopInfo) { | |||
| Long feesStandardsId = svo.getFeeStandards().getId(); | |||
| return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0",svo.getBillName(),svo.getParentBillId(),feesStandardsId); | |||
| return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),user,billcount,shopInfo,"0",svo.getBillName(),svo.getParentBillId(),feesStandardsId); | |||
| } | |||
| private WxBillProperty generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay, | |||
| Long userId,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark,Long parentBillId,Long feesStandardsId) { | |||
| MallUserInfo user,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark,Long parentBillId,Long feesStandardsId) { | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| WxBillProperty wxBillProperty = new WxBillProperty(); | |||
| wxBillProperty.setIsPreview(isPreview); | |||
| @@ -803,10 +806,14 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| wxBillProperty.updateTenantInfo(wxPropertyContract); | |||
| wxBillProperty.setIsDel(0); | |||
| wxBillProperty.setMerchantId(wxPropertyContract.getMerchantId()); | |||
| wxBillProperty.setUserId(userId); | |||
| wxBillProperty.setUserId(user.getId()); | |||
| //wxBillProperty.setShopId(wxPropertyContract.getShopId()); | |||
| wxBillProperty.setCreatetime(date); | |||
| wxBillProperty.setCreateBy(user.getId()); | |||
| wxBillProperty.setCreateByName(user.getName()); | |||
| wxBillProperty.setUpdatetime(date); | |||
| wxBillProperty.setUpdateBy(user.getId()); | |||
| wxBillProperty.setUpdateByName(user.getName()); | |||
| wxBillProperty.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | |||
| wxBillProperty.setRentShopType(wxPropertyContract.getRentShopType()); | |||
| wxBillProperty.setPeriod(billcount); | |||
| @@ -955,7 +962,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| */ | |||
| @Override | |||
| //@Transactional(rollbackFor = {Exception.class}) | |||
| public List<WxBillProperty> buildProperty(WxMerchant wxMerchant,Long userId,WxPropertyContract propertyContract,Integer isPreview,boolean saveDb) { | |||
| public List<WxBillProperty> buildProperty(WxMerchant wxMerchant,MallUserInfo user,WxPropertyContract propertyContract,Integer isPreview,boolean saveDb) { | |||
| List<WxBillProperty> result = new ArrayList<>(); | |||
| WxPropertyContract wxPropertyContract; | |||
| @@ -982,7 +989,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| String price = propertyContract.getPrice(); | |||
| //按月计租 | |||
| result = buildRentMonth(wxMerchant, userId, propertyContract, receivePeriod, lease, rentalStartDate, price,isPreview,saveDb); | |||
| result = buildRentMonth(wxMerchant, user, propertyContract, receivePeriod, lease, rentalStartDate, price,isPreview,saveDb); | |||
| } | |||
| for (int i = 0; i < result.size(); i++) { | |||
| result.get(i).setPeriod(i+1); | |||
| @@ -427,7 +427,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| @Transactional(rollbackFor = {Exception.class}) | |||
| @Override | |||
| public ResultData save(WxRentContract record,Long userId,String userName,Date oldRentStartDate) { | |||
| public ResultData save(WxRentContract record,MallUserInfo user,String userName,Date oldRentStartDate) { | |||
| //保存租赁合同信息 | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| @@ -476,7 +476,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| Date date = new Date(); | |||
| record.setCreatetime(date); | |||
| record.setCreateBy(user.getId()); | |||
| record.setUpdatetime(date); | |||
| record.setUpdateBy(user.getId()); | |||
| List<Long> shopList = Lists.newArrayList(); | |||
| String rentInfo = record.getRentInfo(); | |||
| @@ -580,7 +582,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| //@Transactional(rollbackFor = {Exception.class}) | |||
| @Override | |||
| public ResultData update(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate,boolean writeComplate) { | |||
| public ResultData update(WxRentContract record, MallUserInfo user,String userName,int from,Date oldRentStartDate,boolean writeComplate) { | |||
| //查询预账单用于展示 | |||
| WxBillRent wxBillRent = new WxBillRent(); | |||
| wxBillRent.setRentContractId(record.getId()); | |||
| @@ -590,7 +592,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| List<WxBillRent> resultList = wxBillRentMapper.findList(wxBillRent); | |||
| //更新 | |||
| ResultData resultData = getResultDataForUpdate(record, userId,from,oldRentStartDate,writeComplate); | |||
| ResultData resultData = getResultDataForUpdate(record, user,from,oldRentStartDate,writeComplate); | |||
| if (resultData.code != Result.SUCCESS) { | |||
| return resultData; | |||
| } | |||
| @@ -618,7 +620,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| //do nothing | |||
| // saveBill = false; | |||
| //}else { | |||
| resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); | |||
| resultList = buildRent(user, record, EnumIsPreview.YES.getCode(),true); | |||
| //} | |||
| } | |||
| } | |||
| @@ -639,7 +641,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| @Transactional(rollbackFor = {Exception.class}) | |||
| @Override | |||
| public ResultData updateOneStep(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate,boolean writeComplate) { | |||
| public ResultData updateOneStep(WxRentContract record, MallUserInfo user,String userName,int from,Date oldRentStartDate,boolean writeComplate) { | |||
| //查询预账单用于展示 | |||
| WxBillRent wxBillRent = new WxBillRent(); | |||
| wxBillRent.setRentContractId(record.getId()); | |||
| @@ -649,7 +651,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| List<WxBillRent> resultList = wxBillRentMapper.findList(wxBillRent); | |||
| //更新 | |||
| ResultData resultData = getResultDataForUpdate(record, userId,from,oldRentStartDate,writeComplate); | |||
| ResultData resultData = getResultDataForUpdate(record, user,from,oldRentStartDate,writeComplate); | |||
| if (resultData.code != Result.SUCCESS) { | |||
| return resultData; | |||
| } | |||
| @@ -787,7 +789,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| } | |||
| public ResultData getResultDataForUpdate(WxRentContract record, Long userId,int from,Date oldRentStartDate,boolean writeFinal) { | |||
| public ResultData getResultDataForUpdate(WxRentContract record, MallUserInfo user,int from,Date oldRentStartDate,boolean writeFinal) { | |||
| //更新租赁合同信息 | |||
| WxRentContract wxRentContract = wxRentContractMapper.selectById(record.getId()); | |||
| if (wxRentContract == null) { | |||
| @@ -831,6 +833,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| List<Long> shopList = Lists.newArrayList(); | |||
| record.setUpdatetime(new Date()); | |||
| record.setUpdateBy(user.getId());; | |||
| // if (record.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { | |||
| String rentInfo = record.getRentInfo(); | |||
| JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); | |||
| @@ -1144,7 +1147,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| @Override | |||
| @Transactional(rollbackFor = {Exception.class}) | |||
| public List<WxBillRent> buildRent( Long userId,WxRentContract wxRentContract,Integer isPreview,boolean saveDb) { | |||
| public List<WxBillRent> buildRent(MallUserInfo user,WxRentContract wxRentContract,Integer isPreview,boolean saveDb) { | |||
| List<WxBillRent> rentList = new ArrayList<>(); | |||
| if (wxRentContract != null) { | |||
| int receivePeriod = wxRentContract.getReceivePeriod().intValue(); | |||
| @@ -1153,20 +1156,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| String price = wxRentContract.getPrice(); | |||
| if(EnumContractOperationType.JINMAO.getCode().equals(wxRentContract.getOperationType())){ | |||
| Date startDate = wxRentContract.getStartDate(); | |||
| rentList = buildRentJinmao(userId, wxRentContract, receivePeriod, lease, startDate, price, isPreview,saveDb); | |||
| rentList = buildRentJinmao(user, wxRentContract, receivePeriod, lease, startDate, price, isPreview,saveDb); | |||
| }else{ | |||
| //按月计租 | |||
| // if (wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) | |||
| // ||wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) { | |||
| rentList = buildRentMonth(userId, wxRentContract, receivePeriod, lease, rentalStartDate, price, isPreview,saveDb); | |||
| // } else { | |||
| // //如果按日 | |||
| // List<Date> yearList = new ArrayList<>(); | |||
| // yearList.add(rentalStartDate); | |||
| // Map<String, Object> resultMap = buildRent(receivePeriod, new long[]{price}, yearList, Calendar.DAY_OF_MONTH, wxRentContract, userId, 0, isPreview,null,saveDb); | |||
| // rentList = ( List<WxBillRent>)resultMap.get("billList"); | |||
| // } | |||
| rentList = buildRentMonth(user, wxRentContract, receivePeriod, lease, rentalStartDate, price, isPreview,saveDb); | |||
| } | |||
| } | |||
| for (int i = 0; i < rentList.size(); i++) { | |||
| @@ -1177,7 +1169,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| public List<WxBillRent> buildRentMonth(Long userId, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, String price, Integer isPreview, boolean saveDb) { | |||
| public List<WxBillRent> buildRentMonth(MallUserInfo user, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, String price, Integer isPreview, boolean saveDb) { | |||
| int years = 0; | |||
| //计算租金每年的计费基数 | |||
| String[] priceArrs = WxRentContractHelper.calcuteRentPrice(wxRentContract); | |||
| @@ -1211,13 +1203,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| String shopInfoStr = getShopInfoStr(wxRentContract); | |||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArrs,bussinessManagerPriceArrs,operationManagerPriceArrs, yearList, wxRentContract.getReceivePeriodUnit(), wxRentContract, userId, billcount, isPreview, shopInfoStr,saveDb); | |||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArrs,bussinessManagerPriceArrs,operationManagerPriceArrs, yearList, wxRentContract.getReceivePeriodUnit(), wxRentContract, user, billcount, isPreview, shopInfoStr,saveDb); | |||
| List<WxBillRent> billRentList = (List<WxBillRent>)resultMap.get("billList"); | |||
| resultList.addAll(billRentList); | |||
| return resultList; | |||
| } | |||
| public List<WxBillRent> buildRentJinmao(Long userId, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, String price, Integer isPreview, boolean saveDb) { | |||
| public List<WxBillRent> buildRentJinmao(MallUserInfo user, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, String price, Integer isPreview, boolean saveDb) { | |||
| int size = 0; | |||
| String[] priceArrs = null; | |||
| if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())){ | |||
| @@ -1311,7 +1303,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| String shopInfoStr = getShopInfoStr(wxRentContract); | |||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArrs,null,null, yearList, Calendar.MONTH, wxRentContract, userId, billcount, isPreview, shopInfoStr,saveDb); | |||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArrs,null,null, yearList, Calendar.MONTH, wxRentContract, user, billcount, isPreview, shopInfoStr,saveDb); | |||
| List<WxBillRent> billRentList = (List<WxBillRent>)resultMap.get("billList"); | |||
| resultList.addAll(billRentList); | |||
| return resultList; | |||
| @@ -1459,7 +1451,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| return calendar.getTime(); | |||
| } | |||
| public Map<String, Object> buildRent(int receivePeriod, String[] priceArrs,String[] bussinessManagerPriceArrs,String[] operationManagerPriceArrs, List<Date> yearList, int dayType, WxRentContract wxRentContract, Long userId, int billcount, Integer isPreview, String shopInfoStr,boolean saveDb) { | |||
| public Map<String, Object> buildRent(int receivePeriod, String[] priceArrs,String[] bussinessManagerPriceArrs,String[] operationManagerPriceArrs, List<Date> yearList, int dayType, WxRentContract wxRentContract, MallUserInfo user, int billcount, Integer isPreview, String shopInfoStr,boolean saveDb) { | |||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxRentContract); | |||
| SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); | |||
| Map<String,Object> resultMap = new HashedMap(); | |||
| @@ -1627,12 +1619,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| wxBillRent.setRevenue("0"); | |||
| wxBillRent.updateTenantInfo(wxRentContract); | |||
| wxBillRent.setMerchantId(wxRentContract.getMerchantId()); | |||
| wxBillRent.setUserId(userId); | |||
| wxBillRent.setUserId(user.getId()); | |||
| if (null != wxRentContract.shopIdsByRentInfo() && wxRentContract.shopIdsByRentInfo().size() == 1) { | |||
| wxBillRent.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); | |||
| } | |||
| wxBillRent.setCreatetime(date); | |||
| wxBillRent.setCreateBy(user.getId()); | |||
| wxBillRent.setCreateByName(user.getName()); | |||
| wxBillRent.setUpdatetime(date); | |||
| wxBillRent.setUpdateBy(user.getId()); | |||
| wxBillRent.setUpdateByName(user.getName());; | |||
| wxBillRent.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | |||
| wxBillRent.setRentShopType(wxRentContract.getRentShopType()); | |||
| wxBillRent.setPeriod(++billcount); | |||
| @@ -1803,6 +1799,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| contract.setStatus(EnumRentContractStatus.TERMINATE.getCode()); | |||
| contract.setUpdatetime(new Date()); | |||
| contract.setUpdateBy(userInfo.getId()); | |||
| contract.setEndContractTime(wxRentContract.getEndContractTime()); | |||
| wxRentContractMapper.updateById(contract); | |||
| @@ -1818,6 +1815,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| //终止有效的合同 | |||
| wxPropertyContract.setStatuss(EnumRentContractStatus.getValidStatus()); | |||
| wxPropertyContract.setUpdatetime(new Date()); | |||
| wxPropertyContract.setUpdateBy(userInfo.getId()); | |||
| wxPropertyContract.setStatus(EnumRentContractStatus.TERMINATE.getCode()); | |||
| wxPropertyContractMapper.endContract(wxPropertyContract); | |||
| //作废未生效的合同 | |||
| @@ -8,6 +8,10 @@ | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate" /> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate" /> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime" /> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="create_by_name" jdbcType="VARCHAR" property="createByName"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/> | |||
| <result column="expired_day" jdbcType="INTEGER" property="expiredDay" /> | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||
| <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | |||
| @@ -39,7 +43,8 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `tenant_id`,`parent_tenant_id`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,`last_owe_call_time`, | |||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`remark`,`last_owe_call_user` | |||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`remark`,`last_owe_call_user`, | |||
| `create_by`,`create_by_name`,`update_by`,`update_by_name` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -156,7 +161,8 @@ | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , | |||
| br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`,br.`last_owe_call_user`, | |||
| br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`, | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`remark` | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`remark`, | |||
| br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name` | |||
| from wx_bill_daily br | |||
| <include refid="queryBillDailyListConditions" /> | |||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||
| @@ -11,6 +11,10 @@ | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate" /> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate" /> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime" /> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="create_by_name" jdbcType="VARCHAR" property="createByName"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/> | |||
| <result column="expired_day" jdbcType="BIGINT" property="expiredDay" /> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> | |||
| @@ -38,7 +42,7 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`last_owe_call_time`, | |||
| `expired_day`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `last_owe_call_user`,`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,contract_depoist_detail | |||
| `last_owe_call_user`,`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,contract_depoist_detail,`create_by`,`create_by_name`,`update_by`,`update_by_name` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -128,7 +132,7 @@ | |||
| <select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`rent_contract_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_time`, | |||
| br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`contract_depoist_detail`,br.`last_owe_call_user`, | |||
| br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay | |||
| br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name` | |||
| from wx_bill_rent_deposit br | |||
| <include refid="queryBillRentListCondition"/> | |||
| order by br.id desc | |||
| @@ -10,6 +10,10 @@ | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate"/> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate"/> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime"/> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="create_by_name" jdbcType="VARCHAR" property="createByName"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/> | |||
| <result column="expired_day" jdbcType="INTEGER" property="expiredDay"/> | |||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||
| <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> | |||
| @@ -39,7 +43,7 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_time`,`last_owe_call_user`, | |||
| `status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay | |||
| `rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay,`create_by`,`create_by_name`,`update_by`,`update_by_name` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -161,7 +165,7 @@ | |||
| <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_user`, | |||
| br.`status`,br.shop_name,br.`updatetime`,br.`return_price`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`last_owe_call_time`, | |||
| br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay | |||
| br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name` | |||
| from wx_bill_other_deposit br | |||
| <include refid="queryBillListConditions"/> | |||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||
| @@ -10,6 +10,10 @@ | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate" /> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate" /> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime" /> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="create_by_name" jdbcType="VARCHAR" property="createByName"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/> | |||
| <result column="expired_day" jdbcType="INTEGER" property="expiredDay" /> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> | |||
| @@ -39,7 +43,8 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_user`, | |||
| `status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`last_owe_call_time`, | |||
| `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time` | |||
| `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `create_by`,`create_by_name`,`update_by`,`update_by_name` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -154,7 +159,7 @@ | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`,br.`last_owe_call_time`,br.`last_owe_call_user`, | |||
| br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`, | |||
| br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay | |||
| br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name` | |||
| from wx_bill_other br | |||
| <include refid="queryBillListConditions" /> | |||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||
| @@ -11,6 +11,10 @@ | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate" /> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate" /> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime" /> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="create_by_name" jdbcType="VARCHAR" property="createByName"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/> | |||
| <result column="expired_day" jdbcType="INTEGER" property="expiredDay" /> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> | |||
| @@ -39,7 +43,8 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`starttime`,`endtime`, | |||
| `pay_date`,`createtime`,`expired_day`,`status`,`is_del`,`need_pay`,`apply_status`,`apply_pay_img`,`apply_update_time`,`last_owe_call_user`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay, | |||
| `create_by`,`create_by_name`,`update_by`,`update_by_name` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -151,7 +156,7 @@ | |||
| <select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`property_contract_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`status`, | |||
| br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,br.`starttime`,br.`endtime`,br.`last_owe_call_user`, | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time` | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name` | |||
| from wx_bill_property_deposit br | |||
| <include refid="queryBillDepositListConditions"/> | |||
| order by id desc | |||
| @@ -11,6 +11,10 @@ | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate"/> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate"/> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime"/> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="create_by_name" jdbcType="VARCHAR" property="createByName"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/> | |||
| <result column="expired_day" jdbcType="INTEGER" property="expiredDay"/> | |||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||
| <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> | |||
| @@ -54,7 +58,7 @@ | |||
| `id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | |||
| `createtime`,`expired_day`,`tenant_id`,`status`,`is_del`,`need_pay`,`last_owe_call_time`,`last_owe_call_user`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`create_by`,`create_by_name`,`update_by`,`update_by_name`, | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,`parent_bill_id`,`fees_standars_id` | |||
| </sql> | |||
| @@ -201,7 +205,7 @@ | |||
| br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`,br.`last_owe_call_time`,br.`last_owe_call_user`, | |||
| br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status, | |||
| br.`comments`,br.starttime,br.endtime,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.freeze,br.service_charge_pay, | |||
| br.`late_pay_ratio`,br.`parent_bill_id`,br.`fees_standars_id` | |||
| br.`late_pay_ratio`,br.`parent_bill_id`,br.`fees_standars_id`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name` | |||
| from wx_bill_property br | |||
| <include refid="queryBillPropertyListConditions"/> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||
| @@ -378,7 +382,7 @@ | |||
| <insert id="insertBills" parameterType="hashmap"> | |||
| INSERT INTO wx_bill_property (id,property_contract_id, receive_pay, pay, receive_date, pay_date, createtime, | |||
| expired_day, | |||
| expired_day,create_by,create_by_name,update_by,update_by_name, | |||
| tenant_id, parent_tenant_id, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, | |||
| endtime, | |||
| rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, | |||
| @@ -387,8 +391,8 @@ | |||
| <foreach collection="list" item="item" index="index" separator=","> | |||
| ( | |||
| #{item.id},#{item.propertyContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, | |||
| #{item.expiredDay},#{item.tenantId},#{item.parentTenantId}, | |||
| #{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, | |||
| #{item.expiredDay},#{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName}, | |||
| #{item.tenantId},#{item.parentTenantId},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, | |||
| #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, | |||
| #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, | |||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.parentBillId},#{item.feesStandarsId} | |||
| @@ -11,6 +11,10 @@ | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate"/> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate"/> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime"/> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="create_by_name" jdbcType="VARCHAR" property="createByName"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/> | |||
| <result column="expired_day" jdbcType="INTEGER" property="expiredDay"/> | |||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||
| <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> | |||
| @@ -45,7 +49,8 @@ | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`last_owe_call_user`, | |||
| `createtime`,`expired_day`,`status`,`apply_status`,`apply_pay_img`,`apply_update_time`,`is_del`,`is_preview`,`need_pay`, | |||
| `last_owe_call_time`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`late_pay_ratio`,`late_pay_time`, | |||
| `late_pay_price`,`period`,`shop_info`,`pay_way`,`late_pay_status`,starttime,endtime,freeze,service_charge_pay,manage_fee_type | |||
| `late_pay_price`,`period`,`shop_info`,`pay_way`,`late_pay_status`,starttime,endtime,freeze,service_charge_pay,manage_fee_type, | |||
| `create_by`,`create_by_name`,`update_by`,`update_by_name` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -163,7 +168,7 @@ | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| br.`status`,br.`need_pay`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,br.`last_owe_call_time`,br.`last_owe_call_user`, | |||
| br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime, | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`, | |||
| br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio` | |||
| from wx_bill_rent_manage br | |||
| <include refid="queryBillManageListConditions"/> | |||
| @@ -294,7 +299,7 @@ | |||
| rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, | |||
| status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, | |||
| rent_shop_type, late_pay_ratio, late_pay_time, late_pay_price, period, shop_info, | |||
| pay_way, late_pay_status, service_charge_pay,manage_fee_type) | |||
| pay_way, late_pay_status, service_charge_pay,manage_fee_type,create_by,create_by_name,update_by,update_by_name) | |||
| VALUES | |||
| <foreach collection="list" item="item" index="index" separator=","> | |||
| ( | |||
| @@ -303,7 +308,8 @@ | |||
| #{item.expiredDay},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, | |||
| #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType}, | |||
| #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.shopInfo}, | |||
| #{item.payWay},#{item.latePayStatus},#{item.serviceChargePay},#{item.manageFeeType} | |||
| #{item.payWay},#{item.latePayStatus},#{item.serviceChargePay},#{item.manageFeeType}, | |||
| #{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName} | |||
| ) | |||
| </foreach> | |||
| </insert> | |||
| @@ -11,6 +11,8 @@ | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate"/> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate"/> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime"/> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="create_by_name" jdbcType="VARCHAR" property="createByName"/> | |||
| <result column="expired_day" jdbcType="INTEGER" property="expiredDay"/> | |||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||
| <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> | |||
| @@ -26,6 +28,8 @@ | |||
| <result column="user_id" jdbcType="BIGINT" property="userId"/> | |||
| <result column="shop_id" jdbcType="BIGINT" property="shopId"/> | |||
| <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/> | |||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="revenue" jdbcType="VARCHAR" property="revenue"/> | |||
| <result column="late_pay_ratio" jdbcType="INTEGER" property="latePayRatio"/> | |||
| @@ -59,7 +63,7 @@ | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`create_by`,`create_by_name`,`update_by`,`update_by_name`, | |||
| `createtime`,`expired_day`,`status`,`is_del`,`contract_need_pay`,`rent_price_info`,`need_pay`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`,`last_owe_call_time`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`last_owe_call_user`, | |||
| @@ -184,7 +188,8 @@ | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_user`, | |||
| br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,br.`bussiness_manage_fee_need_pay`,br.`operating_manage_fee_need_pay`,br.`last_owe_call_time`, | |||
| br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`revenue`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay, | |||
| br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name` | |||
| from wx_bill_rent br | |||
| <include refid="queryBillRentListCondition"/> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||
| @@ -364,7 +369,7 @@ | |||
| <insert id="insertBills" parameterType="HashMap"> | |||
| INSERT INTO wx_bill_rent (id,tenant_id,parent_tenant_id, | |||
| rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, | |||
| rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day,create_by,create_by_name,update_by,update_by_name, | |||
| status, is_del, contract_need_pay,rent_price_info,need_pay,bussiness_manage_fee_need_pay,operating_manage_fee_need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, | |||
| rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, | |||
| pay_way, late_pay_status, comments,service_charge_pay) | |||
| @@ -372,8 +377,8 @@ | |||
| <foreach collection="list" item="item" index="index" separator=","> | |||
| ( | |||
| #{item.id},#{item.tenantId},#{item.parentTenantId}, | |||
| #{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, | |||
| #{item.expiredDay},#{item.status},#{item.isDel},#{item.contractNeedPay},#{item.rentPriceInfo},#{item.needPay},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay},#{item.merchantId}, | |||
| #{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime},#{item.expiredDay},#{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName}, | |||
| #{item.status},#{item.isDel},#{item.contractNeedPay},#{item.rentPriceInfo},#{item.needPay},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay},#{item.merchantId}, | |||
| #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, | |||
| #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, | |||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay} | |||
| @@ -46,7 +46,8 @@ | |||
| <result column="rent_start_type" property="rentStartType"/> | |||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="fixed_price" jdbcType="INTEGER" property="fixedPrice"/> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="operation_type" property="operationType"/> | |||
| <result column="late_pay_ratio" property="latePayRatio"/> | |||
| <result column="late_pay_day" property="latePayDay"/> | |||
| @@ -66,7 +67,7 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`merchant_id`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,`shop_ids`,`shop_numbers`, | |||
| `sign_date`,`receive_period`,`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`, | |||
| `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`receive_period_unit`, | |||
| `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`receive_period_unit`,`create_by`,`update_by`, | |||
| `shop_type`,`updatetime`,`createtime`,`rent_area`,`rent_shop_type`,`fees_standards_info`, | |||
| `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`, | |||
| `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`,fixed_price, | |||
| @@ -432,7 +433,7 @@ | |||
| </select> | |||
| <update id="endContract" parameterType="com.iformall.domain.po.WxPropertyContract"> | |||
| update wx_property_contract set status=#{status},updatetime = #{updatetime} where rent_contract_id =#{rentContractId} | |||
| update wx_property_contract set status=#{status},updatetime = #{updatetime},update_by = #{updateBy} where rent_contract_id =#{rentContractId} | |||
| <if test=" null != statuss "> | |||
| and status in | |||
| <foreach collection="statuss" index="index" item="statusItem" open="(" separator="," close=")"> | |||
| @@ -26,6 +26,8 @@ | |||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||
| <result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/> | |||
| <result column="create_by" jdbcType="BIGINT" property="createBy"/> | |||
| <result column="update_by" jdbcType="BIGINT" property="updateBy"/> | |||
| <result column="first_party_bank_info" jdbcType="VARCHAR" property="firstPartyBankInfo"/> | |||
| <result column="second_party_bank_info" jdbcType="VARCHAR" property="secondPartyBankInfo"/> | |||
| <result column="second_party_tax_info" jdbcType="VARCHAR" property="secondPartyTaxInfo"/> | |||
| @@ -132,7 +134,7 @@ | |||
| `id`,`merchant_id`, | |||
| `shop_type_sub`,`lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`,`scope_metre`, | |||
| `decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`receive_period_unit`, | |||
| `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`, | |||
| `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by`,`update_by`, | |||
| `first_party_bank_info`,`second_party_bank_info`,`second_party_tax_info`, | |||
| `property_name`,`property_fee`,`fee_cycle`,`water_fee`,`electricity_fees`, | |||
| `deposit`,cashtype_content_lsit,cashtype_lsit,`pay_date`,`is_del`,`merchant_name`, | |||
| @@ -469,7 +471,7 @@ | |||
| rc.`id`,rc.`merchant_id`, | |||
| rc.`shop_type_sub`,rc.`lease_purpose`,rc.`contractual_rules`,rc.`delivery_date`,rc.`delivery_grace_period`,rc.`opening_date`,rc.`business_hours`,rc.`scope_metre`, | |||
| rc.`price`,rc.rent_area,rc.`rental_start_date`,rc.`rental_end_date`,rc.`sign_date`,rc.`receive_period`, rc.`receive_period_unit`, | |||
| rc.`tenant_id`,rc.`parent_tenant_id`,rc.`filepath`,rc.`status`,rc.`contract_number`,rc.`price_detail`, | |||
| rc.`tenant_id`,rc.`parent_tenant_id`,rc.`filepath`,rc.`status`,rc.`contract_number`,rc.`price_detail`,rc.`create_by`,rc.`update_by`, | |||
| rc.`first_party_bank_info`,rc.`second_party_bank_info`,rc.`second_party_tax_info`, | |||
| rc.`property_name`,rc.`property_fee`,rc.`fee_cycle`,rc.`water_fee`,rc.`electricity_fees`, | |||
| rc.`deposit`,rc.cashtype_content_lsit,rc.cashtype_lsit,rc.`pay_date`,rc.`is_del`,rc.`merchant_name`, | |||
| @@ -496,7 +498,7 @@ | |||
| rc.`id`,rc.`merchant_id`, | |||
| rc.`shop_type_sub`,rc.`lease_purpose`,rc.`contractual_rules`,rc.`delivery_date`,rc.`delivery_grace_period`,rc.`opening_date`,rc.`business_hours`,rc.`scope_metre`, | |||
| rc.`price`,rc.rent_area,rc.`rental_start_date`,rc.`rental_end_date`,rc.`sign_date`,rc.`receive_period`, rc.`receive_period_unit`, | |||
| rc.`tenant_id`,rc.`parent_tenant_id`,rc.`filepath`,rc.`status`,rc.`contract_number`,rc.`price_detail`, | |||
| rc.`tenant_id`,rc.`parent_tenant_id`,rc.`filepath`,rc.`status`,rc.`contract_number`,rc.`price_detail`,rc.`create_by`,rc.`update_by`, | |||
| rc.`first_party_bank_info`,rc.`second_party_bank_info`,rc.`second_party_tax_info`, | |||
| rc.`property_name`,rc.`property_fee`,rc.`fee_cycle`,rc.`water_fee`,rc.`electricity_fees`, | |||
| rc.`deposit`,rc.cashtype_content_lsit,rc.cashtype_lsit,rc.`pay_date`,rc.`is_del`,rc.`merchant_name`, | |||