From b8da61bc0ef518aadc89fd9f2d19460e46e35365 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 20 Aug 2019 11:39:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201908201134__L_ADD_MENU.sql | 29 +++++++++++++++++++ .../iformall/domain/vo/ReceivedAndPayVo.java | 3 +- .../service/impl/WxBillAllServiceImpl.java | 21 +++++++------- 3 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201908201134__L_ADD_MENU.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908201134__L_ADD_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201908201134__L_ADD_MENU.sql new file mode 100644 index 000000000..4db3dd1c9 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201908201134__L_ADD_MENU.sql @@ -0,0 +1,29 @@ + +INSERT INTO `mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES + (968, '电费管理', 952, 'Y', NULL, 1, NULL, NULL, 'meterFee', NULL, 0, 968); + +DROP TABLE IF EXISTS `mall_sale_type` ; +CREATE TABLE `mall_sale_type` ( + `id` bigint(64) NOT NULL, + `name` varchar(32) DEFAULT NULL COMMENT '销售类型', + `type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:尊享全能版 2:尊享营销版 3.速享版', + `period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)', + `menus` json DEFAULT NULL COMMENT '菜单列表', + PRIMARY KEY (`id`), + UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +INSERT INTO `mall_sale_type` + (`id`,`name`, `type`, `period`, `menus`) +VALUES + (1, '尊享全能版', 1, 12, + '[1,2,3,4,5,6,7,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]' + ), + (2, '尊享营销版', 2, 12, + '[1,2,4,5,6,7,8,9,10,50,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,961]' + ), + (3, '速享版', 3, 1, + '[2,4,5,6,7,10,50,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,591,592,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932]' + ) + ; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/ReceivedAndPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/ReceivedAndPayVo.java index f4b3f2263..9d7ef6c96 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/ReceivedAndPayVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/ReceivedAndPayVo.java @@ -22,6 +22,7 @@ public class ReceivedAndPayVo { private String receivePay; @Excel(name="承付总额(元)",width = 20,orderNum = "7") private String payOut; - + @Excel(name="结余金额(元)",width = 20,orderNum = "8") + private String balance; } 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 659e1428e..7317d6e2a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1585,18 +1585,19 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { List> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (Map map : data) { - WaitMerchantVo oweMerchantVo = new WaitMerchantVo(); - oweMerchantVo.setLinkPerson((String) map.get("manager")); + ReceivedAndPayVo oweMerchantVo = new ReceivedAndPayVo(); + oweMerchantVo.setLinkPerson((String) map.get("linkPerson")); oweMerchantVo.setName((String) map.get("merchantName")); - oweMerchantVo.setLinkPhone((String) map.get("managerPhone")); - - oweMerchantVo.setRentReceivePay(new BigDecimal(subZeroAndDot(map.get("rentReceivePay").toString()))); - oweMerchantVo.setPropertyReceivePay(new BigDecimal(subZeroAndDot(map.get("propertyReceivePay").toString()))); - oweMerchantVo.setDepositReceivePay(new BigDecimal(subZeroAndDot(map.get("depositReceivePay").toString()))); - oweMerchantVo.setOtherReceivePay(new BigDecimal(subZeroAndDot(map.get("otherReceivePay").toString()))); - oweMerchantVo.setTotalReceivePay(new BigDecimal(subZeroAndDot(map.get("totalReceivePay").toString()))); + oweMerchantVo.setLinkPhone((String) map.get("linkPhone")); + oweMerchantVo.setShopNumber((String) map.get("shopNumber")); +// +// oweMerchantVo.setShopNumber(new BigDecimal(subZeroAndDot(map.get("rentReceivePay").toString()))); +// oweMerchantVo.setPropertyReceivePay(new BigDecimal(subZeroAndDot(map.get("propertyReceivePay").toString()))); +// oweMerchantVo.setDepositReceivePay(new BigDecimal(subZeroAndDot(map.get("depositReceivePay").toString()))); +// oweMerchantVo.setOtherReceivePay(new BigDecimal(subZeroAndDot(map.get("otherReceivePay").toString()))); +// oweMerchantVo.setTotalReceivePay(new BigDecimal(subZeroAndDot(map.get("totalReceivePay").toString()))); list.add(oweMerchantVo); } String name = "商户列表";