From b9acb65b59cf643c4fdf1b7971ca0f74a8e2f2d9 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 10 Sep 2019 14:03:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E4=B8=9A=E6=80=81=E5=88=86?= =?UTF-8?q?=E6=9E=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/controller/WxBillController.java | 2 -- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 2 -- 2 files changed, 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index 0ac69f54f..f1ba9e950 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -9,7 +9,6 @@ import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxBillAllService; import com.iformall.service.WxBillSettleService; -import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -19,7 +18,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import java.util.List; import java.util.Map; diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index c231329ad..97ba1936f 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -367,8 +367,6 @@ ) bill on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=1 ) - - - (select IFNULL(sum(settle_money),0) from wx_bill_settle_record where settle_id = s.id) ) receive_pay ,0 pay,0 owe,s.createtime receive_date,'' pay_date,0 expired_day,status,'' starttime,'' endtime,'' rent_shop_type,'' price_detail, 0 freeze from wx_bill_settle s where s.tenant_id=#{tenantId} and s.status >0