| @@ -7,7 +7,7 @@ import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.WxAppinfo; | |||
| import com.iformall.enums.EnumAppType; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.service.WxAppinfoService; | |||
| import com.iformall.service.wechat.FmOpenService; | |||
| import com.iformall.utils.Constant; | |||
| @@ -29,7 +29,6 @@ import java.io.File; | |||
| import java.io.FileInputStream; | |||
| import java.io.IOException; | |||
| import java.io.InputStream; | |||
| import java.util.Date; | |||
| import java.util.Map; | |||
| @RestController | |||
| @@ -93,9 +92,9 @@ public class WxAppinfoController extends BaseController { | |||
| return new ResultData(Result.SUCCESS, "查询成功", wxAppinfoService.getById(id)); | |||
| } | |||
| @ApiOperation(value = "下载二维码", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") | |||
| @ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") | |||
| @PostMapping("/downQrCode") | |||
| public ResultData downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) { | |||
| public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) throws MallinkException { | |||
| logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode"); | |||
| String name = (String) params.get("name"); | |||
| String pageUrl = (String) params.get("pageUrl"); | |||
| @@ -116,7 +115,7 @@ public class WxAppinfoController extends BaseController { | |||
| String text1 = (String) params.get("text1"); | |||
| String text2 = (String) params.get("text2"); | |||
| if (StringUtils.isBlank(pageUrl)) { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "pageUrl不能为空"); | |||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "pageUrl不能为空"); | |||
| } | |||
| try { | |||
| exportQrcode(request, response, | |||
| @@ -125,9 +124,8 @@ public class WxAppinfoController extends BaseController { | |||
| name); | |||
| } catch (Exception e) { | |||
| logger.error(e.getMessage()); | |||
| throw new MallinkException(Result.ERROR, "下载异常"); | |||
| } | |||
| return new ResultData(); | |||
| } | |||
| private void exportQrcode(HttpServletRequest request, HttpServletResponse response, | |||
| @@ -219,7 +217,7 @@ public class WxAppinfoController extends BaseController { | |||
| private void downFile(String filePath, String filename, HttpServletResponse response, HttpServletRequest req) throws IOException { | |||
| try { | |||
| response.reset(); | |||
| response.setContentType("image/png"); | |||
| response.setContentType("application/octet-stream"); | |||
| String agent = req.getHeader("user-agent"); | |||
| if (agent.contains("Firefox")) { | |||
| response.setHeader("Content-disposition", | |||
| @@ -59,6 +59,9 @@ public class WxRentContractController extends BaseController { | |||
| public ResultData add(@RequestBody WxRentContract wxRentContract) { | |||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); | |||
| wxRentContract.setTenantId(getTenantId()); | |||
| if(wxRentContract.getMonthHandleType() != null){ | |||
| wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType()); | |||
| } | |||
| return wxRentContractService.save(wxRentContract, getUser().getId(),getUser().getName()); | |||
| } | |||
| @@ -157,4 +157,21 @@ public class WxShopController extends BaseController { | |||
| wxShopService.exportNotRentShop(wxShop, request, response); | |||
| } | |||
| @ApiOperation("未出租商铺分页列表接口") | |||
| @GetMapping("notRentShopList") | |||
| @ApiImplicitParams({ | |||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||
| @SystemControllerLog(description = "未出租商铺分页列表接口") | |||
| public ResultData notRentShopList(@ModelAttribute WxShop wxShop, Integer pageNum, Integer pageSize) { | |||
| logger.debug("[" + getIpAddr() + "] WxShopController::notRentShopList"); | |||
| if (null == wxShop){ | |||
| wxShop = new WxShop(); | |||
| } | |||
| wxShop.setTenantId(getTenantId()); | |||
| wxShop.setSortColumns(WxShop.Field.Id_DESC); | |||
| final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| } | |||
| @@ -86,6 +86,9 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { | |||
| */ | |||
| @Override | |||
| public String getHeader(String name) { | |||
| if(name.equalsIgnoreCase("user-agent")) { | |||
| return super.getHeader(name); | |||
| } | |||
| String value = super.getHeader(name); | |||
| if (value == null) { | |||
| return null; | |||
| @@ -0,0 +1,2 @@ | |||
| alter table wx_mall | |||
| CHANGE COLUMN `weapp_share_cover_img` `weapp_share_cover_img` VARCHAR(1024) NULL COMMENT '分享封面图片'; | |||
| @@ -0,0 +1,64 @@ | |||
| #租赁账单1 | |||
| alter table wx_bill_rent | |||
| change column late_pay_price late_pay_price bigint(12), | |||
| change column revenue revenue bigint(12), | |||
| change column receive_pay receive_pay bigint(12), | |||
| change column pay pay bigint(12), | |||
| change column owe owe bigint(12), | |||
| change column need_pay need_pay bigint(12) | |||
| ; | |||
| #租赁押金账单2 | |||
| alter table wx_bill_rent_deposit | |||
| change column return_price return_price bigint(12), | |||
| change column receive_pay receive_pay bigint(12), | |||
| change column pay pay bigint(12), | |||
| change column owe owe bigint(12), | |||
| change column need_pay need_pay bigint(12) | |||
| ; | |||
| #物业账单3 | |||
| alter table wx_bill_property | |||
| change column late_pay_price late_pay_price bigint(12), | |||
| change column revenue revenue bigint(12), | |||
| change column receive_pay receive_pay bigint(12), | |||
| change column pay pay bigint(12), | |||
| change column owe owe bigint(12), | |||
| change column need_pay need_pay bigint(12) | |||
| ; | |||
| #物业押金账单4 | |||
| alter table wx_bill_property_deposit | |||
| change column return_price return_price bigint(12), | |||
| change column receive_pay receive_pay bigint(12), | |||
| change column pay pay bigint(12), | |||
| change column owe owe bigint(12), | |||
| change column need_pay need_pay bigint(12) | |||
| ; | |||
| #日常账单5 | |||
| alter table wx_bill_daily | |||
| change column receive_pay receive_pay bigint(12), | |||
| change column pay pay bigint(12), | |||
| change column owe owe bigint(12) | |||
| ; | |||
| #其他账单6 | |||
| alter table wx_bill_other | |||
| change column receive_pay receive_pay bigint(12), | |||
| change column pay pay bigint(12), | |||
| change column owe owe bigint(12) | |||
| ; | |||
| #其他押金账单7 | |||
| alter table wx_bill_other_deposit | |||
| change column return_price return_price bigint(12), | |||
| change column receive_pay receive_pay bigint(12), | |||
| change column pay pay bigint(12), | |||
| change column owe owe bigint(12) | |||
| ; | |||
| #租赁合同 | |||
| alter table wx_rent_contract | |||
| change column price price bigint(12), | |||
| change column deposit deposit bigint(12), | |||
| change column revenue revenue bigint(12) | |||
| ; | |||
| #物业合同 | |||
| alter table wx_property_contract | |||
| change column price price bigint(12), | |||
| change column deposit deposit bigint(12) | |||
| ; | |||
| @@ -86,6 +86,9 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { | |||
| */ | |||
| @Override | |||
| public String getHeader(String name) { | |||
| if(name.equalsIgnoreCase("user-agent")) { | |||
| return super.getHeader(name); | |||
| } | |||
| String value = super.getHeader(name); | |||
| if (value == null) { | |||
| return null; | |||
| @@ -430,7 +430,7 @@ public class WxUserGrantController extends BaseController { | |||
| wxCUserService.saveOrUpdate(user); | |||
| // 成长值 | |||
| user.setScore(wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE, user)); | |||
| user.setScore(user.getScore() + wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE, user)); | |||
| //增加积分 | |||
| addCredit(user, EnumScoreType.WECHAT_PHONE); | |||
| @@ -86,6 +86,9 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { | |||
| */ | |||
| @Override | |||
| public String getHeader(String name) { | |||
| if(name.equalsIgnoreCase("user-agent")) { | |||
| return super.getHeader(name); | |||
| } | |||
| String value = super.getHeader(name); | |||
| if (value == null) { | |||
| return null; | |||
| @@ -8,7 +8,6 @@ import com.iformall.utils.WiwideUtil; | |||
| import org.slf4j.Logger; | |||
| import org.slf4j.LoggerFactory; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.scheduling.annotation.Scheduled; | |||
| import org.springframework.stereotype.Component; | |||
| import java.util.Calendar; | |||
| @@ -25,7 +24,7 @@ public class WiwideTokenSchedule { | |||
| @Autowired | |||
| private WxWiwideInfoMapper wxWiwideInfoMapper; | |||
| @Scheduled(cron = "0 0 * * * ?") | |||
| //@Scheduled(cron = "0 0 * * * ?") | |||
| public void requestToken() { | |||
| List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(null); | |||
| for (int i = 0, size = list.size(); i < size; i++) { | |||
| @@ -71,24 +71,24 @@ public class WxBillAction implements Serializable { | |||
| private Date updatetime; | |||
| @Transient | |||
| private Integer oldPrice; | |||
| private Long oldPrice; | |||
| @Transient | |||
| private Integer newPrice; | |||
| private Long newPrice; | |||
| public Integer getOldPrice() { | |||
| public Long getOldPrice() { | |||
| return oldPrice; | |||
| } | |||
| public void setOldPrice(Integer oldPrice) { | |||
| public void setOldPrice(Long oldPrice) { | |||
| this.oldPrice = oldPrice; | |||
| } | |||
| public Integer getNewPrice() { | |||
| public Long getNewPrice() { | |||
| return newPrice; | |||
| } | |||
| public void setNewPrice(Integer newPrice) { | |||
| public void setNewPrice(Long newPrice) { | |||
| this.newPrice = newPrice; | |||
| } | |||
| @@ -64,10 +64,10 @@ public class WxBillDaily implements Serializable { | |||
| /*实际应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | |||
| private Integer receivePay; | |||
| private Long receivePay; | |||
| /*实收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | |||
| private Integer pay; | |||
| private Long pay; | |||
| /*截止收款日期**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | |||
| private Date receiveDate; | |||
| @@ -85,7 +85,7 @@ public class WxBillDaily implements Serializable { | |||
| private String tenantId; | |||
| /*欠缴**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | |||
| private Integer owe; | |||
| private Long owe; | |||
| /*账单状态1待缴2欠缴3已结清**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | |||
| private Integer status; | |||
| @@ -130,16 +130,19 @@ public class WxBillDaily implements Serializable { | |||
| this.payWay = payWay; | |||
| } | |||
| public Integer getReceivePay() { | |||
| public Long getReceivePay() { | |||
| return receivePay; | |||
| } | |||
| public void setReceivePay(Integer _receivePay) { | |||
| public void setReceivePay(Long _receivePay) { | |||
| receivePay = _receivePay; | |||
| } | |||
| public Integer getPay() { | |||
| public Long getPay() { | |||
| return pay; | |||
| } | |||
| public void setPay(Integer _pay) { | |||
| public void setPay(Long _pay) { | |||
| pay = _pay; | |||
| } | |||
| public Date getReceiveDate() { | |||
| @@ -172,10 +175,12 @@ public class WxBillDaily implements Serializable { | |||
| public void setTenantId(String _tenantId) { | |||
| tenantId = _tenantId; | |||
| } | |||
| public Integer getOwe() { | |||
| public Long getOwe() { | |||
| return owe; | |||
| } | |||
| public void setOwe(Integer _owe) { | |||
| public void setOwe(Long _owe) { | |||
| owe = _owe; | |||
| } | |||
| public Integer getStatus() { | |||
| @@ -48,10 +48,10 @@ public class WxBillDeposit implements Serializable { | |||
| private Long rentContractId; | |||
| /*实际应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | |||
| private Integer receivePay; | |||
| private Long receivePay; | |||
| /*实收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | |||
| private Integer pay; | |||
| private Long pay; | |||
| /*收款日期**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | |||
| private Date receiveDate; | |||
| @@ -69,7 +69,7 @@ public class WxBillDeposit implements Serializable { | |||
| private String tenantId; | |||
| /*欠缴**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | |||
| private Integer owe; | |||
| private Long owe; | |||
| /*账单状态1未到期2待缴3欠缴4已结清**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | |||
| private Integer status; | |||
| @@ -78,7 +78,7 @@ public class WxBillDeposit implements Serializable { | |||
| private Integer isDel; | |||
| /*应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | |||
| private Integer needPay; | |||
| private Long needPay; | |||
| /*商户ID**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | |||
| private Long merchantId; | |||
| @@ -149,16 +149,20 @@ public class WxBillDeposit implements Serializable { | |||
| public void setRentContractId(Long _rentContractId) { | |||
| rentContractId = _rentContractId; | |||
| } | |||
| public Integer getReceivePay() { | |||
| public Long getReceivePay() { | |||
| return receivePay; | |||
| } | |||
| public void setReceivePay(Integer _receivePay) { | |||
| public void setReceivePay(Long _receivePay) { | |||
| receivePay = _receivePay; | |||
| } | |||
| public Integer getPay() { | |||
| public Long getPay() { | |||
| return pay; | |||
| } | |||
| public void setPay(Integer _pay) { | |||
| public void setPay(Long _pay) { | |||
| pay = _pay; | |||
| } | |||
| public Date getReceiveDate() { | |||
| @@ -191,10 +195,12 @@ public class WxBillDeposit implements Serializable { | |||
| public void setTenantId(String _tenantId) { | |||
| tenantId = _tenantId; | |||
| } | |||
| public Integer getOwe() { | |||
| public Long getOwe() { | |||
| return owe; | |||
| } | |||
| public void setOwe(Integer _owe) { | |||
| public void setOwe(Long _owe) { | |||
| owe = _owe; | |||
| } | |||
| public Integer getStatus() { | |||
| @@ -209,10 +215,12 @@ public class WxBillDeposit implements Serializable { | |||
| public void setIsDel(Integer _isDel) { | |||
| isDel = _isDel; | |||
| } | |||
| public Integer getNeedPay() { | |||
| public Long getNeedPay() { | |||
| return needPay; | |||
| } | |||
| public void setNeedPay(Integer _needPay) { | |||
| public void setNeedPay(Long _needPay) { | |||
| needPay = _needPay; | |||
| } | |||
| public Long getMerchantId() { | |||
| @@ -75,10 +75,10 @@ public class WxBillOther implements Serializable { | |||
| /*实际应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | |||
| private Integer receivePay; | |||
| private Long receivePay; | |||
| /*实收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | |||
| private Integer pay; | |||
| private Long pay; | |||
| /*截止收款日期**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | |||
| private Date receiveDate; | |||
| @@ -96,7 +96,7 @@ public class WxBillOther implements Serializable { | |||
| private String tenantId; | |||
| /*欠缴**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | |||
| private Integer owe; | |||
| private Long owe; | |||
| /*账单状态1待缴2欠缴3已结清**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | |||
| private Integer status; | |||
| @@ -130,16 +130,19 @@ public class WxBillOther implements Serializable { | |||
| this.payWay = payWay; | |||
| } | |||
| public Integer getReceivePay() { | |||
| public Long getReceivePay() { | |||
| return receivePay; | |||
| } | |||
| public void setReceivePay(Integer _receivePay) { | |||
| public void setReceivePay(Long _receivePay) { | |||
| receivePay = _receivePay; | |||
| } | |||
| public Integer getPay() { | |||
| public Long getPay() { | |||
| return pay; | |||
| } | |||
| public void setPay(Integer _pay) { | |||
| public void setPay(Long _pay) { | |||
| pay = _pay; | |||
| } | |||
| public Date getReceiveDate() { | |||
| @@ -172,10 +175,12 @@ public class WxBillOther implements Serializable { | |||
| public void setTenantId(String _tenantId) { | |||
| tenantId = _tenantId; | |||
| } | |||
| public Integer getOwe() { | |||
| public Long getOwe() { | |||
| return owe; | |||
| } | |||
| public void setOwe(Integer _owe) { | |||
| public void setOwe(Long _owe) { | |||
| owe = _owe; | |||
| } | |||
| public Integer getStatus() { | |||
| @@ -78,10 +78,10 @@ public class WxBillOtherDeposit implements Serializable { | |||
| /*实际应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePay") | |||
| private Integer receivePay; | |||
| private Long receivePay; | |||
| /*实收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") | |||
| private Integer pay; | |||
| private Long pay; | |||
| /*截止收款日期**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") | |||
| private Date receiveDate; | |||
| @@ -99,7 +99,7 @@ public class WxBillOtherDeposit implements Serializable { | |||
| private String tenantId; | |||
| /*欠缴**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "欠缴", name = "owe") | |||
| private Integer owe; | |||
| private Long owe; | |||
| /*账单状态1待缴2欠缴3已结清**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | |||
| private Integer status; | |||
| @@ -123,7 +123,7 @@ public class WxBillOtherDeposit implements Serializable { | |||
| private Integer rentShopType; | |||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | |||
| private Integer returnPrice; | |||
| private Long returnPrice; | |||
| @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | |||
| private Integer payWay; | |||
| @@ -136,19 +136,19 @@ public class WxBillOtherDeposit implements Serializable { | |||
| this.payWay = payWay; | |||
| } | |||
| public Integer getReceivePay() { | |||
| public Long getReceivePay() { | |||
| return receivePay; | |||
| } | |||
| public void setReceivePay(Integer _receivePay) { | |||
| public void setReceivePay(Long _receivePay) { | |||
| receivePay = _receivePay; | |||
| } | |||
| public Integer getPay() { | |||
| public Long getPay() { | |||
| return pay; | |||
| } | |||
| public void setPay(Integer _pay) { | |||
| public void setPay(Long _pay) { | |||
| pay = _pay; | |||
| } | |||
| @@ -192,11 +192,11 @@ public class WxBillOtherDeposit implements Serializable { | |||
| tenantId = _tenantId; | |||
| } | |||
| public Integer getOwe() { | |||
| public Long getOwe() { | |||
| return owe; | |||
| } | |||
| public void setOwe(Integer _owe) { | |||
| public void setOwe(Long _owe) { | |||
| owe = _owe; | |||
| } | |||
| @@ -256,11 +256,11 @@ public class WxBillOtherDeposit implements Serializable { | |||
| this.rentShopType = rentShopType; | |||
| } | |||
| public Integer getReturnPrice() { | |||
| public Long getReturnPrice() { | |||
| return returnPrice; | |||
| } | |||
| public void setReturnPrice(Integer returnPrice) { | |||
| public void setReturnPrice(Long returnPrice) { | |||
| this.returnPrice = returnPrice; | |||
| } | |||
| @@ -48,10 +48,10 @@ public class WxBillProperty implements Serializable { | |||
| private Long propertyContractId; | |||
| /*实际应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | |||
| private Integer receivePay; | |||
| private Long receivePay; | |||
| /*实收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | |||
| private Integer pay; | |||
| private Long pay; | |||
| /*收款日期**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | |||
| private Date receiveDate; | |||
| @@ -69,7 +69,7 @@ public class WxBillProperty implements Serializable { | |||
| private String tenantId; | |||
| /*欠缴**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | |||
| private Integer owe; | |||
| private Long owe; | |||
| /*账单状态1未到期2待缴3欠缴4已结清**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | |||
| private Integer status; | |||
| @@ -78,7 +78,7 @@ public class WxBillProperty implements Serializable { | |||
| private Integer isDel; | |||
| /*应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | |||
| private Integer needPay; | |||
| private Long needPay; | |||
| /*商户ID**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | |||
| private Long merchantId; | |||
| @@ -102,7 +102,7 @@ public class WxBillProperty implements Serializable { | |||
| private Integer rentShopType; | |||
| @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") | |||
| private Integer revenue; | |||
| private Long revenue; | |||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | |||
| private Integer latePayRatio; | |||
| @@ -111,7 +111,7 @@ public class WxBillProperty implements Serializable { | |||
| private Date latePayTime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") | |||
| private Integer latePayPrice; | |||
| private Long latePayPrice; | |||
| @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") | |||
| private Integer period; | |||
| @@ -196,16 +196,19 @@ public class WxBillProperty implements Serializable { | |||
| this.propertyContractId = propertyContractId; | |||
| } | |||
| public Integer getReceivePay() { | |||
| public Long getReceivePay() { | |||
| return receivePay; | |||
| } | |||
| public void setReceivePay(Integer _receivePay) { | |||
| public void setReceivePay(Long _receivePay) { | |||
| receivePay = _receivePay; | |||
| } | |||
| public Integer getPay() { | |||
| public Long getPay() { | |||
| return pay; | |||
| } | |||
| public void setPay(Integer _pay) { | |||
| public void setPay(Long _pay) { | |||
| pay = _pay; | |||
| } | |||
| public Date getReceiveDate() { | |||
| @@ -238,10 +241,12 @@ public class WxBillProperty implements Serializable { | |||
| public void setTenantId(String _tenantId) { | |||
| tenantId = _tenantId; | |||
| } | |||
| public Integer getOwe() { | |||
| public Long getOwe() { | |||
| return owe; | |||
| } | |||
| public void setOwe(Integer _owe) { | |||
| public void setOwe(Long _owe) { | |||
| owe = _owe; | |||
| } | |||
| public Integer getStatus() { | |||
| @@ -256,10 +261,12 @@ public class WxBillProperty implements Serializable { | |||
| public void setIsDel(Integer _isDel) { | |||
| isDel = _isDel; | |||
| } | |||
| public Integer getNeedPay() { | |||
| public Long getNeedPay() { | |||
| return needPay; | |||
| } | |||
| public void setNeedPay(Integer _needPay) { | |||
| public void setNeedPay(Long _needPay) { | |||
| needPay = _needPay; | |||
| } | |||
| public Long getMerchantId() { | |||
| @@ -303,11 +310,11 @@ public class WxBillProperty implements Serializable { | |||
| this.rentShopType = rentShopType; | |||
| } | |||
| public Integer getRevenue() { | |||
| public Long getRevenue() { | |||
| return revenue; | |||
| } | |||
| public void setRevenue(Integer revenue) { | |||
| public void setRevenue(Long revenue) { | |||
| this.revenue = revenue; | |||
| } | |||
| @@ -327,11 +334,11 @@ public class WxBillProperty implements Serializable { | |||
| this.latePayTime = latePayTime; | |||
| } | |||
| public Integer getLatePayPrice() { | |||
| public Long getLatePayPrice() { | |||
| return latePayPrice; | |||
| } | |||
| public void setLatePayPrice(Integer latePayPrice) { | |||
| public void setLatePayPrice(Long latePayPrice) { | |||
| this.latePayPrice = latePayPrice; | |||
| } | |||
| @@ -48,10 +48,10 @@ public class WxBillPropertyDeposit implements Serializable { | |||
| private Long propertyContractId; | |||
| /*实际应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | |||
| private Integer receivePay; | |||
| private Long receivePay; | |||
| /*实收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | |||
| private Integer pay; | |||
| private Long pay; | |||
| /*收款日期**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | |||
| private Date receiveDate; | |||
| @@ -69,7 +69,7 @@ public class WxBillPropertyDeposit implements Serializable { | |||
| private String tenantId; | |||
| /*欠缴**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | |||
| private Integer owe; | |||
| private Long owe; | |||
| /*账单状态1未到期2待缴3欠缴4已结清**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | |||
| private Integer status; | |||
| @@ -78,7 +78,7 @@ public class WxBillPropertyDeposit implements Serializable { | |||
| private Integer isDel; | |||
| /*应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | |||
| private Integer needPay; | |||
| private Long needPay; | |||
| /*商户ID**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | |||
| private Long merchantId; | |||
| @@ -102,7 +102,7 @@ public class WxBillPropertyDeposit implements Serializable { | |||
| private Integer rentShopType; | |||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | |||
| private Integer returnPrice; | |||
| private Long returnPrice; | |||
| @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "shopInfo") | |||
| private String shopInfo; | |||
| @@ -150,16 +150,19 @@ public class WxBillPropertyDeposit implements Serializable { | |||
| this.propertyContractId = propertyContractId; | |||
| } | |||
| public Integer getReceivePay() { | |||
| public Long getReceivePay() { | |||
| return receivePay; | |||
| } | |||
| public void setReceivePay(Integer _receivePay) { | |||
| public void setReceivePay(Long _receivePay) { | |||
| receivePay = _receivePay; | |||
| } | |||
| public Integer getPay() { | |||
| public Long getPay() { | |||
| return pay; | |||
| } | |||
| public void setPay(Integer _pay) { | |||
| public void setPay(Long _pay) { | |||
| pay = _pay; | |||
| } | |||
| public Date getReceiveDate() { | |||
| @@ -192,10 +195,12 @@ public class WxBillPropertyDeposit implements Serializable { | |||
| public void setTenantId(String _tenantId) { | |||
| tenantId = _tenantId; | |||
| } | |||
| public Integer getOwe() { | |||
| public Long getOwe() { | |||
| return owe; | |||
| } | |||
| public void setOwe(Integer _owe) { | |||
| public void setOwe(Long _owe) { | |||
| owe = _owe; | |||
| } | |||
| public Integer getStatus() { | |||
| @@ -210,10 +215,12 @@ public class WxBillPropertyDeposit implements Serializable { | |||
| public void setIsDel(Integer _isDel) { | |||
| isDel = _isDel; | |||
| } | |||
| public Integer getNeedPay() { | |||
| public Long getNeedPay() { | |||
| return needPay; | |||
| } | |||
| public void setNeedPay(Integer _needPay) { | |||
| public void setNeedPay(Long _needPay) { | |||
| needPay = _needPay; | |||
| } | |||
| public Long getMerchantId() { | |||
| @@ -257,11 +264,11 @@ public class WxBillPropertyDeposit implements Serializable { | |||
| this.rentShopType = rentShopType; | |||
| } | |||
| public Integer getReturnPrice() { | |||
| public Long getReturnPrice() { | |||
| return returnPrice; | |||
| } | |||
| public void setReturnPrice(Integer returnPrice) { | |||
| public void setReturnPrice(Long returnPrice) { | |||
| this.returnPrice = returnPrice; | |||
| } | |||
| @@ -48,10 +48,10 @@ public class WxBillRent implements Serializable { | |||
| private Long rentContractId; | |||
| /*实际应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | |||
| private Integer receivePay; | |||
| private Long receivePay; | |||
| /*实收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | |||
| private Integer pay; | |||
| private Long pay; | |||
| /*收款日期**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | |||
| private Date receiveDate; | |||
| @@ -69,7 +69,7 @@ public class WxBillRent implements Serializable { | |||
| private String tenantId; | |||
| /*欠缴**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | |||
| private Integer owe; | |||
| private Long owe; | |||
| /*账单状态1未到期2待缴3逾期未缴4部分逾期5已结清**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | |||
| private Integer status; | |||
| @@ -78,7 +78,7 @@ public class WxBillRent implements Serializable { | |||
| private Integer isDel; | |||
| /*应收金额**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | |||
| private Integer needPay; | |||
| private Long needPay; | |||
| /*商户ID**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | |||
| private Long merchantId; | |||
| @@ -104,7 +104,7 @@ public class WxBillRent implements Serializable { | |||
| private Integer rentShopType; | |||
| @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") | |||
| private Integer revenue; | |||
| private Long revenue; | |||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | |||
| private Integer latePayRatio; | |||
| @@ -113,7 +113,7 @@ public class WxBillRent implements Serializable { | |||
| private Date latePayTime; | |||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") | |||
| private Integer latePayPrice; | |||
| private Long latePayPrice; | |||
| @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") | |||
| private Integer period; | |||
| @@ -204,16 +204,20 @@ public class WxBillRent implements Serializable { | |||
| public void setRentContractId(Long _rentContractId) { | |||
| rentContractId = _rentContractId; | |||
| } | |||
| public Integer getReceivePay() { | |||
| public Long getReceivePay() { | |||
| return receivePay; | |||
| } | |||
| public void setReceivePay(Integer _receivePay) { | |||
| public void setReceivePay(Long _receivePay) { | |||
| receivePay = _receivePay; | |||
| } | |||
| public Integer getPay() { | |||
| public Long getPay() { | |||
| return pay; | |||
| } | |||
| public void setPay(Integer _pay) { | |||
| public void setPay(Long _pay) { | |||
| pay = _pay; | |||
| } | |||
| public Date getReceiveDate() { | |||
| @@ -246,10 +250,12 @@ public class WxBillRent implements Serializable { | |||
| public void setTenantId(String _tenantId) { | |||
| tenantId = _tenantId; | |||
| } | |||
| public Integer getOwe() { | |||
| public Long getOwe() { | |||
| return owe; | |||
| } | |||
| public void setOwe(Integer _owe) { | |||
| public void setOwe(Long _owe) { | |||
| owe = _owe; | |||
| } | |||
| public Integer getStatus() { | |||
| @@ -264,10 +270,12 @@ public class WxBillRent implements Serializable { | |||
| public void setIsDel(Integer _isDel) { | |||
| isDel = _isDel; | |||
| } | |||
| public Integer getNeedPay() { | |||
| public Long getNeedPay() { | |||
| return needPay; | |||
| } | |||
| public void setNeedPay(Integer _needPay) { | |||
| public void setNeedPay(Long _needPay) { | |||
| needPay = _needPay; | |||
| } | |||
| public Long getMerchantId() { | |||
| @@ -305,11 +313,11 @@ public class WxBillRent implements Serializable { | |||
| this.rentShopType = rentShopType; | |||
| } | |||
| public Integer getRevenue() { | |||
| public Long getRevenue() { | |||
| return revenue; | |||
| } | |||
| public void setRevenue(Integer revenue) { | |||
| public void setRevenue(Long revenue) { | |||
| this.revenue = revenue; | |||
| } | |||
| @@ -329,11 +337,11 @@ public class WxBillRent implements Serializable { | |||
| this.latePayTime = latePayTime; | |||
| } | |||
| public Integer getLatePayPrice() { | |||
| public Long getLatePayPrice() { | |||
| return latePayPrice; | |||
| } | |||
| public void setLatePayPrice(Integer latePayPrice) { | |||
| public void setLatePayPrice(Long latePayPrice) { | |||
| this.latePayPrice = latePayPrice; | |||
| } | |||
| @@ -73,7 +73,7 @@ public class WxPropertyContract implements Serializable { | |||
| private Long merchantId; | |||
| /*月租金/分成(分)**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") | |||
| private Integer price; | |||
| private Long price; | |||
| /*计租开始时间**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="计租开始时间",name="rentalStartDate") | |||
| private Date rentalStartDate; | |||
| @@ -100,7 +100,7 @@ public class WxPropertyContract implements Serializable { | |||
| private String contractNumber; | |||
| /*押金**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="押金",name="deposit") | |||
| private Integer deposit; | |||
| private Long deposit; | |||
| /*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate") | |||
| private Integer payDate; | |||
| @@ -244,10 +244,12 @@ public class WxPropertyContract implements Serializable { | |||
| public void setMerchantId(Long _merchantId) { | |||
| merchantId = _merchantId; | |||
| } | |||
| public Integer getPrice() { | |||
| public Long getPrice() { | |||
| return price; | |||
| } | |||
| public void setPrice(Integer _price) { | |||
| public void setPrice(Long _price) { | |||
| price = _price; | |||
| } | |||
| public Date getRentalStartDate() { | |||
| @@ -298,10 +300,12 @@ public class WxPropertyContract implements Serializable { | |||
| public void setContractNumber(String _contractNumber) { | |||
| contractNumber = _contractNumber; | |||
| } | |||
| public Integer getDeposit() { | |||
| public Long getDeposit() { | |||
| return deposit; | |||
| } | |||
| public void setDeposit(Integer _deposit) { | |||
| public void setDeposit(Long _deposit) { | |||
| deposit = _deposit; | |||
| } | |||
| public Integer getPayDate() { | |||
| @@ -65,6 +65,22 @@ public class WxRentContract implements Serializable { | |||
| @Transient | |||
| private String depositStr; | |||
| /** | |||
| * 月计租方式 3按自然月 | |||
| * adjustPeriod 1日 2月 monthHandleType 2按账单周期 3按自然月 | |||
| */ | |||
| @io.swagger.annotations.ApiModelProperty(value = "月计租方式3按自然月", name = "merchantId") | |||
| @Transient | |||
| private Integer monthHandleType; | |||
| public Integer getMonthHandleType() { | |||
| return monthHandleType; | |||
| } | |||
| public void setMonthHandleType(Integer monthHandleType) { | |||
| this.monthHandleType = monthHandleType; | |||
| } | |||
| public String getBuilding() { | |||
| return building; | |||
| } | |||
| @@ -94,7 +110,7 @@ public class WxRentContract implements Serializable { | |||
| private Long merchantId; | |||
| /*月租金/分成(分)**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") | |||
| private Integer price; | |||
| private Long price; | |||
| /*计租开始时间**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "计租开始时间", name = "rentalStartDate") | |||
| private Date rentalStartDate; | |||
| @@ -121,7 +137,7 @@ public class WxRentContract implements Serializable { | |||
| private String contractNumber; | |||
| /*押金**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") | |||
| private Integer deposit; | |||
| private Long deposit; | |||
| /*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/ | |||
| @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") | |||
| @@ -302,11 +318,11 @@ public class WxRentContract implements Serializable { | |||
| merchantId = _merchantId; | |||
| } | |||
| public Integer getPrice() { | |||
| public Long getPrice() { | |||
| return price; | |||
| } | |||
| public void setPrice(Integer _price) { | |||
| public void setPrice(Long _price) { | |||
| price = _price; | |||
| } | |||
| @@ -374,11 +390,11 @@ public class WxRentContract implements Serializable { | |||
| contractNumber = _contractNumber; | |||
| } | |||
| public Integer getDeposit() { | |||
| public Long getDeposit() { | |||
| return deposit; | |||
| } | |||
| public void setDeposit(Integer _deposit) { | |||
| public void setDeposit(Long _deposit) { | |||
| deposit = _deposit; | |||
| } | |||
| @@ -48,10 +48,10 @@ public class WxBillAllVo { | |||
| private Integer status; | |||
| private Integer billTypeValue; | |||
| private Integer needPay; | |||
| private Integer receivePay; | |||
| private Integer pay; | |||
| private Integer owe; | |||
| private Long needPay; | |||
| private Long receivePay; | |||
| private Long pay; | |||
| private Long owe; | |||
| private Date payDate; | |||
| private Date starttime; | |||
| private Date endtime; | |||
| @@ -109,35 +109,35 @@ public class WxBillAllVo { | |||
| this.billType = billType; | |||
| } | |||
| public Integer getNeedPay() { | |||
| public Long getNeedPay() { | |||
| return needPay; | |||
| } | |||
| public void setNeedPay(Integer needPay) { | |||
| public void setNeedPay(Long needPay) { | |||
| this.needPay = needPay; | |||
| } | |||
| public Integer getReceivePay() { | |||
| public Long getReceivePay() { | |||
| return receivePay; | |||
| } | |||
| public void setReceivePay(Integer receivePay) { | |||
| public void setReceivePay(Long receivePay) { | |||
| this.receivePay = receivePay; | |||
| } | |||
| public Integer getPay() { | |||
| public Long getPay() { | |||
| return pay; | |||
| } | |||
| public void setPay(Integer pay) { | |||
| public void setPay(Long pay) { | |||
| this.pay = pay; | |||
| } | |||
| public Integer getOwe() { | |||
| public Long getOwe() { | |||
| return owe; | |||
| } | |||
| public void setOwe(Integer owe) { | |||
| public void setOwe(Long owe) { | |||
| this.owe = owe; | |||
| } | |||
| @@ -14,9 +14,10 @@ public interface WxShopMapper extends CommonMapper<WxShop, String> { | |||
| List<WxShop> findList(WxShop wxShop); | |||
| List<Map<String,Object>> findListMap(WxShop record); | |||
| List<Map<String,Object>> notRentListMapAsPage(WxShop record); | |||
| List<Map<String, Object>> getbshoplist(Map<String, Object> tenantId); | |||
| Map<String, Object> getMerchantShopByShopId(Map<String,Object> params); | |||
| @@ -21,6 +21,8 @@ public interface WxShopService { | |||
| PageInfo<Map<String,Object>> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); | |||
| PageInfo<Map<String,Object>> notRentListMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); | |||
| /** | |||
| * 根据Id获得实体 | |||
| * | |||
| @@ -10,7 +10,6 @@ import com.iformall.domain.po.msg.MailMsg; | |||
| import com.iformall.domain.vo.OweMerchantVo; | |||
| import com.iformall.domain.vo.WxBillAll; | |||
| import com.iformall.domain.vo.WxBillAllVo; | |||
| import com.iformall.domain.vo.WxNotRentShopVo; | |||
| import com.iformall.enums.*; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.mapper.*; | |||
| @@ -19,10 +18,8 @@ import com.iformall.service.*; | |||
| import org.apache.commons.collections.CollectionUtils; | |||
| import org.apache.commons.collections.map.HashedMap; | |||
| import org.apache.commons.lang3.StringUtils; | |||
| import org.slf4j.Logger; | |||
| import org.slf4j.LoggerFactory; | |||
| import org.springframework.beans.BeanUtils; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.stereotype.Service; | |||
| @@ -30,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; | |||
| import javax.servlet.http.HttpServletResponse; | |||
| import java.math.BigDecimal; | |||
| import java.math.RoundingMode; | |||
| import java.util.*; | |||
| import java.util.stream.Collectors; | |||
| @@ -263,9 +259,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| } | |||
| Date date = new Date(); | |||
| wxBillOtherDeposit.setPayDate(date); | |||
| Integer owe = (Integer) bill.get("owe"); | |||
| Long owe = (Long) bill.get("owe"); | |||
| wxBillOtherDeposit.setPay(wxBillOtherDeposit.getPay() + owe); | |||
| wxBillOtherDeposit.setOwe(0); | |||
| wxBillOtherDeposit.setOwe(0L); | |||
| wxBillOtherDeposit.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillOtherDeposit.setUpdatetime(date); | |||
| wxBillOtherDeposit.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -305,9 +301,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| } | |||
| Date date = new Date(); | |||
| wxBillOther.setPayDate(date); | |||
| Integer owe = (Integer) bill.get("owe"); | |||
| Long owe = (Long) bill.get("owe"); | |||
| wxBillOther.setPay(wxBillOther.getPay()+owe); | |||
| wxBillOther.setOwe(0); | |||
| wxBillOther.setOwe(0L); | |||
| wxBillOther.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillOther.setUpdatetime(date); | |||
| wxBillOther.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -347,9 +343,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| } | |||
| Date date = new Date(); | |||
| wxBillDaily.setPayDate(date); | |||
| Integer owe = (Integer) bill.get("owe"); | |||
| Long owe = (Long) bill.get("owe"); | |||
| wxBillDaily.setPay(wxBillDaily.getPay()+owe); | |||
| wxBillDaily.setOwe(0); | |||
| wxBillDaily.setOwe(0L); | |||
| wxBillDaily.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillDaily.setUpdatetime(date); | |||
| wxBillDaily.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -390,9 +386,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| } | |||
| Date date = new Date(); | |||
| wxBillPropertyDeposit.setPayDate(date); | |||
| Integer owe = (Integer) bill.get("owe"); | |||
| Long owe = (Long) bill.get("owe"); | |||
| wxBillPropertyDeposit.setPay(wxBillPropertyDeposit.getPay()+owe); | |||
| wxBillPropertyDeposit.setOwe(0); | |||
| wxBillPropertyDeposit.setOwe(0L); | |||
| wxBillPropertyDeposit.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillPropertyDeposit.setUpdatetime(date); | |||
| wxBillPropertyDeposit.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -433,9 +429,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| } | |||
| Date date = new Date(); | |||
| property.setPayDate(date); | |||
| Integer owe = (Integer) bill.get("owe"); | |||
| Long owe = (Long) bill.get("owe"); | |||
| property.setPay(property.getPay()+owe); | |||
| property.setOwe(0); | |||
| property.setOwe(0L); | |||
| property.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| property.setUpdatetime(date); | |||
| property.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -476,9 +472,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| } | |||
| Date date = new Date(); | |||
| wxBillDeposit.setPayDate(date); | |||
| Integer owe = (Integer) bill.get("owe"); | |||
| Long owe = (Long) bill.get("owe"); | |||
| wxBillDeposit.setPay(wxBillDeposit.getPay()+owe); | |||
| wxBillDeposit.setOwe(0); | |||
| wxBillDeposit.setOwe(0L); | |||
| wxBillDeposit.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillDeposit.setUpdatetime(date); | |||
| wxBillDeposit.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -519,9 +515,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| } | |||
| Date date = new Date(); | |||
| wxBillRent.setPayDate(date); | |||
| Integer owe = (Integer) bill.get("owe"); | |||
| Long owe = (Long) bill.get("owe"); | |||
| wxBillRent.setPay(wxBillRent.getPay()+owe); | |||
| wxBillRent.setOwe(0); | |||
| wxBillRent.setOwe(0L); | |||
| wxBillRent.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillRent.setUpdatetime(date); | |||
| wxBillRent.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -617,7 +613,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| }else if(type.intValue() == 2){ | |||
| return wxBillPropertyMapper.oweBillCount(contractId); | |||
| } | |||
| return 0l; | |||
| return 0L; | |||
| } | |||
| public Map<Long, List<Map<String, Object>>> toMap(List<Map<String, Object>> mapList){ | |||
| @@ -143,7 +143,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||
| if(wxBillDaily==null){ | |||
| return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | |||
| } | |||
| Integer addpay = wxBillDaily.getPay(); | |||
| Long addpay = wxBillDaily.getPay(); | |||
| wxBillDaily.setPayDate(record.getPayDate()); | |||
| wxBillDaily.setPay(record.getPay()); | |||
| wxBillDaily.setReceivePay(record.getReceivePay()); | |||
| @@ -128,7 +128,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||
| if(wxBillDeposit==null){ | |||
| return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); | |||
| } | |||
| Integer addpay = wxBillDeposit.getPay(); | |||
| Long addpay = wxBillDeposit.getPay(); | |||
| wxBillDeposit.setPayDate(record.getPayDate()); | |||
| wxBillDeposit.setPay(record.getPay()); | |||
| wxBillDeposit.setReceivePay(record.getReceivePay()); | |||
| @@ -144,7 +144,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||
| if (wxBillOtherDeposit == null) { | |||
| return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | |||
| } | |||
| Integer addpay = wxBillOtherDeposit.getPay(); | |||
| Long addpay = wxBillOtherDeposit.getPay(); | |||
| wxBillOtherDeposit.setPayDate(record.getPayDate()); | |||
| wxBillOtherDeposit.setPay(record.getPay()); | |||
| wxBillOtherDeposit.setReceivePay(record.getReceivePay()); | |||
| @@ -143,7 +143,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||
| if(wxBillOther==null){ | |||
| return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | |||
| } | |||
| Integer addpay = wxBillOther.getPay(); | |||
| Long addpay = wxBillOther.getPay(); | |||
| wxBillOther.setPayDate(record.getPayDate()); | |||
| wxBillOther.setPay(record.getPay()); | |||
| wxBillOther.setReceivePay(record.getReceivePay()); | |||
| @@ -128,7 +128,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||
| if(record==null){ | |||
| return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); | |||
| } | |||
| Integer addpay = wxBillDeposit.getPay(); | |||
| Long addpay = wxBillDeposit.getPay(); | |||
| wxBillDeposit.setPayDate(record.getPayDate()); | |||
| wxBillDeposit.setPay(record.getPay()); | |||
| wxBillDeposit.setReceivePay(record.getReceivePay()); | |||
| @@ -127,7 +127,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||
| if(property==null){ | |||
| return new ResultData(ErrorCode.BILL_PROPERTY_IS_NOT_FOUND); | |||
| } | |||
| Integer addpay = property.getPay(); | |||
| Long addpay = property.getPay(); | |||
| property.setRevenue(record.getRevenue()); | |||
| property.setLatePayRatio(record.getLatePayRatio()); | |||
| property.setLatePayTime(record.getLatePayTime()); | |||
| @@ -127,7 +127,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||
| if(wxBillRent==null){ | |||
| return new ResultData(ErrorCode.BILL_RENT_IS_NOT_FOUND); | |||
| } | |||
| Integer addpay = wxBillRent.getPay(); | |||
| Long addpay = wxBillRent.getPay(); | |||
| wxBillRent.setRevenue(record.getRevenue()); | |||
| wxBillRent.setLatePayRatio(record.getLatePayRatio()); | |||
| wxBillRent.setLatePayTime(record.getLatePayTime()); | |||
| @@ -226,6 +226,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||
| public ResultData updateRevenue(WxBillRent record) { | |||
| WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(record.getId()); | |||
| wxBillRent.setRevenue(record.getRevenue()); | |||
| wxBillRent.setReceivePay(record.getRevenue()); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| try { | |||
| wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | |||
| @@ -233,7 +234,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||
| logger.error("修改营业额失败,e:" + e.getMessage()); | |||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "修改营业额失败"); | |||
| } | |||
| return new ResultData(Result.SUCCESS, "修改营业额成功"); | |||
| return new ResultData(Result.SUCCESS, "修改营业额成功", wxBillRent); | |||
| } | |||
| @Override | |||
| @@ -285,7 +285,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||
| //首页商铺出租数据 | |||
| if (chart.equals(EnumChart.INDEX_SHOP_RENT.getCode())) { | |||
| return getIndexShopRentData(tenantId, startdate); | |||
| return getIndexShopRentData(tenantId); | |||
| } | |||
| //首页商铺出租数据 | |||
| @@ -2247,14 +2247,10 @@ public class WxChartServiceImpl implements WxChartDataService { | |||
| * @param tenantId | |||
| * @return | |||
| */ | |||
| private ResultData getIndexShopRentData(String tenantId, String startDateStr) { | |||
| private ResultData getIndexShopRentData(String tenantId) { | |||
| HashMap<String, Object> datamap = new HashMap<>(); | |||
| Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); | |||
| Date endDate = DateUtils.getLastDayForMonth(startDate); | |||
| WxShop query = new WxShop(); | |||
| query.setTenantId(tenantId); | |||
| query.setStartdate(startDate); | |||
| query.setEnddate(endDate); | |||
| query.setType(null); | |||
| Long total = wxShopMapper.getCountByWxShop(query); | |||
| @@ -2299,12 +2295,13 @@ public class WxChartServiceImpl implements WxChartDataService { | |||
| private ResultData getBillReceRate(String tenantId, String startDateStr) { | |||
| HashMap<String, Object> datamap = new HashMap<>(); | |||
| Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); | |||
| startDate = DateUtils.getFirstDayForCurrMonth(startDate); | |||
| Date endDate = DateUtils.getLastDayForMonth(startDate); | |||
| //租金收缴率 | |||
| Map<String, Object> params = new HashMap<>(); | |||
| params.put("tenantId", tenantId); | |||
| params.put("startdate", startDateStr + " 00:00:00"); | |||
| params.put("startdate", DateUtils.date2String(startDate,"yyyy-MM-dd") + " 00:00:00"); | |||
| params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); | |||
| Map<String, Object> payinfo = wxBillRentMapper.queryPayInfo(params); | |||
| if (payinfo != null) { | |||
| @@ -198,8 +198,8 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | |||
| //账单审批 | |||
| Integer billType = (Integer) getVariableByKey(variables, "billType"); | |||
| Integer oldPrice = (Integer) getVariableByKey(variables, "oldPrice"); | |||
| Integer newPrice = (Integer) getVariableByKey(variables, "newPrice"); | |||
| Long oldPrice = (Long) getVariableByKey(variables, "oldPrice"); | |||
| Long newPrice = (Long) getVariableByKey(variables, "newPrice"); | |||
| Date updateDate = new Date(); | |||
| MallUserInfo mallUserInfo = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); | |||
| if (billType.equals(EnumBillTypeParam.RENT.getCode())) { | |||
| @@ -308,7 +308,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| } | |||
| } | |||
| public void updateDailyBill(Long businessId, Integer newPrice, Date updateDate) { | |||
| public void updateDailyBill(Long businessId, Long newPrice, Date updateDate) { | |||
| WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(businessId); | |||
| WxBillDaily wxBillDaily = new WxBillDaily(); | |||
| wxBillDaily.setId(businessId); | |||
| @@ -321,7 +321,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); | |||
| } | |||
| public void addBillAction(Long billId, Integer oldPrice, Integer newPrice, MallUserInfo mallUserInfo) { | |||
| public void addBillAction(Long billId, Long oldPrice, Long newPrice, MallUserInfo mallUserInfo) { | |||
| WxBillAction wxBillAction = new WxBillAction(); | |||
| wxBillAction.setBillId(billId); | |||
| wxBillAction.setOldPrice(oldPrice); | |||
| @@ -194,10 +194,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| if (null == record.getDeposit()) { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "押金不能为空"); | |||
| } | |||
| if (record.getPrice().intValue() <= 0) { | |||
| if (record.getPrice().longValue() <= 0) { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "物业费要大于0"); | |||
| } | |||
| if (record.getDeposit().intValue() <= 0) { | |||
| if (record.getDeposit().longValue() <= 0) { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "押金要大于0"); | |||
| } | |||
| @@ -292,11 +292,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| //生成预览账单 | |||
| if(CollectionUtils.isEmpty(billList) || | |||
| (!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod()) | |||
| ||!wxPropertyContract.getPrice().equals(record.getPrice()) | |||
| ||!wxPropertyContract.getDeposit().equals(record.getDeposit()) | |||
| ||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod()) | |||
| || !DateUtils.date2String(wxPropertyContract.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd")) | |||
| )){ | |||
| ||!wxPropertyContract.getPrice().equals(record.getPrice()) | |||
| ||!wxPropertyContract.getDeposit().equals(record.getDeposit()) | |||
| ||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod()) | |||
| || !DateUtils.date2String(wxPropertyContract.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd")) | |||
| )){ | |||
| wxBillPropertyMapper.deletePreviewBill(record); | |||
| //重新生成 | |||
| wxPropertyContract.setPrice(record.getPrice()); | |||
| @@ -342,20 +342,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| //wxBillProperty.setMerchantId(record.getMerchantId()); | |||
| //List<Map<String, Object>> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); | |||
| //if (billPropertyList.size() == 0) { | |||
| //预览账单改为正式,并写入商户id | |||
| WxBillProperty billProperty = new WxBillProperty(); | |||
| billProperty.setPropertyContractId(id); | |||
| billProperty.setIsPreview(EnumIsPreview.NO.getCode()); | |||
| billProperty.setMerchantId(record.getMerchantId()); | |||
| wxBillPropertyMapper.updatePreviewStatus(billProperty); | |||
| WxMerchant wxMerchant = new WxMerchant(); | |||
| wxMerchant.setId(record.getMerchantId()); | |||
| wxMerchant.setTenantId(record.getTenantId()); | |||
| //物业账单 | |||
| //buildProperty(wxMerchant,null); | |||
| //物业押金账单 | |||
| buildDeposit(wxMerchant,id); | |||
| //预览账单改为正式,并写入商户id | |||
| WxBillProperty billProperty = new WxBillProperty(); | |||
| billProperty.setPropertyContractId(id); | |||
| billProperty.setIsPreview(EnumIsPreview.NO.getCode()); | |||
| billProperty.setMerchantId(record.getMerchantId()); | |||
| wxBillPropertyMapper.updatePreviewStatus(billProperty); | |||
| WxMerchant wxMerchant = new WxMerchant(); | |||
| wxMerchant.setId(record.getMerchantId()); | |||
| wxMerchant.setTenantId(record.getTenantId()); | |||
| //物业账单 | |||
| //buildProperty(wxMerchant,null); | |||
| //物业押金账单 | |||
| buildDeposit(wxMerchant,id); | |||
| //} | |||
| } | |||
| return new ResultData(Result.SUCCESS, "操作成功"); | |||
| @@ -371,8 +371,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| WxBillPropertyDeposit wxBillDeposit = new WxBillPropertyDeposit(); | |||
| wxBillDeposit.setId(idWorker.nextId()); | |||
| wxBillDeposit.setPropertyContractId(wxPropertyContract.getId()); | |||
| wxBillDeposit.setPay(0); | |||
| int needpay = wxPropertyContract.getDeposit(); | |||
| wxBillDeposit.setPay(0L); | |||
| Long needpay = wxPropertyContract.getDeposit(); | |||
| wxBillDeposit.setNeedPay(needpay); | |||
| wxBillDeposit.setReceivePay(needpay); | |||
| wxBillDeposit.setOwe(needpay); | |||
| @@ -421,7 +421,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| } | |||
| } | |||
| public List<WxBillProperty> buildRentMonth(WxMerchant wxMerchant, Long userId, WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate, Integer price,Integer isPreview) { | |||
| public List<WxBillProperty> buildRentMonth(WxMerchant wxMerchant, Long userId, WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate, Long price, Integer isPreview) { | |||
| String adjustRatio = wxPropertyContract.getAdjustRatio(); | |||
| String rentInfo = wxPropertyContract.getRentInfo(); | |||
| Map<String, Object> shopInfo = new HashMap<>(); | |||
| @@ -435,12 +435,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| List<Integer> integers = JSONArray.parseArray(adjustRatio, Integer.class); | |||
| integers.add(0, 0); | |||
| int size = integers.size(); | |||
| int[] priceArr = new int[size]; | |||
| long[] priceArr = new long[size]; | |||
| priceArr[0] = price; | |||
| double priceD = price; | |||
| for (int i = 1; i < size; i++) { | |||
| priceD = priceD + priceD * integers.get(i) / 10000.0; | |||
| priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).intValue(); | |||
| priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue(); | |||
| } | |||
| int month = 12; | |||
| int divide = lease / month; | |||
| @@ -488,7 +488,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| return false; | |||
| } | |||
| public Map<String, Object> buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxPropertyContract wxPropertyContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map<String, Object> shopInfo,boolean isLastYesr) { | |||
| public Map<String, Object> buildRent(int lease, int receivePeriod, long price, Date startdate, int dayType, WxPropertyContract wxPropertyContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map<String, Object> shopInfo, boolean isLastYesr) { | |||
| Map<String,Object> resultMap = new HashedMap(); | |||
| List<WxBillProperty> resultList = new ArrayList<>(); | |||
| int extralease = lease % receivePeriod; | |||
| @@ -510,8 +510,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| wxBillProperty.setId(idWorker.nextId()); | |||
| wxBillProperty.setPropertyContractId(wxPropertyContract.getId()); | |||
| wxBillProperty.setPay(0); | |||
| int needpay = price * receivePeriod; | |||
| wxBillProperty.setPay(0L); | |||
| long needpay = new BigDecimal(price).multiply(new BigDecimal(receivePeriod)).longValue(); | |||
| Date date = new Date(); | |||
| Calendar instance = Calendar.getInstance(); | |||
| @@ -551,7 +551,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| instance.add(dayType, extralease); | |||
| instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| wxBillProperty.setEndtime(instance.getTime()); | |||
| needpay = price * extralease; | |||
| needpay = new BigDecimal(price).multiply(new BigDecimal(extralease)).longValue(); | |||
| } | |||
| //自然月,开始日期、缴款日,结束日期 | |||
| @@ -587,7 +587,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| if(receivePeriod > 1) { | |||
| needPayDouble += price * extralease; | |||
| } | |||
| needPayDouble += oneDayProce * endDateInt; | |||
| if(!isFirstDay(wxPropertyContract.getRentalStartDate())) { //残月才加 | |||
| needPayDouble += oneDayProce * endDateInt; | |||
| } | |||
| }else{ | |||
| //[A/31 *(31-12+1)]+A+A | |||
| needPayDouble = oneDayProce * (DateUtils.getMonthDayCount(wxBillProperty.getStarttime())-startDateInt+1); | |||
| @@ -595,7 +597,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| } | |||
| } | |||
| DecimalFormat format = new DecimalFormat("0"); | |||
| needpay = Integer.parseInt(format.format(needPayDouble)); //分做四舍五入 | |||
| needpay = Long.parseLong(format.format(needPayDouble)); //分做四舍五入 | |||
| }else if(i < paycount - 1){//中间周期 | |||
| Date receiveDate = DateUtils.getFirstDayOfNextMonth(startdate,receivePeriod * i); | |||
| wxBillProperty.setReceiveDate(receiveDate); | |||
| @@ -615,35 +617,61 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| Date firstDay = DateUtils.getFirstDayForCurrMonth(wxBillProperty.getStarttime()); | |||
| instance.clear(); | |||
| instance.setTime(firstDay); | |||
| //最后一期有余,加上残月,(不整除时,最后一个月有余,否则为0) | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr) { | |||
| instance.add(dayType, extralease); | |||
| }else{ | |||
| if(isFirstDay(wxPropertyContract.getRentalStartDate())){ | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr && extralease > 0) { | |||
| instance.add(dayType, extralease); | |||
| }else{ | |||
| instance.add(dayType, receivePeriod); | |||
| } | |||
| }else { | |||
| instance.add(dayType, receivePeriod); | |||
| } | |||
| }else{ | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr) { | |||
| instance.add(dayType, extralease); | |||
| }else{ | |||
| instance.add(dayType, receivePeriod); | |||
| } | |||
| } | |||
| if(isLastYesr) { | |||
| instance.add(Calendar.DAY_OF_MONTH, rentStartDateInt - 1); | |||
| } | |||
| } | |||
| if(isLastYesr) { | |||
| instance.add(Calendar.DAY_OF_MONTH, rentStartDateInt - 1); | |||
| } | |||
| instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| wxBillProperty.setEndtime(instance.getTime()); | |||
| //逻辑同计算endtime | |||
| double needPayDouble = 0; | |||
| double oneDayProce = (double) price/DateUtils.getMonthDayCount(wxBillProperty.getEndtime()); | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr) { | |||
| needPayDouble += price * extralease; | |||
| }else{ | |||
| if(isFirstDay(wxPropertyContract.getRentalStartDate())){ | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr && extralease > 0) { | |||
| needPayDouble += price * extralease; | |||
| }else{ | |||
| needPayDouble += price * receivePeriod; | |||
| } | |||
| }else { | |||
| needPayDouble += price * receivePeriod; | |||
| } | |||
| } | |||
| if(isLastYesr) { | |||
| needPayDouble += oneDayProce * endDateInt; | |||
| }else{ | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr) { | |||
| needPayDouble += price * extralease; | |||
| }else{ | |||
| needPayDouble += price * receivePeriod; | |||
| } | |||
| } | |||
| if(isLastYesr) { | |||
| needPayDouble += oneDayProce * endDateInt; | |||
| } | |||
| } | |||
| DecimalFormat format = new DecimalFormat("0"); | |||
| needpay = Integer.parseInt(format.format(needPayDouble)); //分做四舍五入 | |||
| needpay = Long.parseLong(format.format(needPayDouble)); //分做四舍五入 | |||
| } | |||
| } | |||
| @@ -723,7 +751,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); | |||
| Integer lease = wxPropertyContract.getLease(); | |||
| Date rentalStartDate = propertyContract.getRentalStartDate(); | |||
| Integer price = propertyContract.getPrice(); | |||
| Long price = propertyContract.getPrice(); | |||
| //按月计租 | |||
| if (propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) | |||
| @@ -990,3 +1018,4 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| } | |||
| } | |||
| @@ -126,6 +126,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| wxRentContract.setPrice(wxRentContract.getPrice() != null ? wxRentContract.getPrice() : 0); | |||
| wxRentContract.setDeposit(wxRentContract.getDeposit() != null ? wxRentContract.getDeposit() : 0); | |||
| //handle adjustPeriod 1日 2月 monthHandleType 2按账单周期 3按自然月 | |||
| if(wxRentContract.getAdjustPeriod().intValue() == 1){ | |||
| wxRentContract.setAdjustPeriod(1); | |||
| wxRentContract.setMonthHandleType(null); | |||
| }else if(wxRentContract.getAdjustPeriod().intValue() == 2){ | |||
| wxRentContract.setAdjustPeriod(2); | |||
| wxRentContract.setMonthHandleType(2); | |||
| }else if(wxRentContract.getAdjustPeriod().intValue() == 3){ | |||
| wxRentContract.setAdjustPeriod(null); | |||
| wxRentContract.setMonthHandleType(3); | |||
| } | |||
| result.put("wxRentContract", wxRentContract); | |||
| //关联的商户 | |||
| if (wxRentContract.getMerchantId() != null) { | |||
| @@ -209,18 +220,18 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| BigDecimal revenue = new BigDecimal(record.getRevenue() == null ? 0 : record.getRevenue()).divide(hundred); | |||
| BigDecimal payRatio = new BigDecimal(record.getPayRatio() == null ? 0 : record.getPayRatio()).divide(new BigDecimal(10000)); | |||
| BigDecimal price = revenue.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); | |||
| record.setPrice(price.multiply(hundred).intValue()); | |||
| record.setPrice(price.multiply(hundred).longValue()); | |||
| } else { | |||
| if (StringUtils.isNotEmpty(record.getPriceStr())) { | |||
| record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).intValue()); | |||
| record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).longValue()); | |||
| } else { | |||
| record.setPrice(0); | |||
| record.setPrice(0L); | |||
| } | |||
| } | |||
| if (StringUtils.isNotEmpty(record.getDepositStr())) { | |||
| record.setDeposit(new BigDecimal(record.getDepositStr()).multiply(new BigDecimal(100)).intValue()); | |||
| record.setDeposit(new BigDecimal(record.getDepositStr()).multiply(new BigDecimal(100)).longValue()); | |||
| } else { | |||
| record.setDeposit(0); | |||
| record.setDeposit(0L); | |||
| } | |||
| Date date = new Date(); | |||
| @@ -436,19 +447,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| BigDecimal revenue = new BigDecimal(record.getRevenue() == null ? 0 : record.getRevenue()).divide(hundred); | |||
| BigDecimal payRatio = new BigDecimal(record.getPayRatio() == null ? 0 : record.getPayRatio()).divide(new BigDecimal(10000)); | |||
| BigDecimal price = revenue.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); | |||
| record.setPrice(price.multiply(hundred).intValue()); | |||
| record.setPrice(price.multiply(hundred).longValue()); | |||
| } else { | |||
| if (StringUtils.isNotEmpty(record.getPriceStr())) { | |||
| record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).intValue()); | |||
| record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).longValue()); | |||
| } else { | |||
| record.setPrice(0); | |||
| record.setPrice(0L); | |||
| } | |||
| } | |||
| if (StringUtils.isNotEmpty(record.getDepositStr())) { | |||
| record.setDeposit(new BigDecimal(record.getDepositStr()).multiply(new BigDecimal(100)).intValue()); | |||
| record.setDeposit(new BigDecimal(record.getDepositStr()).multiply(new BigDecimal(100)).longValue()); | |||
| } else { | |||
| record.setDeposit(0); | |||
| record.setDeposit(0L); | |||
| } | |||
| record.setUpdatetime(new Date()); | |||
| @@ -524,8 +535,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| WxBillDeposit wxBillDeposit = new WxBillDeposit(); | |||
| wxBillDeposit.setId(idWorker.nextId()); | |||
| wxBillDeposit.setRentContractId(wxRentContract.getId()); | |||
| wxBillDeposit.setPay(0); | |||
| int needpay = wxRentContract.getDeposit(); | |||
| wxBillDeposit.setPay(0L); | |||
| long needpay = wxRentContract.getDeposit(); | |||
| wxBillDeposit.setReceivePay(needpay); | |||
| wxBillDeposit.setNeedPay(needpay); | |||
| wxBillDeposit.setOwe(needpay); | |||
| @@ -672,7 +683,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| int receivePeriod = wxRentContract.getReceivePeriod().intValue(); | |||
| Integer lease = wxRentContract.getLease(); | |||
| Date rentalStartDate = wxRentContract.getRentalStartDate(); | |||
| Integer price = wxRentContract.getPrice(); | |||
| Long price = wxRentContract.getPrice(); | |||
| //按月计租 | |||
| if (wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) | |||
| ||wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) { | |||
| @@ -690,16 +701,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| //计算租金,每年-每个店铺租金 | |||
| public List<int[]> computePrice(String rentInfo) { | |||
| public List<long[]> computePrice(String rentInfo) { | |||
| JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); | |||
| int arraySize = rentInfoArray.size(); | |||
| List<int[]> priceList = new ArrayList<>(); | |||
| List<long[]> priceList = new ArrayList<>(); | |||
| //第一年 | |||
| int[] priceArr = new int[arraySize]; | |||
| long[] priceArr = new long[arraySize]; | |||
| for (int i = 0; i < arraySize; i++) { | |||
| JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); | |||
| priceArr[i] = new BigDecimal(rentInfoObject.getString("price")).multiply(new BigDecimal(100)).intValue(); | |||
| priceArr[i] = new BigDecimal(rentInfoObject.getString("price")).multiply(new BigDecimal(100)).longValue(); | |||
| } | |||
| priceList.add(priceArr); | |||
| //大于一年 | |||
| @@ -708,34 +719,34 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| int adjustRatioSize = adjustRatio.size(); | |||
| for (int i = 0; i < adjustRatioSize; i++) { | |||
| int[] priceArrs = new int[arraySize]; | |||
| long[] priceArrs = new long[arraySize]; | |||
| for (int j = 0; j < arraySize; j++) { | |||
| rentInfoObject = rentInfoArray.getJSONObject(j); | |||
| adjustRatio = rentInfoObject.getJSONArray("adjustRatio"); | |||
| BigDecimal multiply = new BigDecimal(priceList.get(i)[j]).multiply(new BigDecimal(adjustRatio.getString(i)).divide(new BigDecimal(100))); | |||
| BigDecimal price = new BigDecimal(priceList.get(i)[j]).add(multiply); | |||
| priceArrs[j] = price.setScale(0, RoundingMode.HALF_EVEN).intValue(); | |||
| priceArrs[j] = price.setScale(0, RoundingMode.HALF_EVEN).longValue(); | |||
| } | |||
| priceList.add(priceArrs); | |||
| } | |||
| return priceList; | |||
| } | |||
| public List<WxBillRent> buildRentMonth(WxMerchant wxMerchant, Long userId, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, Integer price,Integer isPreview) { | |||
| public List<WxBillRent> buildRentMonth(WxMerchant wxMerchant, Long userId, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, Long price, Integer isPreview) { | |||
| int size = 0; | |||
| int[] priceArrs = null; | |||
| long[] priceArrs = null; | |||
| List<Map<String, Object>> shopInfos = new ArrayList<>(); | |||
| if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) && | |||
| !wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { | |||
| String rentInfo = wxRentContract.getRentInfo(); | |||
| JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); | |||
| List<int[]> priceList = computePrice(rentInfo); | |||
| List<long[]> priceList = computePrice(rentInfo); | |||
| size = priceList.size(); | |||
| priceArrs = new int[size]; | |||
| priceArrs = new long[size]; | |||
| for (int i = 0; i < size; i++) { | |||
| int[] priceInt = priceList.get(i); | |||
| int sum = 0; | |||
| for (int p : priceInt) { | |||
| long[] priceInt = priceList.get(i); | |||
| long sum = 0; | |||
| for (long p : priceInt) { | |||
| sum += p; | |||
| } | |||
| priceArrs[i] = sum; | |||
| @@ -743,7 +754,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| for (int i = 0; i < size; i++) { | |||
| Map<String, Object> shopInfo = new HashMap<>(); | |||
| int[] ints = priceList.get(i); | |||
| long[] ints = priceList.get(i); | |||
| for (int j = 0; j < ints.length; j++) { | |||
| JSONObject rentInfoObject = rentInfoArray.getJSONObject(j); | |||
| String s = new BigDecimal(ints[j]).divide(new BigDecimal(100)).toPlainString(); | |||
| @@ -756,7 +767,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| List<Integer> integers = JSONArray.parseArray(adjustRatio, Integer.class); | |||
| integers.add(0, 0); | |||
| size = integers.size(); | |||
| priceArrs = new int[size]; | |||
| priceArrs = new long[size]; | |||
| priceArrs[0] = price; | |||
| double priceD = price; | |||
| for (int i = 1; i < size; i++) { | |||
| @@ -811,9 +822,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| return false; | |||
| } | |||
| public Map<String, Object> buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map<String, Object> shopInfo,boolean isLastYesr) { | |||
| public Map<String, Object> buildRent(int lease, int receivePeriod, long price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map<String, Object> shopInfo, boolean isLastYesr) { | |||
| System.out.println("------lease:"+lease+"receivePeriod:"+receivePeriod+"price:"+price+"start:"+DateUtils.date2String(startdate,"yyyy-MM-dd") | |||
| +"dayType:"+dayType+"billcount:"+billcount); | |||
| +"dayType:"+dayType+"billcount:"+billcount); | |||
| String shopInfoStr = null; | |||
| if (shopInfo != null) { | |||
| @@ -840,12 +851,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| int paycount = lease / receivePeriod + extracount; | |||
| int index = paycount - 1; | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| //自然月,而且残月,周期整除,n+1,最后一个周期作为残月 | |||
| //自然月计租,而且残月,周期整除,n+1,最后一个周期作为残月 | |||
| if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode()) | |||
| && !isFirstDay(wxRentContract.getRentalStartDate()) | |||
| && !isFirstDay(wxRentContract.getRentalStartDate()) | |||
| && (wxRentContract.getLease() % wxRentContract.getReceivePeriod() == 0) | |||
| && isLastYesr | |||
| ){ | |||
| ){ | |||
| paycount ++; | |||
| } | |||
| for(int i = 0; i < paycount; i++){ | |||
| @@ -854,9 +865,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| wxBillRent.setId(idWorker.nextId()); | |||
| wxBillRent.setRentContractId(wxRentContract.getId()); | |||
| wxBillRent.setPay(0); | |||
| wxBillRent.setPay(0L); | |||
| //System.out.println("-----------price:"+price+",receivePeriod:"+receivePeriod); | |||
| int needpay = price * receivePeriod; | |||
| long needpay = new BigDecimal(price).multiply(new BigDecimal(receivePeriod)).longValue(); | |||
| //System.out.println("--------needpay:"+needpay); | |||
| Calendar instance = Calendar.getInstance(); | |||
| @@ -897,7 +908,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| instance.add(dayType, extralease); | |||
| instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| wxBillRent.setEndtime(instance.getTime()); | |||
| needpay = price * extralease; | |||
| needpay = new BigDecimal(price).multiply(new BigDecimal(extralease)).longValue(); | |||
| } | |||
| //自然月,开始日期、缴款日,结束日期 | |||
| @@ -933,7 +944,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| if(receivePeriod > 1) { | |||
| needPayDouble += price * extralease; | |||
| } | |||
| needPayDouble += oneDayProce * endDateInt; | |||
| if(!isFirstDay(wxRentContract.getRentalStartDate())) { //残月才加 | |||
| needPayDouble += oneDayProce * endDateInt; | |||
| } | |||
| }else{ | |||
| //[A/31 *(31-12+1)]+A+A | |||
| needPayDouble = oneDayProce * (DateUtils.getMonthDayCount(wxBillRent.getStarttime())-startDateInt+1); | |||
| @@ -941,7 +954,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| } | |||
| DecimalFormat format = new DecimalFormat("0"); | |||
| needpay = Integer.parseInt(format.format(needPayDouble)); //分做四舍五入 | |||
| needpay = Long.parseLong(format.format(needPayDouble)); //分做四舍五入 | |||
| }else if(i < paycount - 1){//中间周期 | |||
| Date receiveDate = DateUtils.getFirstDayOfNextMonth(startdate,receivePeriod * i); | |||
| wxBillRent.setReceiveDate(receiveDate); | |||
| @@ -961,35 +974,61 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| Date firstDay = DateUtils.getFirstDayForCurrMonth(wxBillRent.getStarttime()); | |||
| instance.clear(); | |||
| instance.setTime(firstDay); | |||
| //最后一期有余,加上残月,(不整除时,最后一个月有余,否则为0) | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr) { | |||
| instance.add(dayType, extralease); | |||
| }else{ | |||
| if(isFirstDay(wxRentContract.getRentalStartDate())){ | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr && extralease > 0) { | |||
| instance.add(dayType, extralease); | |||
| }else{ | |||
| instance.add(dayType, receivePeriod); | |||
| } | |||
| }else { | |||
| instance.add(dayType, receivePeriod); | |||
| } | |||
| }else{ | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr) { | |||
| instance.add(dayType, extralease); | |||
| }else{ | |||
| instance.add(dayType, receivePeriod); | |||
| } | |||
| } | |||
| if(isLastYesr) { | |||
| instance.add(Calendar.DAY_OF_MONTH, rentStartDateInt - 1); | |||
| } | |||
| } | |||
| if(isLastYesr) { | |||
| instance.add(Calendar.DAY_OF_MONTH, rentStartDateInt - 1); | |||
| } | |||
| instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| wxBillRent.setEndtime(instance.getTime()); | |||
| //逻辑同计算endtime | |||
| double needPayDouble = 0; | |||
| double oneDayProce = (double) price/DateUtils.getMonthDayCount(wxBillRent.getEndtime()); | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr) { | |||
| needPayDouble += price * extralease; | |||
| }else{ | |||
| if(isFirstDay(wxRentContract.getRentalStartDate())){ | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr && extralease > 0) { | |||
| needPayDouble += price * extralease; | |||
| }else{ | |||
| needPayDouble += price * receivePeriod; | |||
| } | |||
| }else { | |||
| needPayDouble += price * receivePeriod; | |||
| } | |||
| } | |||
| if(isLastYesr) { | |||
| needPayDouble += oneDayProce * endDateInt; | |||
| }else{ | |||
| if(receivePeriod > 1) { | |||
| if(isLastYesr) { | |||
| needPayDouble += price * extralease; | |||
| }else{ | |||
| needPayDouble += price * receivePeriod; | |||
| } | |||
| } | |||
| if(isLastYesr) { | |||
| needPayDouble += oneDayProce * endDateInt; | |||
| } | |||
| } | |||
| DecimalFormat format = new DecimalFormat("0"); | |||
| needpay = Integer.parseInt(format.format(needPayDouble)); //分做四舍五入 | |||
| needpay = Long.parseLong(format.format(needPayDouble)); //分做四舍五入 | |||
| } | |||
| } | |||
| @@ -1406,13 +1445,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| // List<Map<String, Object>> billRentList = wxBillRentMapper.queryBillRentList(wxBillRent); | |||
| // if (billRentList.size() == 0) { | |||
| WxMerchant wxMerchant = new WxMerchant(); | |||
| wxMerchant.setId(record.getMerchantId()); | |||
| wxMerchant.setTenantId(record.getTenantId()); | |||
| //租金 | |||
| WxMerchant wxMerchant = new WxMerchant(); | |||
| wxMerchant.setId(record.getMerchantId()); | |||
| wxMerchant.setTenantId(record.getTenantId()); | |||
| //租金 | |||
| // buildRent(wxMerchant, null,null); | |||
| //押金 | |||
| buildDeposit(wxMerchant, null,id); | |||
| //押金 | |||
| buildDeposit(wxMerchant, null,id); | |||
| // } | |||
| } | |||
| //作废合同 | |||
| @@ -1745,7 +1784,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| public void areaWay(WxRentContract wxRentContract, Map<String, Object> result, Integer lease, int extralease, int extracount, int paycount, int index, int count, BigDecimal rentPrice) { | |||
| int[] priceArrs = new int[]{}; | |||
| long[] priceArrs = new long[]{}; | |||
| List<String> adjustRatioList = new ArrayList<>(); | |||
| adjustRatioList.add(0, "0"); | |||
| if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { | |||
| @@ -1763,13 +1802,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| adjustRatioList.add(adjustRatioStr.toString()); | |||
| } | |||
| List<int[]> priceList = computePrice(rentInfo); | |||
| List<long[]> priceList = computePrice(rentInfo); | |||
| int size = priceList.size(); | |||
| priceArrs = new int[size]; | |||
| priceArrs = new long[size]; | |||
| for (int i = 0; i < size; i++) { | |||
| int[] priceInt = priceList.get(i); | |||
| int sum = 0; | |||
| for (int p : priceInt) { | |||
| long[] priceInt = priceList.get(i); | |||
| long sum = 0; | |||
| for (long p : priceInt) { | |||
| sum += p; | |||
| } | |||
| priceArrs[i] = sum; | |||
| @@ -1982,3 +2021,4 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| } | |||
| } | |||
| @@ -55,6 +55,14 @@ public class WxShopServiceImpl implements WxShopService { | |||
| return pageInfo; | |||
| } | |||
| @Override | |||
| public PageInfo<Map<String, Object>> notRentListMapAsPage(WxShop record, Integer pageIndex, Integer pageSize) { | |||
| PageHelper.startPage(pageIndex, pageSize); | |||
| List<Map<String,Object>> shops = wxShopMapper.notRentListMapAsPage(record); | |||
| PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(shops); | |||
| return pageInfo; | |||
| } | |||
| @Override | |||
| public WxShop getById(Long id) { | |||
| return wxShopMapper.selectByPrimaryKey(id); | |||
| @@ -75,11 +75,19 @@ public class WxTopicServiceImpl implements WxTopicService { | |||
| query.setBeginTime(record.getBeginTime()); | |||
| query.setEndTime(record.getEndTime()); | |||
| } | |||
| List<WxTopic> topicList = wxTopicMapper.findExist(query); | |||
| if (CollectionUtils.isNotEmpty(topicList)) { | |||
| return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "["+topicList.get(0).getName()+"]正在活动中,截止至"+ DateUtils.date2String(topicList.get(0).getEndTime(),"yyyy-MM-dd")); | |||
| WxTopic dbquery = new WxTopic(); | |||
| dbquery.setTenantId(record.getTenantId()); | |||
| dbquery.setStatus(EnumWxTopicStatus.VAILD.getCode()); | |||
| List<WxTopic> onLineTopicList = wxTopicMapper.findList(dbquery); | |||
| for (WxTopic topic:onLineTopicList) { | |||
| if(DateUtils.belongCalendar(query.getBeginTime(),topic.getBeginTime(),topic.getEndTime()) | |||
| || DateUtils.belongCalendar(query.getEndTime(),topic.getBeginTime(),topic.getEndTime()) | |||
| || (query.getBeginTime().before(topic.getBeginTime())&&query.getEndTime().after(topic.getEndTime())) ){ | |||
| return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "[" + topic.getName() + "]正在活动中,"+DateUtils.date2String(topic.getBeginTime(), "yyyy-MM-dd")+"至" + DateUtils.date2String(topic.getEndTime(), "yyyy-MM-dd")); | |||
| } | |||
| } | |||
| } | |||
| if (record.getId() == null) { | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| @@ -1060,4 +1060,27 @@ public class DateUtils { | |||
| return getFirstDayForCurrMonth(d); | |||
| } | |||
| /** | |||
| * 判断时间是否在时间段内 | |||
| * @param nowTime | |||
| * @param beginTime | |||
| * @param endTime | |||
| * @return | |||
| */ | |||
| public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) { | |||
| Calendar date = Calendar.getInstance(); | |||
| date.setTime(nowTime); | |||
| Calendar begin = Calendar.getInstance(); | |||
| begin.setTime(beginTime); | |||
| Calendar end = Calendar.getInstance(); | |||
| end.setTime(endTime); | |||
| if (date.after(begin) && date.before(end)) { | |||
| return true; | |||
| } else if (nowTime.compareTo(beginTime) == 0 || nowTime.compareTo(endTime) == 0) { | |||
| return true; | |||
| } else { | |||
| return false; | |||
| } | |||
| } | |||
| } | |||
| @@ -11,18 +11,18 @@ | |||
| <result column="billTypeValue" jdbcType="INTEGER" property="billTypeValue"/> | |||
| <result column="billType" jdbcType="VARCHAR" property="billType"/> | |||
| <result column="needPay" jdbcType="INTEGER" property="needPay" /> | |||
| <result column="needPay" jdbcType="BIGINT" property="needPay"/> | |||
| <result column="merchantName" jdbcType="VARCHAR" property="merchantName" /> | |||
| <result column="rentShopType" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="receiveDate" jdbcType="TIMESTAMP" property="receiveDate" /> | |||
| <result column="expiredDay" jdbcType="INTEGER" property="expiredDay" /> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="receivePay" jdbcType="INTEGER" property="receivePay" /> | |||
| <result column="owe" jdbcType="INTEGER" property="owe" /> | |||
| <result column="pay" jdbcType="INTEGER" property="pay" /> | |||
| <result column="receivePay" jdbcType="BIGINT" property="receivePay"/> | |||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | |||
| <result column="pay" jdbcType="BIGINT" property="pay"/> | |||
| <result column="payDate" jdbcType="TIMESTAMP" property="payDate" /> | |||
| <result column="starttime" jdbcType="TIMESTAMP" property="starttime" /> | |||
| <result column="endtime" jdbcType="TIMESTAMP" property="endtime" /> | |||
| @@ -3,14 +3,14 @@ | |||
| <mapper namespace="com.iformall.mapper.WxBillDailyMapper"> | |||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxBillDaily"> | |||
| <id column="id" jdbcType="BIGINT" property="id" /> | |||
| <result column="receive_pay" jdbcType="INTEGER" property="receivePay" /> | |||
| <result column="pay" jdbcType="INTEGER" property="pay" /> | |||
| <result column="receive_pay" jdbcType="BIGINT" property="receivePay"/> | |||
| <result column="pay" jdbcType="BIGINT" property="pay"/> | |||
| <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="expired_day" jdbcType="INTEGER" property="expiredDay" /> | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||
| <result column="owe" jdbcType="INTEGER" property="owe" /> | |||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="is_del" jdbcType="INTEGER" property="isDel" /> | |||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | |||
| @@ -4,23 +4,23 @@ | |||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxBillDeposit"> | |||
| <id column="id" jdbcType="BIGINT" property="id" /> | |||
| <result column="rent_contract_id" jdbcType="BIGINT" property="rentContractId" /> | |||
| <result column="receive_pay" jdbcType="INTEGER" property="receivePay" /> | |||
| <result column="pay" jdbcType="INTEGER" property="pay" /> | |||
| <result column="receive_pay" jdbcType="BIGINT" property="receivePay"/> | |||
| <result column="pay" jdbcType="BIGINT" property="pay"/> | |||
| <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="expired_day" jdbcType="BIGINT" property="expiredDay" /> | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||
| <result column="owe" jdbcType="INTEGER" property="owe" /> | |||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="is_del" jdbcType="INTEGER" property="isDel" /> | |||
| <result column="need_pay" jdbcType="INTEGER" property="needPay" /> | |||
| <result column="need_pay" jdbcType="BIGINT" property="needPay"/> | |||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | |||
| <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="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="return_price" jdbcType="INTEGER" property="returnPrice"/> | |||
| <result column="return_price" jdbcType="BIGINT" property="returnPrice"/> | |||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | |||
| </resultMap> | |||
| @@ -3,14 +3,14 @@ | |||
| <mapper namespace="com.iformall.mapper.WxBillOtherDepositMapper"> | |||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxBillOtherDeposit"> | |||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||
| <result column="receive_pay" jdbcType="INTEGER" property="receivePay"/> | |||
| <result column="pay" jdbcType="INTEGER" property="pay"/> | |||
| <result column="receive_pay" jdbcType="BIGINT" property="receivePay"/> | |||
| <result column="pay" jdbcType="BIGINT" property="pay"/> | |||
| <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="expired_day" jdbcType="INTEGER" property="expiredDay"/> | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | |||
| <result column="owe" jdbcType="INTEGER" property="owe"/> | |||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | |||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||
| <result column="is_del" jdbcType="INTEGER" property="isDel"/> | |||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | |||
| @@ -20,7 +20,7 @@ | |||
| <result column="name" jdbcType="VARCHAR" property="name"/> | |||
| <result column="comments" jdbcType="VARCHAR" property="comments"/> | |||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="return_price" jdbcType="INTEGER" property="returnPrice"/> | |||
| <result column="return_price" jdbcType="BIGINT" property="returnPrice"/> | |||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | |||
| </resultMap> | |||
| @@ -3,14 +3,14 @@ | |||
| <mapper namespace="com.iformall.mapper.WxBillOtherMapper"> | |||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxBillOther"> | |||
| <id column="id" jdbcType="BIGINT" property="id" /> | |||
| <result column="receive_pay" jdbcType="INTEGER" property="receivePay" /> | |||
| <result column="pay" jdbcType="INTEGER" property="pay" /> | |||
| <result column="receive_pay" jdbcType="BIGINT" property="receivePay"/> | |||
| <result column="pay" jdbcType="BIGINT" property="pay"/> | |||
| <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="expired_day" jdbcType="INTEGER" property="expiredDay" /> | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||
| <result column="owe" jdbcType="INTEGER" property="owe" /> | |||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="is_del" jdbcType="INTEGER" property="isDel" /> | |||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | |||
| @@ -2,16 +2,16 @@ | |||
| <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |||
| <mapper namespace="com.iformall.mapper.WxBillPropertyDepositMapper"> | |||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxBillPropertyDeposit"> | |||
| <id column="id" jdbcType="INTEGER" property="id" /> | |||
| <result column="property_contract_id" jdbcType="INTEGER" property="propertyContractId" /> | |||
| <result column="receive_pay" jdbcType="INTEGER" property="receivePay" /> | |||
| <result column="pay" jdbcType="INTEGER" property="pay" /> | |||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||
| <result column="property_contract_id" jdbcType="BIGINT" property="propertyContractId"/> | |||
| <result column="receive_pay" jdbcType="BIGINT" property="receivePay"/> | |||
| <result column="pay" jdbcType="BIGINT" property="pay"/> | |||
| <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="expired_day" jdbcType="INTEGER" property="expiredDay" /> | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||
| <result column="owe" jdbcType="INTEGER" property="owe" /> | |||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="is_del" jdbcType="INTEGER" property="isDel" /> | |||
| <result column="need_pay" jdbcType="INTEGER" property="needPay" /> | |||
| @@ -20,7 +20,7 @@ | |||
| <result column="shop_id" jdbcType="INTEGER" property="shopId" /> | |||
| <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | |||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="return_price" jdbcType="INTEGER" property="returnPrice"/> | |||
| <result column="return_price" jdbcType="BIGINT" property="returnPrice"/> | |||
| <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> | |||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | |||
| @@ -4,26 +4,26 @@ | |||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxBillProperty"> | |||
| <id column="id" jdbcType="INTEGER" property="id" /> | |||
| <result column="property_contract_id" jdbcType="INTEGER" property="propertyContractId" /> | |||
| <result column="receive_pay" jdbcType="INTEGER" property="receivePay" /> | |||
| <result column="pay" jdbcType="INTEGER" property="pay" /> | |||
| <result column="receive_pay" jdbcType="BIGINT" property="receivePay"/> | |||
| <result column="pay" jdbcType="BIGINT" property="pay"/> | |||
| <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="expired_day" jdbcType="INTEGER" property="expiredDay" /> | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||
| <result column="owe" jdbcType="INTEGER" property="owe" /> | |||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | |||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||
| <result column="is_del" jdbcType="INTEGER" property="isDel" /> | |||
| <result column="need_pay" jdbcType="INTEGER" property="needPay" /> | |||
| <result column="need_pay" jdbcType="BIGINT" property="needPay"/> | |||
| <result column="merchant_id" jdbcType="INTEGER" property="merchantId" /> | |||
| <result column="user_id" jdbcType="INTEGER" property="userId" /> | |||
| <result column="shop_id" jdbcType="INTEGER" property="shopId" /> | |||
| <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | |||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="revenue" jdbcType="INTEGER" property="revenue"/> | |||
| <result column="revenue" jdbcType="BIGINT" property="revenue"/> | |||
| <result column="late_pay_ratio" jdbcType="INTEGER" property="latePayRatio"/> | |||
| <result column="late_pay_time" jdbcType="TIMESTAMP" property="latePayTime"/> | |||
| <result column="late_pay_price" jdbcType="INTEGER" property="latePayPrice"/> | |||
| <result column="late_pay_price" jdbcType="BIGINT" property="latePayPrice"/> | |||
| <result column="period" jdbcType="INTEGER" property="period"/> | |||
| <result column="is_preview" property="isPreview"/> | |||
| <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> | |||
| @@ -4,8 +4,8 @@ | |||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxBillRent"> | |||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||
| <result column="rent_contract_id" jdbcType="BIGINT" property="rentContractId"/> | |||
| <result column="receive_pay" jdbcType="INTEGER" property="receivePay"/> | |||
| <result column="pay" jdbcType="INTEGER" property="pay"/> | |||
| <result column="receive_pay" jdbcType="BIGINT" property="receivePay"/> | |||
| <result column="pay" jdbcType="BIGINT" property="pay"/> | |||
| <result column="receive_date" jdbcType="TIMESTAMP" property="receiveDate"/> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate"/> | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime"/> | |||
| @@ -14,7 +14,7 @@ | |||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | |||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||
| <result column="is_del" jdbcType="INTEGER" property="isDel"/> | |||
| <result column="need_pay" jdbcType="INTEGER" property="needPay"/> | |||
| <result column="need_pay" jdbcType="BIGINT" property="needPay"/> | |||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | |||
| <result column="user_id" jdbcType="BIGINT" property="userId"/> | |||
| <result column="shop_id" jdbcType="BIGINT" property="shopId"/> | |||
| @@ -23,7 +23,7 @@ | |||
| <result column="revenue" jdbcType="INTEGER" property="revenue"/> | |||
| <result column="late_pay_ratio" jdbcType="INTEGER" property="latePayRatio"/> | |||
| <result column="late_pay_time" jdbcType="TIMESTAMP" property="latePayTime"/> | |||
| <result column="late_pay_price" jdbcType="INTEGER" property="latePayPrice"/> | |||
| <result column="late_pay_price" jdbcType="BIGINT" property="latePayPrice"/> | |||
| <result column="period" jdbcType="INTEGER" property="period"/> | |||
| <result column="is_preview" property="isPreview"/> | |||
| <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> | |||
| @@ -267,6 +267,43 @@ | |||
| </select> | |||
| <select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | |||
| select s.id,s.shop_number shopNumber,s.build_area buildArea, | |||
| s.img_url imgUrl,s.operation_area operationArea, | |||
| s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone, | |||
| s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay | |||
| from wx_shop s | |||
| left join wx_mall_building b on s.building=b.id | |||
| left join wx_mall_floor f on s.floor=f.id | |||
| where s.is_del=0 | |||
| <if test=" null != id "> | |||
| and s.`id` = #{id} | |||
| </if> | |||
| <if test=" null != tenantId "> | |||
| and s.`tenant_id`= #{tenantId} | |||
| </if> | |||
| <if test=" null != shopNumber and ''!=shopNumber"> | |||
| and s.`shop_number` like concat('%', #{shopNumber},'%') | |||
| </if> | |||
| <if test=" null != status"> | |||
| and s.`status` = #{status} | |||
| </if> | |||
| <if test=" null != type "> | |||
| and s.`type` = #{type} | |||
| </if> | |||
| <if test=" null != pointType "> | |||
| and s.`point_type` = #{pointType} | |||
| </if> | |||
| <if test="null != sortColumn"> | |||
| order by s.${sortColumn} ${sortOrder} | |||
| </if> | |||
| <if test="null == sortColumn"> | |||
| <if test=" null != sortColumns">order by s.${sortColumns}</if> | |||
| </if> | |||
| </select> | |||
| <resultMap id="VoResultMap" type="com.iformall.domain.vo.WxShopVo"> | |||