From a33af4dec8229fa86bec119c8f57d7e52cdaf1e7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 14:11:59 +0800 Subject: [PATCH] =?UTF-8?q?[sql][=E4=BF=AE=E6=94=B9][=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=A8=E6=9C=9F=E5=BC=80=E5=A7=8B=E4=B8=8E?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201907041410__G_ALTER_BILL.sql | 11 +++++++++++ .../main/java/com/iformall/domain/po/WxBillDaily.java | 5 +++++ .../main/java/com/iformall/domain/po/WxBillOther.java | 6 ++++++ .../com/iformall/domain/po/WxBillOtherDeposit.java | 5 +++++ .../iformall/service/impl/WxBillAllServiceImpl.java | 2 ++ .../service/impl/WxBillOtherDepositServiceImpl.java | 1 + .../iformall/service/impl/WxBillOtherServiceImpl.java | 1 + .../src/main/resources/mapper/WxBillDailyMapper.xml | 11 +++++++---- .../resources/mapper/WxBillOtherDepositMapper.xml | 7 +++++-- .../src/main/resources/mapper/WxBillOtherMapper.xml | 7 +++++-- 10 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201907041410__G_ALTER_BILL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907041410__G_ALTER_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201907041410__G_ALTER_BILL.sql new file mode 100644 index 000000000..19da12d73 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907041410__G_ALTER_BILL.sql @@ -0,0 +1,11 @@ +alter table wx_bill_daily +add column starttime datetime default null comment '账单开始时间', +add column endtime datetime default null comment '账单结束时间'; + +alter table wx_bill_other +add column starttime datetime default null comment '账单开始时间', +add column endtime datetime default null comment '账单结束时间'; + +alter table wx_bill_other_deposit +add column starttime datetime default null comment '账单开始时间', +add column endtime datetime default null comment '账单结束时间'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 191338bbd..cd1bc280d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -116,6 +116,11 @@ public class WxBillDaily extends BaseEntity{ @Transient private List> shops; + @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") + private Date starttime; + + @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") + private Date endtime; public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index c55b05cdf..3cdffd727 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -127,6 +127,12 @@ public class WxBillOther extends BaseEntity { @Excel(name = "欠缴金额(元)", orderNum = "6", width = 20) private String oweStr; + @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") + private Date starttime; + + @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") + private Date endtime; + public String getReceivePayStr() { return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 5883d01b9..67c7101f0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -149,6 +149,11 @@ public class WxBillOtherDeposit extends BaseEntity { @Transient private List> shops; + @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") + private Date starttime; + + @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") + private Date endtime; public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index d190d0649..39f9eda12 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1070,6 +1070,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherQuery.setTenantId(tenantId); otherQuery.setMerchantId(bill.getMerchantId()); otherQuery.setReceiveDate(bill.getReceiveDate()); + otherQuery.setName(bill.getBillAttr()); otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxBillOther other = wxBillOtherMapper.selectOne(otherQuery); long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); @@ -1123,6 +1124,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherDepositQuery.setTenantId(tenantId); otherDepositQuery.setMerchantId(bill.getMerchantId()); otherDepositQuery.setReceiveDate(bill.getReceiveDate()); + otherDepositQuery.setComments(bill.getBillAttr()); otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 96205c637..04f946d02 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -126,6 +126,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService otherDepositQuery.setTenantId(record.getTenantId()); otherDepositQuery.setMerchantId(record.getMerchantId()); otherDepositQuery.setReceiveDate(record.getReceiveDate()); + otherDepositQuery.setComments(record.getComments()); otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); if (otherDeposit != null) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index aed7236d3..bab94adab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -127,6 +127,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { otherQuery.setTenantId(record.getTenantId()); otherQuery.setMerchantId(record.getMerchantId()); otherQuery.setReceiveDate(record.getReceiveDate()); + otherQuery.setName(record.getName()); otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxBillOther other = wxBillOtherMapper.selectOne(otherQuery); if (other != null) { diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 0404cbe2c..5468a96d4 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -23,13 +23,16 @@ + + + `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type`, - `rent_shop_type`,`pay_way`,`price_detail` + `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime` @@ -68,9 +71,9 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, br.`owe`,br.`status`,m.`name` merchant_name,s.shop_number,br.`updatetime`,br.`return_price`,br.`merchant_id`, - br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way + br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime` from wx_bill_other_deposit br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 946d0f6fb..cf08fb692 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -23,6 +23,9 @@ + + + @@ -30,7 +33,7 @@ `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, - `rent_shop_type`,`pay_way` + `rent_shop_type`,`pay_way`,`starttime`,`endtime` @@ -72,7 +75,7 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name,s.shop_number,br.`updatetime`, - br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way + br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime` from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id