From 73c4819435d013c12521a0310200684395a46212 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 13:47:59 +0800 Subject: [PATCH 01/22] =?UTF-8?q?[=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E8=8E=B7=E5=8F=96=E8=BF=88=E5=A4=96?= =?UTF-8?q?=E8=BF=AAtoken=E4=BB=BB=E5=8A=A1=E5=81=9C=E6=AD=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/schedule/WiwideTokenSchedule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java index 94c1db2f6..902a3e723 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java @@ -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 list = wxWiwideInfoMapper.findList(null); for (int i = 0, size = list.size(); i < size; i++) { From 705c1a30a9715b6a3a0227a2e6d429774e7bff9b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 25 Apr 2019 10:46:11 +0800 Subject: [PATCH 02/22] =?UTF-8?q?[sql,xss=E5=AE=89=E5=85=A8][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E4=B8=8D=E6=A3=80=E6=9F=A5user-agent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/interceptor/XssHttpServletRequestWrapper.java | 3 +++ .../com/iformall/interceptor/XssHttpServletRequestWrapper.java | 3 +++ .../com/iformall/interceptor/XssHttpServletRequestWrapper.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java index 0ee75b20a..1d954d163 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java @@ -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; diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java b/mallinkBApi/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java index 0ee75b20a..1d954d163 100644 --- a/mallinkBApi/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java @@ -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; diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java b/mallinkCApi/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java index 0ee75b20a..1d954d163 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/XssHttpServletRequestWrapper.java @@ -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; From cea066ed6cf3b387f60993a0326a9b3c94ec4a95 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 25 Apr 2019 14:03:18 +0800 Subject: [PATCH 03/22] =?UTF-8?q?[=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD][=E4=BF=AE=E6=94=B9]:mediaType=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxAppinfoController.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java index dad82f411..47d8f7c31 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java @@ -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; @@ -93,9 +93,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 params) { + public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException { logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode"); String name = (String) params.get("name"); String pageUrl = (String) params.get("pageUrl"); @@ -116,7 +116,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 +125,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 +218,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", From 74c88058b34abc5a8f2d07855316f22d686a7f2d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 25 Apr 2019 14:03:45 +0800 Subject: [PATCH 04/22] =?UTF-8?q?[=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD][=E4=BF=AE=E6=94=B9]:mediaType=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxAppinfoController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java index 47d8f7c31..a7234e9b0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java @@ -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 From 0ef59c4f7ed1c9578f7d2728656bc8dbc82fa503 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 25 Apr 2019 15:08:00 +0800 Subject: [PATCH 05/22] =?UTF-8?q?[=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E8=B7=AF=E5=BE=84=E9=95=BF=E5=BA=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201904251504__UPDATE_MALL_COVER_LEN.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201904251504__UPDATE_MALL_COVER_LEN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904251504__UPDATE_MALL_COVER_LEN.sql b/mallinkAdmin/src/main/resources/db/migration/V201904251504__UPDATE_MALL_COVER_LEN.sql new file mode 100644 index 000000000..d00e1af3f --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904251504__UPDATE_MALL_COVER_LEN.sql @@ -0,0 +1,2 @@ +alter table wx_mall +CHANGE COLUMN `weapp_share_cover_img` `weapp_share_cover_img` VARCHAR(1024) NULL COMMENT '分享封面图片'; \ No newline at end of file From 5c5bdecec5fbf00edae6c24e77b5f1e65ad704c4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 15:15:40 +0800 Subject: [PATCH 06/22] =?UTF-8?q?[=E8=B4=A6=E6=9C=9F=E8=B0=83=E6=95=B4][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 97 ++++++++++++------- .../impl/WxRentContractServiceImpl.java | 79 ++++++++++----- .../service/impl/WxTopicServiceImpl.java | 12 ++- .../java/com/iformall/utils/DateUtils.java | 23 +++++ 4 files changed, 149 insertions(+), 62 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 63c70ef8e..57c8c0512 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -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> 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, "操作成功"); @@ -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); @@ -615,32 +617,58 @@ 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)); //分做四舍五入 @@ -990,3 +1018,4 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } + diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9a4d7f72c..5ecf29e1f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -813,7 +813,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public Map buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map 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 +840,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++){ @@ -933,7 +933,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); @@ -961,32 +963,58 @@ 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)); //分做四舍五入 @@ -1406,13 +1434,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { // List> 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); // } } //作废合同 @@ -1982,3 +2010,4 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } + diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index b99359170..ee9311aa3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -75,11 +75,17 @@ public class WxTopicServiceImpl implements WxTopicService { query.setBeginTime(record.getBeginTime()); query.setEndTime(record.getEndTime()); } - List 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 onLineTopicList = wxTopicMapper.findList(dbquery); + for (WxTopic topic:onLineTopicList) { + if (query.getBeginTime().after(topic.getBeginTime()) && query.getEndTime().before(topic.getEndTime())) { + return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "[" + topic.getName() + "]正在活动中,截止至" + DateUtils.date2String(topic.getEndTime(), "yyyy-MM-dd")); + } } } + if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index a3ce3a0a4..0a3a04a0a 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -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; + } + } + } From 308e821fd820061881dfaccddc6ccd8b13e40159 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 15:25:47 +0800 Subject: [PATCH 07/22] =?UTF-8?q?[=E8=B4=A6=E6=9C=9F=E8=B0=83=E6=95=B4][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxTopicServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index ee9311aa3..db90f5fe7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -80,8 +80,10 @@ public class WxTopicServiceImpl implements WxTopicService { dbquery.setStatus(EnumWxTopicStatus.VAILD.getCode()); List onLineTopicList = wxTopicMapper.findList(dbquery); for (WxTopic topic:onLineTopicList) { - if (query.getBeginTime().after(topic.getBeginTime()) && query.getEndTime().before(topic.getEndTime())) { - return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "[" + topic.getName() + "]正在活动中,截止至" + DateUtils.date2String(topic.getEndTime(), "yyyy-MM-dd")); + 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")); } } } From d0f60e27caafa444e59afc50e01a22d61cb3d129 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Thu, 25 Apr 2019 15:42:57 +0800 Subject: [PATCH 08/22] =?UTF-8?q?[=E6=88=90=E9=95=BF=E5=80=BC][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E6=8E=88=E6=9D=83=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=90=E9=95=BF=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxUserGrantController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 23ed57bd3..d02748a65 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -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); From 96da0aacfa2f0da88e646e85da9c2376cc582f09 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 16:31:12 +0800 Subject: [PATCH 09/22] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E4=B8=8E=E5=90=88?= =?UTF-8?q?=E5=90=8Csql][=E4=BF=AE=E6=94=B9][=E6=95=B4=E4=BD=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=EF=BC=9A=E8=90=A5?= =?UTF-8?q?=E4=B8=9A=E9=A2=9D=E3=80=81=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=AD=89]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201904251610__UPDATE_BILL.sql | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql new file mode 100644 index 000000000..c4f938d2b --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql @@ -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) +; \ No newline at end of file From 8be16922aae00aad50e6bc39d44df17127ba054e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 16:37:54 +0800 Subject: [PATCH 10/22] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E4=B8=8E=E5=90=88?= =?UTF-8?q?=E5=90=8C][=E4=BF=AE=E6=94=B9][=E5=AE=9E=E4=BD=93=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=9A=E8=90=A5=E4=B8=9A=E9=A2=9D=E3=80=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=AD=89]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxBillAction.java | 12 ++--- .../com/iformall/domain/po/WxBillDaily.java | 23 ++++++---- .../com/iformall/domain/po/WxBillDeposit.java | 32 +++++++++----- .../com/iformall/domain/po/WxBillOther.java | 23 ++++++---- .../domain/po/WxBillOtherDeposit.java | 24 +++++----- .../iformall/domain/po/WxBillProperty.java | 43 ++++++++++-------- .../domain/po/WxBillPropertyDeposit.java | 37 +++++++++------- .../com/iformall/domain/po/WxBillRent.java | 44 +++++++++++-------- .../domain/po/WxPropertyContract.java | 16 ++++--- .../com/iformall/domain/vo/WxBillAllVo.java | 24 +++++----- 10 files changed, 161 insertions(+), 117 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java index c856cd0e2..2356be863 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java @@ -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; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index a29898c5f..0dba5f0a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -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() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index 49f1937b2..84fbf2a6f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -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() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 24a602843..eff3d3140 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -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() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index a1ede6d37..97437e4fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -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; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 33bcf9ac2..d342b6fa5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -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; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index c9b4dd6ff..f61c08ac0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -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; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index d907de37c..5a2ad5ed9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -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; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index be6a0fa62..d86c04bb1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -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() { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java index 098bb07fd..a5a257c6f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java @@ -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; } From 60bf8b53c35e4c3a6f959d1ed8501ad4517be182 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 16:38:48 +0800 Subject: [PATCH 11/22] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E4=B8=8E=E5=90=88?= =?UTF-8?q?=E5=90=8C][=E4=BF=AE=E6=94=B9][=E9=80=BB=E8=BE=91=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=9A=E8=90=A5=E4=B8=9A=E9=A2=9D=E3=80=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=AD=89]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillAllServiceImpl.java | 34 ++++++++----------- .../service/impl/WxBillDailyServiceImpl.java | 2 +- .../impl/WxBillDepositServiceImpl.java | 2 +- .../impl/WxBillOtherDepositServiceImpl.java | 2 +- .../service/impl/WxBillOtherServiceImpl.java | 2 +- .../WxBillPropertyDepositServiceImpl.java | 2 +- .../impl/WxBillPropertyServiceImpl.java | 2 +- .../service/impl/WxBillRentServiceImpl.java | 2 +- .../service/impl/WxFlowServiceImpl.java | 8 ++--- .../impl/WxPropertyContractServiceImpl.java | 16 ++++----- .../impl/WxRentContractServiceImpl.java | 8 ++--- 11 files changed, 38 insertions(+), 42 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 6492ecc16..c88e44b8b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -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>> toMap(List> mapList){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 7af308f13..a0ded9d42 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index c867c8e41..3d75b894d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index c6725b9eb..77d99e15e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index d83bcae33..e8318427e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index 2cfc84163..43383c7ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 10e607476..17e150daa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 594c16a95..4426e08c7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 656188983..0c83e36ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -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); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 57c8c0512..c6c51838d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -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 buildRentMonth(WxMerchant wxMerchant, Long userId, WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate, Integer price,Integer isPreview) { + public List 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 shopInfo = new HashMap<>(); @@ -435,7 +435,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService List 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++) { @@ -488,7 +488,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return false; } - public Map buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxPropertyContract wxPropertyContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map shopInfo,boolean isLastYesr) { + public Map buildRent(int lease, int receivePeriod, long price, Date startdate, int dayType, WxPropertyContract wxPropertyContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map shopInfo, boolean isLastYesr) { Map resultMap = new HashedMap(); List 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(); @@ -751,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()) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 5ecf29e1f..069246074 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -524,8 +524,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); @@ -854,9 +854,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(); From 51eb9034c7b3584c1f0fa2b176ada35c3f2cc53d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 16:39:05 +0800 Subject: [PATCH 12/22] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E4=B8=8E=E5=90=88?= =?UTF-8?q?=E5=90=8C][=E4=BF=AE=E6=94=B9][Mapper=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=EF=BC=9A?= =?UTF-8?q?=E8=90=A5=E4=B8=9A=E9=A2=9D=E3=80=81=E5=90=88=E5=90=8C=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E7=AD=89]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillAllMapper.xml | 12 ++++++------ .../src/main/resources/mapper/WxBillDailyMapper.xml | 6 +++--- .../main/resources/mapper/WxBillDepositMapper.xml | 10 +++++----- .../resources/mapper/WxBillOtherDepositMapper.xml | 8 ++++---- .../src/main/resources/mapper/WxBillOtherMapper.xml | 6 +++--- .../resources/mapper/WxBillPropertyDepositMapper.xml | 12 ++++++------ .../main/resources/mapper/WxBillPropertyMapper.xml | 12 ++++++------ .../src/main/resources/mapper/WxBillRentMapper.xml | 8 ++++---- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 76095e9fa..cad85747a 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -11,18 +11,18 @@ - + - - - - - + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 0c1dfbcd9..5db67623c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -3,14 +3,14 @@ - - + + - + diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index db2fd30fe..f94dd012a 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -4,23 +4,23 @@ - - + + - + - + - + diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 859077ff1..047c58195 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -3,14 +3,14 @@ - - + + - + @@ -20,7 +20,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 56097a2ac..bd8d65478 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -3,14 +3,14 @@ - - + + - + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 036c9d9c7..f3e74c2d2 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -2,16 +2,16 @@ - - - - + + + + - + @@ -20,7 +20,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 7e3200772..11a3a555a 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -4,26 +4,26 @@ - - + + - + - + - + - + diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index cf17dc361..e262a27d3 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -4,8 +4,8 @@ - - + + @@ -14,7 +14,7 @@ - + @@ -23,7 +23,7 @@ - + From 861eccdead8909c8eeca1ddd580d29d74abbe3c5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 17:01:06 +0800 Subject: [PATCH 13/22] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E4=B8=8E=E5=90=88?= =?UTF-8?q?=E5=90=8CSQL][=E4=BF=AE=E6=94=B9][=E6=95=B4=E4=BD=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=EF=BC=9A=E8=90=A5?= =?UTF-8?q?=E4=B8=9A=E9=A2=9D=E3=80=81=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=AD=89]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V201904251610__UPDATE_BILL.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql index c4f938d2b..c2509a81b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql @@ -9,7 +9,7 @@ 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 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), From 445ab0fc3732f70e64e99371bb4b231c22922943 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 17:11:17 +0800 Subject: [PATCH 14/22] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=87=BA?= =?UTF-8?q?=E7=A7=9F=E5=95=86=E9=93=BA=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxShopController.java | 17 +++++++++ .../com/iformall/mapper/WxShopMapper.java | 3 +- .../com/iformall/service/WxShopService.java | 2 + .../service/impl/WxChartServiceImpl.java | 2 + .../service/impl/WxShopServiceImpl.java | 8 ++++ .../main/resources/mapper/WxShopMapper.xml | 37 +++++++++++++++++++ 6 files changed, 68 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java index a47e1d20b..8e9ff4fee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java @@ -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> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); + return new ResultData(page); + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index c69d8e01f..5e98cef25 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -14,9 +14,10 @@ public interface WxShopMapper extends CommonMapper { List findList(WxShop wxShop); - List> findListMap(WxShop record); + List> notRentListMapAsPage(WxShop record); + List> getbshoplist(Map tenantId); Map getMerchantShopByShopId(Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index ec89fc18f..982224fb8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -21,6 +21,8 @@ public interface WxShopService { PageInfo> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); + PageInfo> notRentListMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); + /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 7a779e55d..4dda956b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2250,6 +2250,7 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getIndexShopRentData(String tenantId, String startDateStr) { HashMap datamap = new HashMap<>(); Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); + startDate = DateUtils.getFirstDayForCurrMonth(startDate); Date endDate = DateUtils.getLastDayForMonth(startDate); WxShop query = new WxShop(); query.setTenantId(tenantId); @@ -2299,6 +2300,7 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getBillReceRate(String tenantId, String startDateStr) { HashMap datamap = new HashMap<>(); Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); + startDate = DateUtils.getFirstDayForCurrMonth(startDate); Date endDate = DateUtils.getLastDayForMonth(startDate); //租金收缴率 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 58d47e903..100d70217 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -55,6 +55,14 @@ public class WxShopServiceImpl implements WxShopService { return pageInfo; } + @Override + public PageInfo> notRentListMapAsPage(WxShop record, Integer pageIndex, Integer pageSize) { + PageHelper.startPage(pageIndex, pageSize); + List> shops = wxShopMapper.notRentListMapAsPage(record); + PageInfo> pageInfo = new PageInfo<>(shops); + return pageInfo; + } + @Override public WxShop getById(Long id) { return wxShopMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index d21978d49..6a1a3de36 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -267,6 +267,43 @@ + From 9db082d76c3280778164ff0a3dce671d4080ca45 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 17:21:56 +0800 Subject: [PATCH 15/22] =?UTF-8?q?[BUG][ID1001410][=E4=BA=91=E7=AB=AF=20=20?= =?UTF-8?q?version:.993.1419=EF=BC=9A=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=81=94=E8=90=A5=E6=89=A3=E7=82=B9-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=94=B9=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=87=91=E9=A2=9D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillRentServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 4426e08c7..9cfd026a0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -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 From d53374261a7254c95ad5ffd96e3d532bb7d4ecab Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 17:25:25 +0800 Subject: [PATCH 16/22] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=87=BA?= =?UTF-8?q?=E7=A7=9F=E5=95=86=E9=93=BA=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxChartServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 4dda956b2..edc26293a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2306,7 +2306,7 @@ public class WxChartServiceImpl implements WxChartDataService { //租金收缴率 Map params = new HashMap<>(); params.put("tenantId", tenantId); - params.put("startdate", startDateStr + " 00:00:00"); + params.put("startdate", new SimpleDateFormat("yyyy-MM-dd").format(startDate) + " 00:00:00"); params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); Map payinfo = wxBillRentMapper.queryPayInfo(params); if (payinfo != null) { From 4f791715def46b0d5571500051add54c9a5e8c5d Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 17:26:50 +0800 Subject: [PATCH 17/22] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=87=BA?= =?UTF-8?q?=E7=A7=9F=E5=95=86=E9=93=BA=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxChartServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index edc26293a..e302f8cd4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2306,7 +2306,7 @@ public class WxChartServiceImpl implements WxChartDataService { //租金收缴率 Map params = new HashMap<>(); params.put("tenantId", tenantId); - params.put("startdate", new SimpleDateFormat("yyyy-MM-dd").format(startDate) + " 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 payinfo = wxBillRentMapper.queryPayInfo(params); if (payinfo != null) { From d5e2c5d31ba28576670262f0a5c69b377ffdf157 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 17:43:29 +0800 Subject: [PATCH 18/22] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=87=BA?= =?UTF-8?q?=E7=A7=9F=E5=95=86=E9=93=BA=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxChartServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index e302f8cd4..211fa8958 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2247,15 +2247,10 @@ public class WxChartServiceImpl implements WxChartDataService { * @param tenantId * @return */ - private ResultData getIndexShopRentData(String tenantId, String startDateStr) { + private ResultData getIndexShopRentData(String tenantId) { HashMap datamap = new HashMap<>(); - Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); - startDate = DateUtils.getFirstDayForCurrMonth(startDate); - 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); From 9c959a52d1c91c4c00af09599b434344cfd6ac2c Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 17:43:54 +0800 Subject: [PATCH 19/22] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=87=BA?= =?UTF-8?q?=E7=A7=9F=E5=95=86=E9=93=BA=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxChartServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 211fa8958..16ad66279 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -285,7 +285,7 @@ public class WxChartServiceImpl implements WxChartDataService { //首页商铺出租数据 if (chart.equals(EnumChart.INDEX_SHOP_RENT.getCode())) { - return getIndexShopRentData(tenantId, startdate); + return getIndexShopRentData(tenantId); } //首页商铺出租数据 From 879cd2ee659c2d39451ee8e78dea494b19a8517c Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 18:15:05 +0800 Subject: [PATCH 20/22] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=87=BA?= =?UTF-8?q?=E7=A7=9F=E5=95=86=E9=93=BA=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxRentContractController.java | 3 +++ .../com/iformall/domain/po/WxRentContract.java | 15 +++++++++++++++ .../service/impl/WxRentContractServiceImpl.java | 11 +++++++++++ 3 files changed, 29 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 2dd776761..1c9cfaa76 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -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()); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 21f268798..7ca4fcab2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -65,6 +65,21 @@ public class WxRentContract implements Serializable { @Transient private String depositStr; + /** + * 月计租方式 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; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 069246074..ab2ec5132 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -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 + if(wxRentContract.getReceivePeriod().intValue() == 1){ + wxRentContract.setAdjustPeriod(1); + wxRentContract.setMonthHandleType(null); + }else if(wxRentContract.getReceivePeriod().intValue() == 2){ + wxRentContract.setAdjustPeriod(2); + wxRentContract.setMonthHandleType(2); + }else if(wxRentContract.getReceivePeriod().intValue() == 3){ + wxRentContract.setAdjustPeriod(null); + wxRentContract.setMonthHandleType(3); + } result.put("wxRentContract", wxRentContract); //关联的商户 if (wxRentContract.getMerchantId() != null) { From cc135e6eb6435c697c848ffa2c8a4ca832944bf2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 18:18:52 +0800 Subject: [PATCH 21/22] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=87=BA?= =?UTF-8?q?=E7=A7=9F=E5=95=86=E9=93=BA=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxRentContractServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index ab2ec5132..6dc51526a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -127,13 +127,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxRentContract.setPrice(wxRentContract.getPrice() != null ? wxRentContract.getPrice() : 0); wxRentContract.setDeposit(wxRentContract.getDeposit() != null ? wxRentContract.getDeposit() : 0); //handle - if(wxRentContract.getReceivePeriod().intValue() == 1){ + if(wxRentContract.getAdjustPeriod().intValue() == 1){ wxRentContract.setAdjustPeriod(1); wxRentContract.setMonthHandleType(null); - }else if(wxRentContract.getReceivePeriod().intValue() == 2){ + }else if(wxRentContract.getAdjustPeriod().intValue() == 2){ wxRentContract.setAdjustPeriod(2); wxRentContract.setMonthHandleType(2); - }else if(wxRentContract.getReceivePeriod().intValue() == 3){ + }else if(wxRentContract.getAdjustPeriod().intValue() == 3){ wxRentContract.setAdjustPeriod(null); wxRentContract.setMonthHandleType(3); } From ebd71a277c05c274708beeb4b465f6be9dde5013 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 18:31:07 +0800 Subject: [PATCH 22/22] =?UTF-8?q?[BUG][ID1001405][=E4=BA=91=E7=AB=AF?= =?UTF-8?q?=EF=BC=9Aversion:.978.1416=E5=95=86=E9=93=BA=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=92=8C=E5=A4=9A=E7=BB=8F=E7=9A=84=E7=A7=9F=E8=B5=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E8=BF=87=E5=A4=A7=E4=BC=9A=E6=88=90=E8=B4=9F?= =?UTF-8?q?=E6=95=B0=E9=9C=80=E8=A6=81=E9=99=90=E5=88=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxRentContract.java | 12 ++-- .../impl/WxRentContractServiceImpl.java | 70 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 7ca4fcab2..0f0a85873 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -109,7 +109,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; @@ -136,7 +136,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") @@ -317,11 +317,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; } @@ -389,11 +389,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; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 6dc51526a..2307b1975 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -220,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(); @@ -447,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()); @@ -683,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())) { @@ -701,16 +701,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //计算租金,每年-每个店铺租金 - public List computePrice(String rentInfo) { + public List computePrice(String rentInfo) { JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); int arraySize = rentInfoArray.size(); - List priceList = new ArrayList<>(); + List 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); //大于一年 @@ -719,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 buildRentMonth(WxMerchant wxMerchant, Long userId, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, Integer price,Integer isPreview) { + public List 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> 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 priceList = computePrice(rentInfo); + List 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; @@ -754,7 +754,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { for (int i = 0; i < size; i++) { Map 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(); @@ -767,7 +767,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { List 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++) { @@ -822,7 +822,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { return false; } - public Map buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map shopInfo,boolean isLastYesr) { + public Map buildRent(int lease, int receivePeriod, long price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map shopInfo, boolean isLastYesr) { System.out.println("------lease:"+lease+"receivePeriod:"+receivePeriod+"price:"+price+"start:"+DateUtils.date2String(startdate,"yyyy-MM-dd") +"dayType:"+dayType+"billcount:"+billcount); @@ -908,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(); } //自然月,开始日期、缴款日,结束日期 @@ -954,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); @@ -1784,7 +1784,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public void areaWay(WxRentContract wxRentContract, Map result, Integer lease, int extralease, int extracount, int paycount, int index, int count, BigDecimal rentPrice) { - int[] priceArrs = new int[]{}; + long[] priceArrs = new long[]{}; List adjustRatioList = new ArrayList<>(); adjustRatioList.add(0, "0"); if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { @@ -1802,13 +1802,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { } adjustRatioList.add(adjustRatioStr.toString()); } - List priceList = computePrice(rentInfo); + List 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;