From 526ee315acbee7bef8b71855a38512edf21a7861 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 14:03:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E9=A2=84=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/mapper/WxBillRentMapper.java | 4 +++ .../impl/WxRentContractServiceImpl.java | 4 ++- .../resources/mapper/WxActivityJoinMapper.xml | 2 +- .../resources/mapper/WxBillRentMapper.xml | 32 ++++++++++++++++++- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index da71820f0..e51eb7eb5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -36,4 +36,8 @@ public interface WxBillRentMapper extends CommonMapper { Long oweBillCount(Long contractId); + void insertBills(List resultList); + + void updateBills(List resultList); + } 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 3075cd8aa..e073622fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1039,10 +1039,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRent.setRentShopType(wxRentContract.getRentShopType()); wxBillRent.setPeriod(++billcount); wxBillRent.setShopInfo(shopInfoStr); - wxBillRentMapper.insertSelective(wxBillRent); + //wxBillRentMapper.insertSelective(wxBillRent); resultList.add(wxBillRent); } + //批量插入账单 + wxBillRentMapper.insertBills(resultList); resultMap.put("billcount",billcount); resultMap.put("billList",resultList); return resultMap; diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 0dac58226..7356c3532 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -78,7 +78,7 @@ resultType="com.iformall.domain.po.WxActivity"> select a.cover_img,a.title,a.activity_start_time,activity_end_time,a.`status` from wx_activity_join aj left join wx_activity a on aj.activity_id=a.id - where aj.user_id=#{user_id} + where aj.user_id=#{userId} and aj.`tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 9868d01de..d018e5e86 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -181,7 +181,37 @@ select count(br.id) from wx_bill_rent br,wx_rent_contract c where c.id = br.rent_contract_id and br.status = 1 and c.id = #{contractId} - + + + INSERT INTO wx_bill_rent (id,rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, + expired_day, + tenant_id, owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, + rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, + pay_way, late_pay_status, comments) + VALUES + + ( + #{item.id},#{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, + #{item.expiredDay},#{item.tenantId},#{item.owe},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, + #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, + #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, + #{item.payWay},#{item.latePayStatus},#{item.comments} + ) + + + + + + update wx_bill_rent + + updatetime = now(),receive_pay = #{item.receivePay}, + comments = #{item.comments}, + receive_date = #{item.receiveDate}, + status = 3,pay_date=now() + + where id = #{item.id} + +