From 07afd4a44fe2e5febe60e7ece30c301a9a86f324 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 4 Jul 2019 13:58:21 +0800 Subject: [PATCH 01/13] =?UTF-8?q?[=E5=8D=B7][=E4=BF=AE=E6=94=B9][tenantInf?= =?UTF-8?q?o=E5=8E=BB=E6=8E=89=E5=8D=B7=E7=9A=84=E8=BF=87=E6=BB=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index c8ff737d0..18ffe2c96 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -100,10 +100,6 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxActivityJoinMapper.updateStatus".equals(ms.getId())) return true; - if ("com.iformall.mapper.WxCouponMapper.findCouponList".equals(ms.getId())) - return true; - if ("com.iformall.mapper.WxCouponMapper.findCouponListCount".equals(ms.getId())) - return true; return false; } } From a33af4dec8229fa86bec119c8f57d7e52cdaf1e7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 14:11:59 +0800 Subject: [PATCH 02/13] =?UTF-8?q?[sql][=E4=BF=AE=E6=94=B9][=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=91=A8=E6=9C=9F=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E4=B8=8E=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 From 30f04abb5c1e219e4568680368ee9114c1a2d504 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 14:25:17 +0800 Subject: [PATCH 03/13] =?UTF-8?q?[=E6=97=A5=E5=B8=B8=E3=80=81=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=8F=8A=E5=85=B6=E4=BB=96=E6=8A=BC=E9=87=91][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E4=B8=8E=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillActionServiceImpl.java | 1 + .../com/iformall/service/impl/WxBillAllServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java index 2994d27c3..097ec7c52 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java @@ -53,6 +53,7 @@ public class WxBillActionServiceImpl implements WxBillActionService { wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); wxBillAction.setTenantId(user.getTenantId()); + wxBillAction.setPayDate(action.getPayDate()); Date date = new Date(); wxBillAction.setCreatetime(date); wxBillAction.setUpdatetime(date); 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 39f9eda12..c2168ccb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1061,6 +1061,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { daily.setExpiredDay(0L); daily.setOwe(0L); daily.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + daily.setStarttime(bill.getStarttime()); + daily.setEndtime(bill.getEndtime()); wxBillDailyMapper.insertSelective(daily); addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user); } @@ -1115,6 +1117,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { other.setExpiredDay(0L); other.setOwe(0L); other.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + other.setStarttime(bill.getStarttime()); + other.setEndtime(bill.getEndtime()); wxBillOtherMapper.insertSelective(other); addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user); } @@ -1168,6 +1172,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherDeposit.setExpiredDay(0L); otherDeposit.setOwe(0L); otherDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + otherDeposit.setStarttime(bill.getStarttime()); + otherDeposit.setEndtime(bill.getEndtime()); wxBillOtherDepositMapper.insertSelective(otherDeposit); addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user); } From 89e7836fa631e1f9ae98a6bf34582751ab01f06e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 14:37:22 +0800 Subject: [PATCH 04/13] =?UTF-8?q?[=E7=BC=B4=E8=B4=B9=E8=AE=B0=E5=BD=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201907041425__G_ALTER_BILL_ACTION.sql | 3 +++ .../src/main/resources/mapper/WxBillActionMapper.xml | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201907041425__G_ALTER_BILL_ACTION.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907041425__G_ALTER_BILL_ACTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201907041425__G_ALTER_BILL_ACTION.sql new file mode 100644 index 000000000..7da1773be --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907041425__G_ALTER_BILL_ACTION.sql @@ -0,0 +1,3 @@ +alter table wx_bill_action +add index t_b(tenant_id,bill_id), +add index b(bill_id); \ No newline at end of file diff --git a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml index d0922bbc5..6a91f36df 100644 --- a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml @@ -27,10 +27,6 @@ and `id` = #{id} - - and `tenant_id` = #{tenantId} - - and `action` = #{action} From 67094106715d1f14250fa1ed861c9e85c7c44178 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 14:55:31 +0800 Subject: [PATCH 05/13] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AF=BC=E5=85=A5][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=B8=8D=E6=BB=A1=E8=B6=B3=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=AE=A9=E8=A7=86=E4=B8=BA=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/mem/ImportTemplateTask.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java index 11f79c397..3e8f1d985 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -104,7 +104,10 @@ public class ImportTemplateTask { //3 计失败条数 List billSuccessList = new ArrayList<>(); successList.parallelStream().forEach(s -> { - if (StringUtils.isNotEmpty(s.getMerchantName())) { + if (StringUtils.isNotEmpty(s.getMerchantName()) && null != s.getBillType() + && StringUtils.isNotEmpty(s.getBillAttr()) && null != s.getStarttime() + && null != s.getEndtime() && StringUtils.isNotEmpty(s.getPayStr()) + && null != s.getPayDate() && null != s.getReceiveDate()) { WxMerchant wxMerchant = merchantMap.get(s.getMerchantName()); if (wxMerchant != null) { Long merchantId = wxMerchant.getId(); From 6827b2d303f642ac820a3d1b818133b86451e674 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 4 Jul 2019 14:58:44 +0800 Subject: [PATCH 06/13] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=B2=BE=E5=BA=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBusinessMapper.xml | 8 +++++--- .../src/main/resources/mapper/WxMerchantMapper.xml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 164d9f6f8..bfd24a89c 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -115,7 +115,8 @@ left join wx_shop ws on(mtd.shop_id = ws.id) where m.business_id = b.id and m.tenant_id=#{tenantId} ) /100,2) rent, - + + round( round( (select sum(mtd.trade_amt) from wx_merchant m @@ -141,7 +142,9 @@ left join wx_merchant_shop mtd on mtd.merchant_id = m.id left join wx_shop ws on(mtd.shop_id = ws.id) where m.business_id = b.id) - /100,2) rentSaleRate, + /100,2) + ,4) + rentSaleRate, round( (select sum(mtd.trade_amt) @@ -153,7 +156,6 @@ /100,2) comPrice from wx_business b - limit 20 From 2f1c36190310e460d25ebac08b1b4e6f14a023f1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 15:37:40 +0800 Subject: [PATCH 07/13] =?UTF-8?q?[B=E7=AB=AF=E8=A7=A3=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][getter,setter=E6=96=B9=E6=B3=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/po/WxMerchantTradeDaily.java | 17 +++++++++++++++++ .../impl/WxMerchantTradeDailyServiceImpl.java | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 539ad4a7f..dce88b088 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -28,6 +28,23 @@ public class WxMerchantTradeDaily implements Serializable { private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") private Long merchantId; + + public Long getbUserId() { + return bUserId; + } + + public void setbUserId(Long bUserId) { + this.bUserId = bUserId; + } + + public Long getBUserId() { + return bUserId; + } + + public void setBUserId(Long bUserId) { + this.bUserId = bUserId; + } + @io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") private Long bUserId; @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index d13c39b44..1eafc07b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -114,7 +114,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setId(idWorker.nextId()); wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); wxMerchantTradeDaily.setMerchantId(merchant.getId()); - wxMerchantTradeDaily.setBUserId(userId); + wxMerchantTradeDaily.setbUserId(userId); wxMerchantTradeDaily.setTradeAmt(volume+""); wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date()); From 9813d5d22d137a146b2f0c37b2198e7e3e1ff875 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 15:50:51 +0800 Subject: [PATCH 08/13] =?UTF-8?q?[B=E7=AB=AF=E8=A7=A3=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][getter,setter=E6=96=B9=E6=B3=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxMerchantTradeDailyServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 1eafc07b2..a69fda9d8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -115,6 +115,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); wxMerchantTradeDaily.setMerchantId(merchant.getId()); wxMerchantTradeDaily.setbUserId(userId); + logger.info(userId + "1------------------------------------" + wxMerchantTradeDaily.getbUserId()); + wxMerchantTradeDaily.setBUserId(userId); + logger.info(userId + "2------------------------------------" + wxMerchantTradeDaily.getBUserId()); wxMerchantTradeDaily.setTradeAmt(volume+""); wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date()); From d1047b6a43af4d32f6ae9bf9ad33c56a687cb5ed Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 16:13:03 +0800 Subject: [PATCH 09/13] =?UTF-8?q?[B=E7=AB=AF=E8=A7=A3=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][getter,setter=E6=96=B9=E6=B3=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantTradeDailyController.java | 10 ++++------ .../service/impl/WxMerchantTradeDailyServiceImpl.java | 3 --- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 9898b1262..e33694f51 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -9,24 +9,19 @@ import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantTradeDailyService; -import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.map.LinkedMap; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; @RestController @RequestMapping("/api/wxMerchantTradeDaily") @@ -109,7 +104,10 @@ public class WxMerchantTradeDailyController extends BaseController { } } - + wxMerchantTradeDaily.setbUserId(getUserId()); + logger.info("1------------------------------------" + wxMerchantTradeDaily.getbUserId()); + wxMerchantTradeDaily.setBUserId(getUserId()); + logger.info("2------------------------------------" + wxMerchantTradeDaily.getBUserId()); wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index a69fda9d8..1eafc07b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -115,9 +115,6 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); wxMerchantTradeDaily.setMerchantId(merchant.getId()); wxMerchantTradeDaily.setbUserId(userId); - logger.info(userId + "1------------------------------------" + wxMerchantTradeDaily.getbUserId()); - wxMerchantTradeDaily.setBUserId(userId); - logger.info(userId + "2------------------------------------" + wxMerchantTradeDaily.getBUserId()); wxMerchantTradeDaily.setTradeAmt(volume+""); wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date()); From 692fed8e94679405489b5a50c93b84f46d3aaab3 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 4 Jul 2019 16:16:37 +0800 Subject: [PATCH 10/13] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=B2=BE=E5=BA=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V201907041600__L_ALTER_MER.sql | 1 + .../src/main/java/com/iformall/domain/po/WxBillDaily.java | 1 - .../src/main/java/com/iformall/domain/po/WxBillOther.java | 1 - .../main/java/com/iformall/domain/po/WxBillOtherDeposit.java | 1 - .../src/main/java/com/iformall/domain/po/WxBillProperty.java | 1 - .../src/main/java/com/iformall/domain/po/WxBillRent.java | 1 - .../src/main/java/com/iformall/domain/po/WxRentContract.java | 1 - .../src/main/java/com/iformall/domain/vo/WxBillAll.java | 1 - .../src/main/resources/mapper/WxPropertyContractMapper.xml | 2 +- .../src/main/resources/mapper/WxRentContractMapper.xml | 2 +- 10 files changed, 3 insertions(+), 9 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql b/mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql new file mode 100644 index 000000000..bba877ef1 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql @@ -0,0 +1 @@ +update wx_merchant set link_line_phone = link_person where link_line_phone is null; \ 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 cd1bc280d..5df35f71d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -52,7 +52,6 @@ public class WxBillDaily extends BaseEntity{ @Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd") @NotNull - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; 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 3cdffd727..7d5ef64bb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -56,7 +56,6 @@ public class WxBillOther extends BaseEntity { private Long pay; @Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd") - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; 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 67c7101f0..512e2ef87 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -55,7 +55,6 @@ public class WxBillOtherDeposit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") private Long pay; - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index d3104113f..a3a41de6d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -68,7 +68,6 @@ public class WxBillProperty extends BaseEntity { private Long pay; @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 17b944a47..8ff241f3c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -67,7 +67,6 @@ public class WxBillRent extends BaseEntity { private Long pay; @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") - @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 56603d8ca..93a560831 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -81,7 +81,6 @@ public class WxRentContract extends BaseEntity { private Integer owe; @Transient - @SortColumn(column = "receiveDate") private String receiveDate; @Transient diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 3aab9ada5..6ea91631e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -114,7 +114,6 @@ public class WxBillAll extends BaseEntity { @SortColumn(column = "owe") private Integer owe; @Transient - @SortColumn(column = "receiveDate") private String receiveDate; @Transient @SortColumn(column = "payDate") diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index fd5b78eaa..382e49422 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -145,7 +145,7 @@ order by ${sortColumns} - order by rc.id desc + order by rc.createtime desc,rc.id desc From 29218d8172d653858b81b75204234a83b186fa95 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 4 Jul 2019 16:58:34 +0800 Subject: [PATCH 11/13] =?UTF-8?q?[=E4=B8=8A=E4=BC=A0][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=81=A2=E5=A4=8Ddev=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/application-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index e5afcafe0..b42940e74 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -113,8 +113,8 @@ fm: exception: false exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 - open: false - upload_dir: /tmp/ + open: true + upload_dir: /home/test/server/uploads/ ueditor: config: config.json From 7c81320e0df0f06a6badde735ae1bdf9bdcf1962 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 4 Jul 2019 17:10:39 +0800 Subject: [PATCH 12/13] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=8A=A5=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/market/WxCouponController.java | 2 +- .../src/main/java/com/iformall/domain/po/WxBillRent.java | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 4aa68c51c..9def9d0b9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -176,7 +176,7 @@ public class WxCouponController extends BaseController { WxCoupon coupon = wxCouponService.findById(wxCoupon); if(coupon!=null){ - if(wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ + if(wxCoupon.getValidEndDate()!=null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 8ff241f3c..2d373016b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -43,7 +43,6 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") private Long rentContractId; - @SortColumn(column = "receivePay") @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Long receivePay; @@ -71,7 +70,6 @@ public class WxBillRent extends BaseEntity { private Date receiveDate; @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "11") - @SortColumn(column = "payDate") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; @@ -79,7 +77,6 @@ public class WxBillRent extends BaseEntity { private Date createtime; @Excel(name = "逾期(天) ", width = 20, orderNum = "13") - @SortColumn(column = "expiredDay") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; @@ -104,7 +101,6 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") private Integer isDel; - @SortColumn(column = "needPay") @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") private Long needPay; @@ -140,7 +136,6 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "滞纳金时间", name = "latePayTime") private Date latePayTime; - @SortColumn(column = "latePayPrice") @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") private Long latePayPrice; @@ -173,12 +168,10 @@ public class WxBillRent extends BaseEntity { private String comments; @Transient - @SortColumn(column = "allPeriod") private Integer allPeriod; @Excel(name = "商铺号", width = 20, orderNum = "1") @Transient - @SortColumn(column = "shopNumber") private String shopNumber; @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "3") From 5ef9a26969d0101f7bb877b920754b640958b1fe Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 17:13:18 +0800 Subject: [PATCH 13/13] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxBillDaily.java | 7 ------- .../src/main/java/com/iformall/domain/po/WxBillOther.java | 7 ------- .../java/com/iformall/domain/po/WxBillOtherDeposit.java | 6 ------ .../main/java/com/iformall/domain/po/WxBillProperty.java | 6 ------ 4 files changed, 26 deletions(-) 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 5df35f71d..eb79f0fae 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -43,7 +43,6 @@ public class WxBillDaily extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="账单类型",name="type") private Integer type; - @SortColumn(column = "receivePay") @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Long receivePay; @@ -55,14 +54,12 @@ public class WxBillDaily extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; - @SortColumn(column = "payDate") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - @SortColumn(column = "expiredDay") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") @@ -93,15 +90,12 @@ public class WxBillDaily extends BaseEntity{ private String priceDetail; @Transient - @SortColumn(column = "allPeriod") private Integer allPeriod; @Transient - @SortColumn(column = "needPay") private Long needPay; @Transient - @SortColumn(column = "latePayPrice") private Long latePayPrice; @Transient @@ -109,7 +103,6 @@ public class WxBillDaily extends BaseEntity{ private Integer period; @Transient - @SortColumn(column = "shopNumber") private String shopNumber; @Transient 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 7d5ef64bb..586665270 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -49,7 +49,6 @@ public class WxBillOther extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="账单备注",name="comments") private String comments; - @SortColumn(column = "receivePay") @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Long receivePay; @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") @@ -60,7 +59,6 @@ public class WxBillOther extends BaseEntity { private Date receiveDate; @Excel(name = "收款日期", orderNum = "8", width = 20, format = "yyyy-MM-dd") - @SortColumn(column = "payDate") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; @@ -68,7 +66,6 @@ public class WxBillOther extends BaseEntity { private Date createtime; @Excel(name = "逾期(天)", orderNum = "10", width = 20) - @SortColumn(column = "expiredDay") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") @@ -96,15 +93,12 @@ public class WxBillOther extends BaseEntity { private Integer payWay; @Transient - @SortColumn(column = "allPeriod") private Integer allPeriod; @Transient - @SortColumn(column = "needPay") private Long needPay; @Transient - @SortColumn(column = "latePayPrice") private Long latePayPrice; @Transient @@ -113,7 +107,6 @@ public class WxBillOther extends BaseEntity { @Excel(name = "商铺号", width = 20, orderNum = "1") @Transient - @SortColumn(column = "shopNumber") private String shopNumber; @Transient 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 512e2ef87..636244106 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -48,7 +48,6 @@ public class WxBillOtherDeposit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "账单备注", name = "comments") private String comments; - @SortColumn(column = "receivePay") @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePay") private Long receivePay; @@ -59,7 +58,6 @@ public class WxBillOtherDeposit extends BaseEntity { private Date receiveDate; @Excel(name = "收款日期", orderNum = "6", width = 20, format = "yyyy-MM-dd") - @SortColumn(column = "payDate") @io.swagger.annotations.ApiModelProperty(value = "到账日期", name = "payDate") private Date payDate; @@ -99,15 +97,12 @@ public class WxBillOtherDeposit extends BaseEntity { private Integer payWay; @Transient - @SortColumn(column = "allPeriod") private Integer allPeriod; @Transient - @SortColumn(column = "needPay") private Long needPay; @Transient - @SortColumn(column = "latePayPrice") private Long latePayPrice; @Transient @@ -116,7 +111,6 @@ public class WxBillOtherDeposit extends BaseEntity { @Excel(name = "商铺号", width = 20, orderNum = "1") @Transient - @SortColumn(column = "shopNumber") private String shopNumber; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index a3a41de6d..c9037aa45 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -72,14 +72,12 @@ public class WxBillProperty extends BaseEntity { private Date receiveDate; @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "11") - @SortColumn(column = "payDate") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; @Excel(name = "逾期(天) ", width = 20, orderNum = "13") - @SortColumn(column = "expiredDay") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; @@ -102,7 +100,6 @@ public class WxBillProperty extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") private Integer isDel; - @SortColumn(column = "needPay") @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") private Long needPay; @@ -138,7 +135,6 @@ public class WxBillProperty extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "滞纳金时间", name = "latePayTime") private Date latePayTime; - @SortColumn(column = "latePayPrice") @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") private Long latePayPrice; @@ -169,12 +165,10 @@ public class WxBillProperty extends BaseEntity { private String comments; @Transient - @SortColumn(column = "allPeriod") private Integer allPeriod; @Excel(name = "商铺号", width = 20, orderNum = "1") @Transient - @SortColumn(column = "shopNumber") private String shopNumber; @Transient private Integer depositStatus;