From a5321494aa7d544b86ac57bb7e649f0e19c6b6b4 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 26 Apr 2019 18:04:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[=E8=AE=A2=E5=8D=95][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8D=E8=83=BD=E4=BB=A5=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 561c0aca8..61c95cbf2 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -361,11 +361,11 @@ - AND co.create_date > #{startTime,jdbcType=TIMESTAMP} + AND co.create_date > #{startDate,jdbcType=TIMESTAMP} - AND co.create_date < #{endTime,jdbcType=TIMESTAMP} + AND co.create_date < #{endDate,jdbcType=TIMESTAMP} From 80a03ad82dd09df31736bdb9ff849365defbda5b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 26 Apr 2019 18:01:35 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCarController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java index 20b52b94a..adba65141 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java @@ -208,12 +208,12 @@ public class WxCarController extends BaseController { Integer amtCount = wxCouponCarService.getAmtCountByTemplateId(templateId); Integer availCount = wxCouponCarService.getAvaibleCountByTemplateId(templateId); if (amtCount >= amount) { - logger.error("已达到停车厂商优免券数量限制"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "已达到停车厂商优免券数量限制"); + logger.error("库存已达到停车厂商优免券数量限制"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "库存已达到停车厂商优免券数量限制"); } if (availCount >= avaliavleNum) { - logger.error("已达到停车厂商优免券数量限制"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "已达到停车厂商优免券数量限制"); + logger.error("可用已达到停车厂商优免券数量限制"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "可用已达到停车厂商优免券数量限制"); } // check End coupon.setTenantId(user.getTenantId()); From 39b4ba26830c03736104e3f2086e7712a02314b3 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 26 Apr 2019 18:03:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCarController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java index adba65141..30d61e2e5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java @@ -208,12 +208,12 @@ public class WxCarController extends BaseController { Integer amtCount = wxCouponCarService.getAmtCountByTemplateId(templateId); Integer availCount = wxCouponCarService.getAvaibleCountByTemplateId(templateId); if (amtCount >= amount) { - logger.error("库存已达到停车厂商优免券数量限制"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "库存已达到停车厂商优免券数量限制"); + logger.error("总库存已达到停车厂商优免券数量限制"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "总库存已达到停车厂商优免券数量限制"); } if (availCount >= avaliavleNum) { - logger.error("可用已达到停车厂商优免券数量限制"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "可用已达到停车厂商优免券数量限制"); + logger.error("可用库存已达到停车厂商优免券数量限制"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "可用库存已达到停车厂商优免券数量限制"); } // check End coupon.setTenantId(user.getTenantId()); From 7a1912c977841244840e264f4f7c1545e2a64495 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 26 Apr 2019 18:50:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E8=90=A5=E4=B8=9A=E9=A2=9D=E9=BB=98=E8=AE=A40]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f94292ee8..b6aa38928 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1086,7 +1086,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRent.setExpiredDay(0L); } } - wxBillRent.setRevenue(needpay); + wxBillRent.setRevenue(0L); wxBillRent.setTenantId(wxMerchant.getTenantId()); wxBillRent.setIsDel(0); wxBillRent.setMerchantId(wxMerchant.getId()); From dd2328119bc70b7b1dc82f8f2acebd49879d07b4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 26 Apr 2019 18:53:51 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AE=A1=E6=89=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E9=87=91=E9=A2=9D=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 de3787baa..33eb9cd62 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"); - Long oldPrice = Long.parseLong((String) getVariableByKey(variables, "oldPrice")); - Long newPrice =Long.parseLong((String) getVariableByKey(variables, "newPrice")); + Long oldPrice = Long.parseLong(getVariableByKey(variables, "oldPrice").toString()); + Long newPrice = Long.parseLong(getVariableByKey(variables, "newPrice").toString()); Date updateDate = new Date(); MallUserInfo mallUserInfo = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); if (billType.equals(EnumBillTypeParam.RENT.getCode())) { From 64354047d4cc65da5318456490b2cae11577de76 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 26 Apr 2019 19:00:28 +0800 Subject: [PATCH 6/7] =?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=E5=87=BA=E7=A7=9F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/mapper/WxBillDepositMapper.java | 2 +- .../com/iformall/mapper/WxBillOtherMapper.java | 2 +- .../iformall/mapper/WxBillPropertyMapper.java | 2 ++ .../com/iformall/mapper/WxBillRentMapper.java | 2 ++ .../service/impl/WxChartServiceImpl.java | 16 +++++++++++----- .../service/impl/WxTopicServiceImpl.java | 2 ++ .../main/resources/mapper/WxBillAllMapper.xml | 1 + .../resources/mapper/WxBillDepositMapper.xml | 9 ++++----- .../main/resources/mapper/WxBillOtherMapper.xml | 13 ++++++++++--- .../resources/mapper/WxBillPropertyMapper.xml | 9 ++++++++- .../main/resources/mapper/WxBillRentMapper.xml | 6 ++++++ 11 files changed, 48 insertions(+), 16 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java index dcc37d055..ff0060e53 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java @@ -20,7 +20,7 @@ public interface WxBillDepositMapper extends CommonMapper { Map queryOweInfoAll(Map params); - Map queryPayInfoAll(Map params); + Map queryPayInfoAllTotal(Map params); void updateNotPaidStatus(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java index 4779434c1..f8fb1f900 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java @@ -19,7 +19,7 @@ public interface WxBillOtherMapper extends CommonMapper { List> queryBillList(WxBillOther record); - Map queryPayInfo(Map params); + Map queryPayInfoTotal(Map params); Map queryOweInfo(Map params); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index 9d824f204..a26dd95cd 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -20,6 +20,8 @@ public interface WxBillPropertyMapper extends CommonMapper Map queryPayInfo(Map params); + Map queryPayInfoTotal(Map params); + Map queryOweInfo(Map params); void updateNotPaidStatus(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 91f11f8ec..27dfd7120 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -18,6 +18,8 @@ public interface WxBillRentMapper extends CommonMapper { Map queryPayInfo(Map params); + Map queryPayInfoTotal(Map params); + Map queryOweInfo(Map params); void updateNotPaidStatus(Map params); 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 c813c3327..6a981b1a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2294,6 +2294,12 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } + public static void main(String[] args) { + double a = 0.0; + System.out.println(a==0.0); + System.out.println(); + } + /** * 费用收缴数据 * @param tenantId @@ -2305,12 +2311,12 @@ public class WxChartServiceImpl implements WxChartDataService { startDate = DateUtils.getFirstDayForCurrMonth(startDate); Date endDate = DateUtils.getLastDayForMonth(startDate); - //租金收缴率 + //租金收缴率 ysje 应收金额 ssje 实收金额 zjsjl收缴率 Map params = new HashMap<>(); params.put("tenantId", tenantId); 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); + Map payinfo = wxBillRentMapper.queryPayInfoTotal(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); @@ -2332,7 +2338,7 @@ public class WxChartServiceImpl implements WxChartDataService { } //物业费收缴率 - payinfo = wxBillPropertyMapper.queryPayInfo(params); + payinfo = wxBillPropertyMapper.queryPayInfoTotal(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); @@ -2354,7 +2360,7 @@ public class WxChartServiceImpl implements WxChartDataService { } //押金收缴率 - payinfo = wxBillDepositMapper.queryPayInfoAll(params); + payinfo = wxBillDepositMapper.queryPayInfoAllTotal(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); @@ -2376,7 +2382,7 @@ public class WxChartServiceImpl implements WxChartDataService { } //其他费用收缴率 - payinfo = wxBillOtherMapper.queryPayInfo(params); + payinfo = wxBillOtherMapper.queryPayInfoTotal(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); 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 db90f5fe7..c04c61451 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -114,6 +114,8 @@ public class WxTopicServiceImpl implements WxTopicService { String[] couponArray = couponId.split("-"); //保存coupon_channel WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(Long.parseLong(couponArray[1])); + if(wxCoupon == null) + System.out.println("------------"+couponArray[1]); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setId(idWorker.nextId()); wxCouponChannel.setBeginTime(record.getBeginTime()); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index cad85747a..36852a571 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -546,5 +546,6 @@ left join wx_merchant_shop ms on ms.`merchant_id` = m.id left join wx_shop ws on ms.`shop_id` = ws.id where m.status=1 and m.tenant_id = #{tenantId} + order by totalOwe desc diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index f94dd012a..e89f25808 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -97,19 +97,18 @@ group by tenant_id - select sum(res.receivepay) receivepay,sum(res.pay) pay,res.tenant_id from ( select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_rent_deposit - where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate} + where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_property_deposit - where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate} + where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_other_deposit - where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate} + where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} ) res - group by res.tenant_id - select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_other - where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate} + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 11a3a555a..cdc4932fa 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -116,10 +116,17 @@ + + + + + + +