From a1cff7ac80919eceb501ddacc436ac267cf751bc Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 25 Dec 2018 14:35:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 4 ++-- mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 3 ++- 2 files changed, 4 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 cd9b7f368..1ca98f3d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -959,7 +959,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //无数据租期 - for (int i = paycount; i < index; i++) { + for (int i = paycount; i <= index; i++) { result.put("rentalStartDate" + i, "/"); result.put("rentalStartDateYear" + i, "/"); result.put("rentalStartDateMonth" + i, "/"); @@ -1036,7 +1036,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //无数据租期 - for (int i = paycount; i < index; i++) { + for (int i = paycount; i <= index; i++) { result.put("rentalStartDate" + i, "/"); result.put("rentalStartDateYear" + i, "/"); result.put("rentalStartDateMonth" + i, "/"); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index aeabb02e2..e2a6faf26 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -414,7 +414,8 @@ select o.* from ( select o.id,o.order_number,o.tenant_id,o.c_user_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,'多商户' merchant_name,cubi.`name` c_user_name,cubi.phone from + o.order_status,o.create_date,o.update_date,o.detail,'[多商户交易]' merchant_name,cubi.`name` c_user_name,cubi.phone + from ( select o.* from wx_order o where o.type in (0,3) and o.id in( select o.id from wx_order o left join wx_coupon_merchant cm