diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index 67071bc90..040c2de61 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -64,27 +64,6 @@ public class WxBillController extends BaseController { @Autowired WxBillAllHelper billAllHelper; -// @ApiOperation("所有欠缴和待缴的数据") -// @PostMapping("listBillOweAndWaitPay") -// public ResultData listBillOweAndWaitPay(@RequestBody WxBillAll wxBillAll) { -// -// if(StringUtils.isEmpty(wxBillAll.getTenantId())){ -// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空"); -// } -// if(wxBillAll.getMerchantId()==null){ -// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"merchantId不能为空"); -// } -// WxMerchant wxMerchant = wxMerchantService.getById(wxBillAll.getMerchantId()); -// if(wxMerchant==null){ -// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); -// } -// if(wxMerchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())){ -// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); -// } -// List> result=wxBillAllService.listBillOweAndWaitPay(wxBillAll); -// return new ResultData(result); -// } - /** * 账单类型 * @return @@ -98,6 +77,22 @@ public class WxBillController extends BaseController { return new ResultData(tmap); } + + /** + * 商户催缴账单列表 + * @param wxBillAll + * @param pageNum + * @param pageSize + * @return + */ + @GetMapping("notifyList") + public ResultData notifyList(@ModelAttribute WxMerchant wxMerchant) { + wxMerchant.setId(this.getLoginBUser().getMerchantId()); + return new ResultData(billAllHelper.getBillNotifyList(wxMerchant)); + } + + + private Integer getOweBillBeforeDays() { SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); Integer oweBillBeforeDays = 0 ; @@ -199,136 +194,135 @@ public class WxBillController extends BaseController { return billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize); } - //###### 待切换 ####################### -// @ApiOperation("分类查询账单") -// @GetMapping("listBill") -// public ResultData listBill(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue, Integer pageNum, Integer pageSize) { -// if (null == billTypeValue) { -// return new ResultData(Result.ERROR,"请选择分类"); -// } -// EnumBillAllType btype; -// if (billTypeValue.intValue() == Constant.bill_all_type_manage_fee) { -// btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; -// }else { -// btype = EnumBillAllType.getEnum(billTypeValue); -// if (null == btype) { -// return new ResultData(Result.ERROR,"分类非法"); -// } -// } -// wxMerchant.setId(this.getLoginBUser().getMerchantId()); -// wxMerchant.updateTenantInfo(getTenantInfo()); -// return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); -// } - @ApiOperation("分类查询账单") - @PostMapping("listBill") - public ResultData listBill(@RequestBody WxBillAll wxBillAll) { - - if(StringUtils.isEmpty(wxBillAll.getTenantId())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空"); - } - if(wxBillAll.getMerchantId()==null){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"merchantId不能为空"); - } - if(wxBillAll.getBillTypeValue()==null){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"billTypeValue不能为空"); - } - WxMerchant wxMerchant = wxMerchantService.getById(wxBillAll.getMerchantId()); - if(wxMerchant==null){ - return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); - } - if(wxMerchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())){ - return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); - } - if(!StringUtils.isEmpty(wxBillAll.getStarttime()) && StringUtils.isEmpty(wxBillAll.getEndtime())){ - logger.info("开始时间和结束时间要同时存在或不存在"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在"); - } - if(StringUtils.isEmpty(wxBillAll.getStarttime()) && !StringUtils.isEmpty(wxBillAll.getEndtime())){ - logger.info("开始时间和结束时间要同时存在或不存在"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在"); - } - - return wxBillAllService.pageListBill(wxBillAll,wxMerchant,true,true,true); - } - - @GetMapping("/findSettleById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @ApiOperation("账单管理-结算单-id查找") - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id, EnumFilterSettle.NO.getCode())); - } - - @ApiOperation("完结账单") - @PostMapping("finishBill") - public ResultData finishBill(@RequestBody WxBillAll wxBillAll) { - if(!billFinishHasWorkFlow(wxBillAll)) { - return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"商户账单完结审批不存在工作流,不能提交审批。"); - } - WxMerchantBUser buser = getLoginBUser(); - - Map billObject = wxBillAllService.detail(wxBillAll.getId(), wxBillAll.getBillTypeValue()); - - if (null == billObject) { - return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"查询不到记录。"); + @GetMapping("listBill") + public ResultData listBill(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue, Integer pageNum, Integer pageSize) { + if (null == billTypeValue) { + return new ResultData(Result.ERROR,"请选择分类"); } - - Map map = new HashMap(); - map.put("businessType", EnumFlowKey.BILL_FINISH.getCode()); - //map.put("payMoney", wxBillAll.getNewPrice()); - map.put("businessId", wxBillAll.getId()); - List variablesList = new ArrayList(); - Map billTypeMap = new HashMap(); - billTypeMap.put("key","billType"); - billTypeMap.put("value",wxBillAll.getBillTypeValue()); - variablesList.add(billTypeMap); - - Map billUpdateTypeMap = new HashMap(); - billUpdateTypeMap.put("key","billUpdateType"); - billUpdateTypeMap.put("value",EnumBillUpdateType.OTHER.getCode()); - variablesList.add(billUpdateTypeMap); - - Long needPayL = (Long) billObject.get("needPay"); - Integer needPay = 0; - if (null == needPayL) { - needPay = needPayL.intValue(); + EnumBillAllType btype; + if (billTypeValue.intValue() == Constant.bill_all_type_manage_fee) { + btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; + }else { + btype = EnumBillAllType.getEnum(billTypeValue); + if (null == btype) { + return new ResultData(Result.ERROR,"分类非法"); + } } - - Map oldPriceMap = new HashMap(); - oldPriceMap.put("key","oldPrice"); - oldPriceMap.put("value",needPay); - variablesList.add(oldPriceMap); - - Map newPriceMap = new HashMap(); - newPriceMap.put("key","newPrice"); - newPriceMap.put("value",needPay); - variablesList.add(newPriceMap); - - Map forcePaidMap = new HashMap(); - forcePaidMap.put("key","forcePaid"); - forcePaidMap.put("value",1); - variablesList.add(forcePaidMap); - - Map payImgMap = new HashMap(); - payImgMap.put("key","payImg"); - payImgMap.put("value",wxBillAll.getPayImg()); - variablesList.add(payImgMap); - - map.put("variables", variablesList); - map.put("phone", buser.getPhone()); - wxFlowService.start(map, buser.getId(), buser.getName(), this.getTenantInfo()); - return new ResultData(); + wxMerchant.setId(this.getLoginBUser().getMerchantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); + return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); } - private boolean billFinishHasWorkFlow(WxBillAll wxBillAll) { - WxFlowModel wxFlowModel = new WxFlowModel(); - wxFlowModel.setFlowType(EnumFlowKey.BILL_FINISH.getCode()); - wxFlowModel.updateTenantInfo(this.getTenantInfo()); - List flows = wxFlowService.getModelBybusiness(wxFlowModel); - if (null != flows && flows.size() > 0) { - return true; - } - return false; - } +// @ApiOperation("分类查询账单") +// @PostMapping("listBill") +// public ResultData listBill(@RequestBody WxBillAll wxBillAll) { +// +// if(StringUtils.isEmpty(wxBillAll.getTenantId())){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空"); +// } +// if(wxBillAll.getMerchantId()==null){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"merchantId不能为空"); +// } +// if(wxBillAll.getBillTypeValue()==null){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"billTypeValue不能为空"); +// } +// WxMerchant wxMerchant = wxMerchantService.getById(wxBillAll.getMerchantId()); +// if(wxMerchant==null){ +// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); +// } +// if(wxMerchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())){ +// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); +// } +// if(!StringUtils.isEmpty(wxBillAll.getStarttime()) && StringUtils.isEmpty(wxBillAll.getEndtime())){ +// logger.info("开始时间和结束时间要同时存在或不存在"); +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在"); +// } +// if(StringUtils.isEmpty(wxBillAll.getStarttime()) && !StringUtils.isEmpty(wxBillAll.getEndtime())){ +// logger.info("开始时间和结束时间要同时存在或不存在"); +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在"); +// } +// +// return wxBillAllService.pageListBill(wxBillAll,wxMerchant,true,true,true); +// } + +// @GetMapping("/findSettleById") +// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) +// @ApiOperation("账单管理-结算单-id查找") +// public ResultData findById(Long id) { +// return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id, EnumFilterSettle.NO.getCode())); +// } +// +// @ApiOperation("完结账单") +// @PostMapping("finishBill") +// public ResultData finishBill(@RequestBody WxBillAll wxBillAll) { +// if(!billFinishHasWorkFlow(wxBillAll)) { +// return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"商户账单完结审批不存在工作流,不能提交审批。"); +// } +// WxMerchantBUser buser = getLoginBUser(); +// +// Map billObject = wxBillAllService.detail(wxBillAll.getId(), wxBillAll.getBillTypeValue()); +// +// if (null == billObject) { +// return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"查询不到记录。"); +// } +// +// Map map = new HashMap(); +// map.put("businessType", EnumFlowKey.BILL_FINISH.getCode()); +// //map.put("payMoney", wxBillAll.getNewPrice()); +// map.put("businessId", wxBillAll.getId()); +// List variablesList = new ArrayList(); +// Map billTypeMap = new HashMap(); +// billTypeMap.put("key","billType"); +// billTypeMap.put("value",wxBillAll.getBillTypeValue()); +// variablesList.add(billTypeMap); +// +// Map billUpdateTypeMap = new HashMap(); +// billUpdateTypeMap.put("key","billUpdateType"); +// billUpdateTypeMap.put("value",EnumBillUpdateType.OTHER.getCode()); +// variablesList.add(billUpdateTypeMap); +// +// Long needPayL = (Long) billObject.get("needPay"); +// Integer needPay = 0; +// if (null == needPayL) { +// needPay = needPayL.intValue(); +// } +// +// Map oldPriceMap = new HashMap(); +// oldPriceMap.put("key","oldPrice"); +// oldPriceMap.put("value",needPay); +// variablesList.add(oldPriceMap); +// +// Map newPriceMap = new HashMap(); +// newPriceMap.put("key","newPrice"); +// newPriceMap.put("value",needPay); +// variablesList.add(newPriceMap); +// +// Map forcePaidMap = new HashMap(); +// forcePaidMap.put("key","forcePaid"); +// forcePaidMap.put("value",1); +// variablesList.add(forcePaidMap); +// +// Map payImgMap = new HashMap(); +// payImgMap.put("key","payImg"); +// payImgMap.put("value",wxBillAll.getPayImg()); +// variablesList.add(payImgMap); +// +// map.put("variables", variablesList); +// map.put("phone", buser.getPhone()); +// wxFlowService.start(map, buser.getId(), buser.getName(), this.getTenantInfo()); +// return new ResultData(); +// } +// +// private boolean billFinishHasWorkFlow(WxBillAll wxBillAll) { +// WxFlowModel wxFlowModel = new WxFlowModel(); +// wxFlowModel.setFlowType(EnumFlowKey.BILL_FINISH.getCode()); +// wxFlowModel.updateTenantInfo(this.getTenantInfo()); +// List flows = wxFlowService.getModelBybusiness(wxFlowModel); +// if (null != flows && flows.size() > 0) { +// return true; +// } +// return false; +// } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 902c289cf..352b8321a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -7,6 +7,7 @@ import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.WxBillBaseEntity; import com.iformall.enums.EnumBillAllType; +import com.iformall.enums.EnumBillDailyType; import lombok.Data; import lombok.EqualsAndHashCode; @@ -108,9 +109,20 @@ public class WxBillDaily extends WxBillBaseEntity { @TableField(exist = false) private List notInIds; - //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { return EnumBillAllType.DAILY.getCode(); } + + @Override + public String getBillTypeName() { + if (this.type == EnumBillDailyType.WATER.getCode()) { + return EnumBillDailyType.WATER.getMessage(); + }else if (this.type == EnumBillDailyType.POWER.getCode()) { + return EnumBillDailyType.POWER.getMessage(); + }else if (this.type == EnumBillDailyType.AIR_CONDITIONING.getCode()) { + return EnumBillDailyType.AIR_CONDITIONING.getMessage(); + } + return EnumBillAllType.DAILY.getMessage(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index ae01354a8..46d889a88 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -81,9 +81,18 @@ public class WxBillDeposit extends WxBillBaseEntity { @TableField(exist = false) private List merchantIds; - //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { return EnumBillAllType.RENT_DEPOSIT.getCode(); } + + @Override + public String getBillTypeName() { + return EnumBillAllType.RENT_DEPOSIT.getMessage(); + } + + @Override + public String getBillRemark() { + return ""; + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index ff480156c..aaf050714 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -1,10 +1,10 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; + import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.WxBillBaseEntity; import com.iformall.enums.EnumBillAllType; @@ -16,6 +16,8 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import org.apache.commons.lang3.StringUtils; + /** * @author gongbiao */ @@ -109,9 +111,18 @@ public class WxBillOther extends WxBillBaseEntity { @TableField(exist = false) private List notInIds; - //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { return EnumBillAllType.OTHER.getCode(); } + + @Override + public String getBillTypeName() { + return EnumBillAllType.OTHER.getMessage(); + } + + @Override + public String getBillRemark() { + return StringUtils.trimToEmpty(name)+StringUtils.trimToEmpty(comments); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 75f0bf34b..e916e0c47 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -17,6 +17,8 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.StringUtils; + /** * @author gongbiao */ @@ -118,10 +120,19 @@ public class WxBillOtherDeposit extends WxBillBaseEntity { @TableField(exist = false) private List notInIds; - //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { return EnumBillAllType.OTHER_DEPOSIT.getCode(); } + + @Override + public String getBillTypeName() { + return EnumBillAllType.OTHER_DEPOSIT.getMessage(); + } + + @Override + public String getBillRemark() { + return StringUtils.trimToEmpty(name)+StringUtils.trimToEmpty(comments); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 89ea189fd..b2d840d66 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -145,12 +145,21 @@ public class WxBillProperty extends WxBillBaseEntity { @TableField(exist = false) private List merchantIds; - //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { return EnumBillAllType.PROPERTY.getCode(); } + @Override + public String getBillTypeName() { + return EnumBillAllType.PROPERTY.getMessage(); + } + + @Override + public String getBillRemark() { + return ""; + } + @TableField(exist = false) private String totalFee; public void calcuteTotalFee(Integer decimalSize) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 35171e239..a6db972d0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -94,10 +94,19 @@ public class WxBillPropertyDeposit extends WxBillBaseEntity { return sb.toString(); } - //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { return EnumBillAllType.PROPERTY_DEPOSIT.getCode(); } + @Override + public String getBillTypeName() { + return EnumBillAllType.PROPERTY_DEPOSIT.getMessage(); + } + + @Override + public String getBillRemark() { + return ""; + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 61d0467b9..9201e39f5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -88,11 +88,20 @@ public class WxBillRent extends WxBillBaseEntity { return infoStr; } - //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { return EnumBillAllType.RENT.getCode(); } + + @Override + public String getBillTypeName() { + return EnumBillAllType.RENT.getMessage(); + } + + @Override + public String getBillRemark() { + return ""; + } @io.swagger.annotations.ApiModelProperty(value="商业管理费应收金额",name="bussinessManageFeeNeedPay") private String bussinessManageFeeNeedPay; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java index e053fbcc5..3f0c1cb0e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java @@ -148,7 +148,6 @@ public class WxBillRentManage extends WxBillBaseEntity { this.latePayRatio = billRent.getLatePayRatio(); } - //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { if (this.manageFeeType == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()) { @@ -159,6 +158,21 @@ public class WxBillRentManage extends WxBillBaseEntity { return Constant.bill_all_type_manage_fee; } + @Override + public String getBillTypeName() { + if (this.manageFeeType == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()) { + return EnumBillAllType.RENT_BUSSINESS_MANAGE.getMessage(); + }else if (this.manageFeeType == EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()) { + return EnumBillAllType.RENT_OPERATION_MANAGE.getMessage(); + } + return "商业&运营管理费"; + } + + @Override + public String getBillRemark() { + return ""; + } + @TableField(exist = false) private List merchantIds; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java index 92a9a5a82..9b4749a93 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java @@ -119,5 +119,9 @@ public class WxBillBaseEntity extends TenantEntity { //临期计算截止时间 @TableField(exist = false) private Date nearBillLastTime; + + //临期计算截止时间 + @TableField(exist = false) + private Integer notifyed; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java new file mode 100644 index 000000000..b886deb21 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java @@ -0,0 +1,26 @@ +package com.iformall.domain.vo; + +import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Date; + +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; + +@Data +public class WxBillNotify implements Serializable { + + private static final long serialVersionUID = 1L; + + //EnumBillAllType + private Integer billType; + private String billTypeName; + private Long billId; + private Date starttime; + private Date endtime; + private String receivePay; + private String pay; + private Long merchantId; + private String merchantName; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java index e37783004..be6006c24 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillDaily; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -24,6 +25,8 @@ public interface WxBillDailyMapper extends CommonMapper { List queryBillDailyList(WxBillDaily record); + List getBillNotifyList(WxBillDaily record); + WxBillSum getBillMonthSum(WxBillDaily record); List getMerchantIdList(WxBillDaily record); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java index 80779d3ca..a3ed3273b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -22,6 +23,8 @@ public interface WxBillDepositMapper extends CommonMapper { List findRentContractIds(WxBillDeposit wxBillDeposit); List queryBillDepositList(WxBillDeposit record); + + List getBillNotifyList(WxBillDeposit record); Map queryPayInfo(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java index e4fb4745c..fc7494647 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -24,6 +25,8 @@ public interface WxBillOtherDepositMapper extends CommonMapper queryBillList(WxBillOtherDeposit record); + List getBillNotifyList(WxBillOtherDeposit record); + WxBillSum getBillMonthSum(WxBillOtherDeposit record); List getMerchantIdList(WxBillOtherDeposit record); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java index cfd98b903..ab92b5dfb 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillOther; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -23,6 +24,8 @@ public interface WxBillOtherMapper extends CommonMapper { void updateWaitPayStatus(Map params); List queryBillList(WxBillOther record); + + List getBillNotifyList(WxBillOther record); Map queryPayInfoTotal(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java index c13b94b8d..5f55bad8a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxBillPropertyDeposit; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -22,6 +23,8 @@ public interface WxBillPropertyDepositMapper extends CommonMapper findPropertyContractIds(WxBillPropertyDeposit wxBillPropertyDeposit); List queryBillDepositList(WxBillPropertyDeposit record); + + List getBillNotifyList(WxBillPropertyDeposit record); Map queryPayInfo(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index 943afa031..24e12c64a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -23,6 +24,8 @@ public interface WxBillPropertyMapper extends CommonMapper List queryBillPropertyList(WxBillProperty record); + List getBillNotifyList(WxBillProperty record); + List queryPropertyContractIdList(WxBillProperty record); Map queryPayInfo(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java index 19cde6907..84eb96ea2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxBillRentManage; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import org.apache.ibatis.annotations.Param; @@ -21,6 +22,8 @@ public interface WxBillRentManageMapper extends CommonMapper queryBillManageList(WxBillRentManage wxBillRentManage); List queryRentContractIds(WxBillRentManage wxBillRentManage); + List getBillNotifyList(WxBillRentManage record); + Map queryPayInfoTotal(Map params); void updateNotPaidStatus(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index ab0e1ec0a..4d9807922 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import org.apache.ibatis.annotations.Param; @@ -21,6 +22,8 @@ public interface WxBillRentMapper extends CommonMapper { List queryBillRentList(WxBillRent record); List queryBillRentContractIdList(WxBillRent record); + + List getBillNotifyList(WxBillRent record); Map queryPayInfo(Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java index 7bb0c0a78..c0fda0b9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -32,6 +33,7 @@ public interface WxBillDailyService { * @return */ PageInfo listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize); + List notifyList(WxBillDaily record); void updateBillStatus(WxBillDaily record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java index f684e5c02..4abcd4fb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -17,6 +17,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; public interface WxBillDepositService { @@ -30,6 +31,7 @@ public interface WxBillDepositService { * @return */ PageInfo listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize); + List notifyList(WxBillDeposit record); void updateBillStatus(WxBillDeposit record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java index a916edd3d..dd00daab8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -31,6 +32,7 @@ public interface WxBillOtherDepositService { * @return */ PageInfo listAsPage(WxBillOtherDeposit record, Integer pageIndex, Integer pageSize); + List notifyList(WxBillOtherDeposit record); void updateBillStatus(WxBillOtherDeposit record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java index 7189180d8..dc4cbf346 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -31,6 +32,7 @@ public interface WxBillOtherService { * @return */ PageInfo listAsPage(WxBillOther record, Integer pageIndex, Integer pageSize); + List notifyList(WxBillOther record); void updateBillStatus(WxBillOther record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java index d786f0985..23203ed11 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -17,6 +17,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; /** @@ -33,6 +34,7 @@ public interface WxBillPropertyDepositService { * @return */ PageInfo listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize); + List notifyList(WxBillPropertyDeposit record); void updateBillStatus(WxBillPropertyDeposit record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 6fba24b62..c623ef286 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -32,6 +33,7 @@ public interface WxBillPropertyService { * @return */ PageInfo listAsPage(WxBillProperty record, Integer pageIndex, Integer pageSize); + List notifyList(WxBillProperty record); void updateBillStatus(WxBillProperty record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java index ab2cd37f7..d01fb7cae 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import java.util.List; @@ -30,6 +31,7 @@ public interface WxBillRentManageService { * @return */ PageInfo listAsPage(WxBillRentManage wxBillRentManage, Integer pageIndex, Integer pageSize); + List notifyList(WxBillRentManage wxBillRentManage); void updateBillStatus(WxBillRentManage record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 93392429b..983442231 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillAction; @@ -30,6 +31,7 @@ public interface WxBillRentService { * @return */ PageInfo listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize); + List notifyList(WxBillRent record); void updateBillStatus(WxBillRent record); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index d0d01adf5..8c621915b 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -36,6 +36,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.WxBillBaseEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.domain.vo.WxShopVo; import com.iformall.enums.EnumBillAction; @@ -584,6 +585,142 @@ public class WxBillAllHelper { return null; } + public List getBillNotifyList(WxMerchant wxMerchant) { + List retList = new ArrayList(); + List rentList = getBillNotifyList(EnumBillAllType.RENT,wxMerchant); + if (null != rentList) { + retList.addAll(rentList); + } + List rentBussinessList = getBillNotifyList(EnumBillAllType.RENT_BUSSINESS_MANAGE,wxMerchant); + if (null != rentBussinessList) { + retList.addAll(rentBussinessList); + } + List rentOperationList = getBillNotifyList(EnumBillAllType.RENT_OPERATION_MANAGE,wxMerchant); + if (null != rentOperationList) { + retList.addAll(rentOperationList); + } + List rentDepositList = getBillNotifyList(EnumBillAllType.RENT_DEPOSIT,wxMerchant); + if (null != rentDepositList) { + retList.addAll(rentDepositList); + } + List propertyList = getBillNotifyList(EnumBillAllType.PROPERTY,wxMerchant); + if (null != propertyList) { + retList.addAll(propertyList); + } + List propertyDepositList = getBillNotifyList(EnumBillAllType.PROPERTY_DEPOSIT,wxMerchant); + if (null != propertyDepositList) { + retList.addAll(propertyDepositList); + } + List dailyList = getBillNotifyList(EnumBillAllType.DAILY,wxMerchant); + if (null != dailyList) { + retList.addAll(dailyList); + } + List otherList = getBillNotifyList(EnumBillAllType.OTHER,wxMerchant); + if (null != otherList) { + retList.addAll(otherList); + } + List otherDepositList = getBillNotifyList(EnumBillAllType.OTHER_DEPOSIT,wxMerchant); + if (null != otherDepositList) { + retList.addAll(otherDepositList); + } + + if (retList.size() > 0 ) { + //单个商户的就不查了 + if (null == wxMerchant.getId()) { + Map merchantMap = wxMerchantService.findMerchantMap(wxMerchant); + for (int i = 0 ; i < retList.size() ; i++) { + WxBillNotify bn = retList.get(i); + if (null != bn.getMerchantId() && null != merchantMap) { + WxMerchant m = merchantMap.get(bn.getMerchantId()); + if (null != m) { + bn.setMerchantName(m.getName()); + } + } + } + } + } + + return retList; + } + private List getBillNotifyList(EnumBillAllType billType,WxMerchant wxMerchant) { + if (billType == EnumBillAllType.RENT) { + WxBillRent wxBillRent = new WxBillRent(); + updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillRent.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillRent.setBillType(EnumBillAllType.RENT.getCode()); + wxBillRent.setBillTypeName(EnumBillAllType.RENT.getMessage()); + wxBillRent.setSortColumns("starttime asc"); + return wxBillRentService.notifyList(wxBillRent); + }else if (billType == EnumBillAllType.RENT_BUSSINESS_MANAGE) { + WxBillRentManage wxBillRentManage = new WxBillRentManage(); + wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); + updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillRentManage.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillRentManage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); + wxBillRentManage.setBillTypeName(EnumBillAllType.RENT_BUSSINESS_MANAGE.getMessage()); + wxBillRentManage.setSortColumns("starttime asc"); + return wxBillRentManageService.notifyList(wxBillRentManage); + }else if (billType == EnumBillAllType.RENT_OPERATION_MANAGE) { + WxBillRentManage wxBillRentManage = new WxBillRentManage(); + wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); + updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillRentManage.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillRentManage.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); + wxBillRentManage.setBillTypeName(EnumBillAllType.RENT_OPERATION_MANAGE.getMessage()); + wxBillRentManage.setSortColumns("starttime asc"); + return wxBillRentManageService.notifyList(wxBillRentManage); + }else if (billType == EnumBillAllType.RENT_DEPOSIT) { + WxBillDeposit wxBillDeposit = new WxBillDeposit(); + updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillDeposit.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); + wxBillDeposit.setBillTypeName(EnumBillAllType.RENT_DEPOSIT.getMessage()); + wxBillDeposit.setSortColumns("starttime asc"); + return wxBillRentDepositService.notifyList(wxBillDeposit); + }else if (billType == EnumBillAllType.PROPERTY) { + WxBillProperty wxBillProperty = new WxBillProperty(); + updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillProperty.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillProperty.setBillType(EnumBillAllType.PROPERTY.getCode()); + wxBillProperty.setBillTypeName(EnumBillAllType.PROPERTY.getMessage()); + wxBillProperty.setSortColumns("starttime asc"); + return wxBillPropertyService.notifyList(wxBillProperty); + }else if (billType == EnumBillAllType.PROPERTY_DEPOSIT) { + WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); + updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillPropertyDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillPropertyDeposit.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); + wxBillPropertyDeposit.setBillTypeName(EnumBillAllType.PROPERTY_DEPOSIT.getMessage()); + wxBillPropertyDeposit.setSortColumns("starttime asc"); + return wxBillPropertyDepositService.notifyList(wxBillPropertyDeposit); + }else if (billType == EnumBillAllType.DAILY) { + WxBillDaily wxBillDaily = new WxBillDaily(); + updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillDaily.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillDaily.setBillType(EnumBillAllType.DAILY.getCode()); + wxBillDaily.setBillTypeName(EnumBillAllType.DAILY.getMessage()); + wxBillDaily.setSortColumns("starttime asc"); + return wxBillDailyService.notifyList(wxBillDaily); + }else if (billType == EnumBillAllType.OTHER) { + WxBillOther wxBillOther = new WxBillOther(); + updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillOther.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillOther.setBillType(EnumBillAllType.OTHER.getCode()); + wxBillOther.setBillTypeName(EnumBillAllType.OTHER.getMessage()); + wxBillOther.setSortColumns("starttime asc"); + return wxBillOtherService.notifyList(wxBillOther); + }else if (billType == EnumBillAllType.OTHER_DEPOSIT) { + WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); + updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillOtherDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillOtherDeposit.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode()); + wxBillOtherDeposit.setBillTypeName(EnumBillAllType.OTHER_DEPOSIT.getMessage()); + wxBillOtherDeposit.setSortColumns("starttime asc"); + return wxBillOtherDepositService.notifyList(wxBillOtherDeposit); + } + return null; + } + public void exportOneBillOweWord(boolean isOwe,WxBillBaseEntity bill,HttpServletRequest request, HttpServletResponse response) { String templatePath = "contract-word-template/bill_owe_one.docx"; if (!isOwe) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 87893fd6e..d45f9030a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -15,6 +15,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillDailyExportVo; import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -81,6 +82,12 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD return getBillRentPropertyList(pageIndex, pageSize, record, wxPayAccountBill); } + @Override + public List notifyList(WxBillDaily record) { + updateQueryParam(record); + return wxBillDailyMapper.getBillNotifyList(record); + } + private void updateQueryParam(WxBillDaily record) { if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index af25c0210..402eadc94 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -22,6 +22,7 @@ import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillPayWay; @@ -97,6 +98,12 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil return getBillDepositPropertyList(wxPayAccountBill, record, pageIndex, pageSize); } + @Override + public List notifyList(WxBillDeposit record) { + setQueryParam(record); + return wxBillDepositMapper.getBillNotifyList(record); + } + private void setQueryParam(WxBillDeposit record) { if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index d3cbe119a..ab7db82f9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -19,6 +19,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -83,7 +84,12 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements public PageInfo listAsPage(WxBillOtherDeposit record, Integer pageIndex, Integer pageSize) { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); return getBillRentPropertyList(pageIndex, pageSize, record, wxPayAccountBill); - + } + + @Override + public List notifyList(WxBillOtherDeposit record) { + updateQueryParam(record); + return wxBillOtherDepositMapper.getBillNotifyList(record); } private void updateQueryParam(WxBillOtherDeposit record) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 8d3c5866e..b9073f1b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -19,6 +19,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -83,7 +84,12 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO public PageInfo listAsPage(WxBillOther record, Integer pageIndex, Integer pageSize) { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); return getBillOtherPropertyList(pageIndex, pageSize, record, wxPayAccountBill); - + } + + @Override + public List notifyList(WxBillOther record) { + updateQueryParam(record); + return wxBillOtherMapper.getBillNotifyList(record); } private void updateQueryParam(WxBillOther record) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index 37f84c8bd..f4ceefad5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -21,6 +21,7 @@ import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxShop; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillPayWay; @@ -90,6 +91,12 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen return getBillDepositPropertyList(wxPayAccountBill, record, pageIndex, pageSize); } + @Override + public List notifyList(WxBillPropertyDeposit record) { + updateQueryParam(record); + return wxBillPropertyDepositMapper.getBillNotifyList(record); + } + private void updateQueryParam(WxBillPropertyDeposit record) { if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index c07583035..9c38500f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -83,6 +84,12 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi return getBillPropertyList(pageIndex, pageSize, wxPayAccountBill, record); } + @Override + public List notifyList(WxBillProperty record) { + updateQueryParam(record); + return wxBillPropertyMapper.getBillNotifyList(record); + } + private void updateQueryParam(WxBillProperty record) { if(null != record.getDepositStatus()) { WxBillPropertyDeposit bdq1 = new WxBillPropertyDeposit(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index d8afbd94b..486d04cf2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -20,6 +20,7 @@ import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -84,6 +85,12 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W return getBillRentManageList(pageIndex, pageSize, wxBillRentManage, wxPayAccountBill); } + @Override + public List notifyList(WxBillRentManage record) { + updateQueryParam(record); + return wxBillRentManageMapper.getBillNotifyList(record); + } + private void updateQueryParam(WxBillRentManage wxBillRentManage) { if (null != wxBillRentManage.getFloorForRule() || null != wxBillRentManage.getFloor() || null != wxBillRentManage.getBuilding()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRentManage, wxBillRentManage.getFloorForRule(), wxBillRentManage.getBuilding(), wxBillRentManage.getFloor(), 0, 0); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index cad1dd007..54aee4ddd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.RatioVo; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillNotify; import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -79,6 +80,12 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); return getBillRentPropertyList(pageIndex,pageSize,record,wxPayAccountBill); } + + @Override + public List notifyList(WxBillRent record) { + updateQueryParam(record); + return wxBillRentMapper.getBillNotifyList(record); + } public void computeTotalMoney(Integer decimalSize,WxPayAccountBill wxPayAccountBill, WxBillRent rent) { if (rent.getReceivePay() != null) { diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 89c71d118..a29864cc2 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -33,15 +33,13 @@ - `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,`bill_remark`,`last_owe_call_user`, - case type when 1 then '水费' when 2 then '电费' when 3 then '空调费' else '日常费用' end bill_type_name + `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`bill_remark`,`last_owe_call_user` @@ -69,7 +67,7 @@ and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} and `build_way` = #{buildWay} - + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) and id in @@ -124,6 +122,7 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) and br.`build_way` = #{buildWay} + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) and br.`merchant_id` in @@ -144,8 +143,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.`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.`bill_remark`, - case type when 1 then '水费' when 2 then '电费' when 3 then '空调费' else '日常费用' end bill_type_name + br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`bill_remark` from wx_bill_daily br order by ${sortColumns} @@ -183,6 +181,22 @@ + + + + + + + + + + + + + update wx_bill_daily set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) where status!=#{paid} diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index bdac704c5..1af3c1ffe 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -30,8 +30,6 @@ - - @@ -40,7 +38,7 @@ `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,'租赁押金' bill_type_name,'' bill_remark,contract_depoist_detail + `last_owe_call_user`,`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,contract_depoist_detail @@ -84,6 +82,7 @@ and (`starttime` > #{oweBillLastTime} and `starttime` <= #{nearBillLastTime} and status not in (3,6)) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) and `merchant_id` in @@ -123,7 +122,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.`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,'其他押金' bill_type_name,CONCAT(`name`,',',`comments`) bill_remark + br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay from wx_bill_other_deposit br order by ${sortColumns} @@ -186,6 +185,21 @@ + + + + + + + + + + + + update wx_bill_other_deposit set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index f46324b9e..94bc02ba5 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -34,15 +34,12 @@ - - `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`, - '其他费用' bill_type_name, CONCAT(`name`,',',`comments`) bill_remark + `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time` @@ -70,7 +67,7 @@ and `name` = #{name} and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} - + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) and id in @@ -122,6 +119,7 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) and br.`merchant_id` in @@ -143,7 +141,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,'其他费用' bill_type_name, CONCAT(br.`name`,',',br.`comments`) bill_remark + br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay from wx_bill_other br order by ${sortColumns} @@ -180,6 +178,22 @@ select count(1) total_count , sum(CAST(br.`receive_pay` AS DECIMAL(20,2)) - CAST(br.`pay` AS DECIMAL(20,2))) total_money,MIN(br.starttime) min_begin_time from wx_bill_other br + + + + + + + + + + + + + update wx_bill_other set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 91434b571..a831d7558 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -34,15 +34,12 @@ - - `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, - '物业押金' bill_type_name,'' bill_remark + `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay @@ -71,7 +68,7 @@ and `updatetime` = #{updatetime} and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} - + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) and property_contract_id in @@ -129,6 +126,7 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) and br.`merchant_id` in @@ -141,7 +139,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +