From 02c100c36e887e9401f147f157a1743c31df4c63 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 28 Jan 2019 16:41:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[BUG][ID1000930][=E4=BA=91=E7=AB=AF?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=20version:.565.723=EF=BC=9A=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E5=B0=8FB=E7=AB=AF=E7=89=A9=E4=B8=9A=E6=8A=BC?= =?UTF-8?q?=E9=87=91=EF=BC=8C=E6=97=B6=E9=97=B4=E6=AE=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9A=E5=88=9B=E5=BB=BA=E4=BA=8614?= =?UTF-8?q?=E5=A4=A9=E5=91=A8=E6=9C=9F=E7=9A=84=E7=89=A9=E4=B8=9A=E5=90=88?= =?UTF-8?q?=E5=90=8C=EF=BC=8C=E8=B4=A6=E5=8D=95=E5=91=A8=E6=9C=9F=E5=9C=A8?= =?UTF-8?q?=E5=B0=8FB=E7=AB=AF=E6=98=BE=E7=A4=BA=E4=B8=BA1=E5=B9=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 8762b74da..4bdb03fa2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -271,7 +271,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (list.size() > 0) { wxPropertyContract = list.get(0); //找到计租方式 - int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; + int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; final IdWorker idWorker = IdWorker.get(); WxBillPropertyDeposit wxBillDeposit = new WxBillPropertyDeposit(); wxBillDeposit.setId(idWorker.nextId()); @@ -331,7 +331,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService List list = wxPropertyContractMapper.findList(wxPropertyContract); if (list.size() > 0) { wxPropertyContract = list.get(0); - int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.MONTH : Calendar.DAY_OF_MONTH; + int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); Integer lease = wxPropertyContract.getLease(); int extralease = lease % receivePeriod; From eaa2578b4c46dbcefcfe3d8da9d2579368e0a3fd Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 28 Jan 2019 17:02:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BA=A4=E6=98=93=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9]:=E5=82=A8=E5=80=BC=E5=8D=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8B=BF=E8=B5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxOrderMapper.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 7c3e1c5db..89f911d23 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -491,12 +491,6 @@ where o.type in (1,2) and o.order_status in (1,4) ) o left join wx_merchant m on o.merchant_id=m.id left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id - union all - select o.id,o.order_number,o.tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.type,o.payment_type,o.payment,o.payment_time, - o.order_status,o.create_date,o.update_date,o.detail,m.`name` merchant_name,cubi.`name` c_user_name,cubi.phone - from wx_order o left join wx_merchant m on o.product_id=m.id - left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id - where o.type=3 and o.order_status in (1,4) ) o @@ -519,7 +513,7 @@ select o.*, m.`name` merchantName from ( select o.*,cm.merchant_id from wx_order o left join wx_coupon_merchant cm on o.product_id=cm.product_id - where o.type in (0,3) and o.order_status in (1,4)) o + where o.type = 0 and o.order_status in (1,4)) o left join wx_merchant m on o.merchant_id=m.id union all select o.*,m.`name` merchantName from ( @@ -544,7 +538,7 @@ select o.*,m.`name` merchantName from ( select o.*,cm.merchant_id from wx_order o left join wx_coupon_merchant cm on o.product_id=cm.product_id - where o.type in (0,3) and o.order_status = #{order_status}) o + where o.type = 0 and o.order_status = #{order_status}) o left join wx_merchant m on o.merchant_id=m.id union all select o.*,m.`name` merchantName from (