diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 695b757ee..dba261b37 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -55,6 +55,17 @@ public class WxBillAllController extends BaseController { return new ResultData(result); } + @GetMapping("allDepositList") + @SystemControllerLog(description = "账单总览-所有押金列表") + public ResultData allDepositList(@ModelAttribute WxBillAll wxBillAll) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::allDepositList"); + if (null == wxBillAll) { + wxBillAll = new WxBillAll(); + } + wxBillAll.setTenantId(getTenantId()); + return new ResultData(wxBillAllService.allDepositList(wxBillAll)); + } + @GetMapping("exportBill") @SystemControllerLog(description = "账单总览-导出") public void exportBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908301605__L_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201908301605__L_CONTRACT.sql new file mode 100644 index 000000000..d7ebeb556 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201908301605__L_CONTRACT.sql @@ -0,0 +1,21 @@ +alter table wx_bill_rent +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_rent_deposit +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_property +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_property_deposit +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_daily +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_other +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + +alter table wx_bill_other_deposit +add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; + diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908301630__MENU_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201908301630__MENU_CHANGED.sql new file mode 100644 index 000000000..651945058 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201908301630__MENU_CHANGED.sql @@ -0,0 +1,24 @@ +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,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,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,416,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,416,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/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 0badeabec..efd9b7078 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -51,4 +51,6 @@ public interface WxBillAllMapper { Map getReceiveAndPayBillDetail(WxBillAll record); + List> allDepositList(WxBillAll wxBillAll); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 847f04673..b7bc24054 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -17,6 +17,8 @@ import java.util.Map; */ public interface WxBillAllService { + List> allDepositList(WxBillAll wxBillAll); + Map listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); List> listBillOweAndWaitPay(WxBillAll wxBillAll); 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 6a978ec88..e2e69f20f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1633,4 +1633,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { excelService.exportExcel(list, null, name, WaitMerchantVo.class, name + ".xlsx", response, false); } + @Override + public List> allDepositList(WxBillAll wxBillAll) { + return wxBillAllMapper.allDepositList(wxBillAll); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index c0f7fa99e..f193e2589 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -69,42 +69,42 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { return billSettle; } - public void updateFreeze(List billList){ + public void updateFreeze(List billList,int status){ for (WxBillSettleBill bill:billList) { if(EnumBillType.RENT.getCode().equals(bill.getBillType())) { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); }else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { WxBillDeposit wxBillRent = new WxBillDeposit(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); }else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); propertyDeposit.setId(bill.getBillId()); - propertyDeposit.setStatus(EnumBillRentStatus.FREEZE.getCode()); + propertyDeposit.setStatus(status); wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); }else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { WxBillOther wxBillRent = new WxBillOther(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); }else{ WxBillDaily wxBillRent = new WxBillDaily(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); } } @@ -132,8 +132,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { //改为冻结状态 if (record.getFlowParams() != null && record.getFlowParams().size() > 0) { - updateFreeze(record.getReceiveBillIds()); - updateFreeze(record.getPayBillIds()); + updateFreeze(record.getReceiveBillIds(),EnumBillRentStatus.FREEZE.getCode()); + updateFreeze(record.getPayBillIds(),EnumBillRentStatus.FREEZE.getCode()); } //启动审批流 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index d1ac5a745..1dca2761d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -86,6 +86,8 @@ public class WxFlowServiceImpl implements WxFlowService { private WxCouponService wxCouponService; @Autowired private WxRentContractMapper wxRentContractMapper; + @Autowired + private WxBillSettleMapper wxBillSettleMapper; /** * 获取流程key @@ -270,6 +272,16 @@ public class WxFlowServiceImpl implements WxFlowService { } wxCoupon.setApprovalType(operateType); wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); + }else if(EnumFlowKey.SETTLE.getCode().equals(flowType)){ + WxBillSettle wxBillSettle = new WxBillSettle(); + wxBillSettle.setId(businessId); + wxBillSettle.setApplyStatus(applyStatus); + wxBillSettleMapper.update(wxBillSettle); + + // 审批完成,账单解冻 + if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { + + } } } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 8baca7a54..7a940d70c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -741,13 +741,31 @@ and m.name like concat('%', #{merchantName},'%') and rc.rent_shop_type = #{rentShopType} - order by ${sortColumns} order by m.id desc - - + diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index 2ac6edce3..6bd923c5c 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -257,26 +257,6 @@ public class SysMenuController extends BaseController { }}); // 5. 删除permission mallPermissionService.deleteById(menuId_Account); - // 6. sale_type - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(1L); - setMenus( - "[1,2,3,4,5,6,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]" - ); - }}); - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(2L); - setMenus( - "[1,2,3,4,5,6,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]" - ); - }}); - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(3L); - setMenus( - "[2,4,5,6,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]" - ); - }}); - } private void addMenusForContract() { @@ -403,25 +383,6 @@ public class SysMenuController extends BaseController { } } } - // 5. sale_type - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(1L); - setMenus( - "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,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]" - ); - }}); - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(2L); - setMenus( - "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,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]" - ); - }}); - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(3L); - setMenus( - "[2,4,5,6,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]" - ); - }}); } private void addMenusForBills() { @@ -432,25 +393,6 @@ public class SysMenuController extends BaseController { }}); addNewMunuFolder_ZhangdanList(); addNewMenuFolder_Duizhang(); - // 8. sale_type - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(1L); - setMenus( - "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,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]" - ); - }}); - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(2L); - setMenus( - "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,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]" - ); - }}); - mallMenuMapper.updateMallSaleType(new MallSaleType(){{ - setId(3L); - setMenus( - "[2,4,5,6,10,50,201,202,205,211,212,221,222,251,409,410,411,416,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]" - ); - }}); } private void addNewMunuFolder_ZhangdanList() {