From 5267242ac94772fea114bac229e1a0aed56bdf8c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 6 Nov 2019 13:20:59 +0800 Subject: [PATCH 01/12] =?UTF-8?q?[=E5=95=86=E6=88=B7=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=88=97=E8=A1=A8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=AF=A6=E6=83=85]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WxMerchantMapper.xml | 59 +++++-------------- 1 file changed, 14 insertions(+), 45 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index e74dbc0bf..8e3e5c180 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -429,57 +429,25 @@ ifnull(consume.consumeCount,0) consumeCount,ifnull(consumePeople.consumeCountP,0) as consumeCountP, ifnull(price.tradeAmt,0) tradeAmt FROM wx_merchant m - left join (SELECT count(*) as consumeCount,cm.merchant_id FROM wx_coupon_order o - LEFT JOIN wx_coupon co ON (o.`coupon_id` = co.id) - LEFT JOIN wx_coupon_merchant cm ON (cm.product_id = co.id) - WHERE o.coupon_order_status = 1 + left join (select count(co.c_user_id) AS consumeCount, + count(DISTINCT co.c_user_id) AS consumeCountP,sum(co.coupon_price) AS tradeAmt, m.id as merchant_id from + wx_coupon_order co + left join (select m.id,mbu.id as b_user_id from wx_merchant m + left join wx_merchant_b_user mbu on m.id=mbu.merchant_id) m + on o.b_user_id=m.b_user_id + WHERE co.coupon_order_status = 1 - and o.tenant_id = #{tenantId} + and co.tenant_id = #{tenantId} - and o.create_date >= #{starttime} + and co.create_date >= #{starttime} - and o.create_date <= #{endtime} + and co.create_date <= #{endtime} - group by cm.merchant_id + group by m.id ) consume on consume.merchant_id=m.id - - left join (SELECT count(DISTINCT o.c_user_id) as consumeCountP,cm.merchant_id FROM wx_coupon_order o - LEFT JOIN wx_coupon co ON (o.`coupon_id` = co.id) - LEFT JOIN wx_coupon_merchant cm ON (cm.product_id = co.id) - WHERE o.coupon_order_status = 1 - - and o.tenant_id = #{tenantId} - - - and o.create_date >= #{starttime} - - - and o.create_date <= #{endtime} - - group by cm.merchant_id - ) consumePeople on consumePeople.merchant_id=m.id - - left join (SELECT sum(o.coupon_price) as tradeAmt,cm.merchant_id FROM wx_coupon_order o - LEFT JOIN wx_coupon co ON (o.`coupon_id` = co.id) - LEFT JOIN wx_coupon_merchant cm ON (cm.product_id = co.id) - INNER JOIN wx_merchant_b_user mb ON (mb.id = o.b_user_id) - WHERE o.coupon_order_status = 1 - - and o.tenant_id = #{tenantId} - - - and o.create_date >= #{starttime} - - - and o.create_date <= #{endtime} - - group by cm.merchant_id - ) price on price.merchant_id=m.id - where m.status=1 - and `name` like concat('%', #{name},'%') @@ -498,12 +466,13 @@ co.price tradeAmt,o.create_date tradeDate from wx_coupon_order o left join wx_coupon co on(o.`coupon_id`=co.id) - left join wx_coupon_merchant cm on(cm.product_id=co.id) left join wx_c_user_basic_info cb on o.c_user_id=cb.id where o.coupon_order_status=1 and o.tenant_id=#{tenantId} - and cm.`merchant_id` = #{id} + o.b_user_id in( + select id from wx_merchant_b_user where merchant_id=#{id} + ) From 396903376d1f0e4c9397159fc8c2a420acb92d2d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 6 Nov 2019 13:43:33 +0800 Subject: [PATCH 02/12] =?UTF-8?q?[=E5=95=86=E6=88=B7=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=88=97=E8=A1=A8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=AF=A6=E6=83=85]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 8e3e5c180..54702a4d1 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -434,7 +434,7 @@ wx_coupon_order co left join (select m.id,mbu.id as b_user_id from wx_merchant m left join wx_merchant_b_user mbu on m.id=mbu.merchant_id) m - on o.b_user_id=m.b_user_id + on co.b_user_id=m.b_user_id WHERE co.coupon_order_status = 1 and co.tenant_id = #{tenantId} From 717ccd47896803f22aed9033ffe27576594ec9c4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 6 Nov 2019 13:45:10 +0800 Subject: [PATCH 03/12] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E6=80=BB=E8=A7=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=A7=9F=E9=87=91=E6=94=B6=E7=BC=B4?= =?UTF-8?q?=E7=8E=87=E3=80=81=E7=89=A9=E4=B8=9A=E8=B4=B9=E6=94=B6=E7=BC=B4?= =?UTF-8?q?=E7=8E=87=E6=8E=92=E9=99=A4=E5=A4=B1=E6=95=88=E8=B4=A6=E5=8D=95?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillPropertyMapper.xml | 6 +++--- .../src/main/resources/mapper/WxBillRentMapper.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index b43a07bea..c7901c541 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -125,7 +125,7 @@ @@ -133,14 +133,14 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 84439550d..8c959b84a 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -138,21 +138,21 @@ From 32680590e63bd0b309cd49df3f491002adeee994 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 6 Nov 2019 14:21:12 +0800 Subject: [PATCH 04/12] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E6=80=BB=E8=A7=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=A7=9F=E9=87=91=E6=94=B6=E7=BC=B4?= =?UTF-8?q?=E7=8E=87=E3=80=81=E7=89=A9=E4=B8=9A=E8=B4=B9=E6=94=B6=E7=BC=B4?= =?UTF-8?q?=E7=8E=87=E6=8E=92=E9=99=A4=E5=A4=B1=E6=95=88=E8=B4=A6=E5=8D=95?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillPropertyMapper.xml | 4 ++-- mallinkService/src/main/resources/mapper/WxBillRentMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index c7901c541..5c21b2c23 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -131,14 +131,14 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 8c959b84a..08ca3bc3f 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -143,14 +143,14 @@ From e60569fce44e0ffcf13748e33ccac9b6af2fe9fe Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 6 Nov 2019 00:38:32 +0800 Subject: [PATCH 05/12] =?UTF-8?q?[=E6=8B=9B=E5=95=86=E6=9D=83=E9=99=90]?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/DataInitController.java | 5 +- .../controller/sys/SysMenuController.java | 76 ++++++++++++++++++- 2 files changed, 73 insertions(+), 8 deletions(-) diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java index 172c04f4c..f09a779f3 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java @@ -10,7 +10,7 @@ import com.iformall.enums.EnumMsgModel; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; import com.iformall.mapper.*; -import com.iformall.service.WxCreditHistoryService; +import com.iformall.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -53,9 +53,6 @@ public class DataInitController extends BaseController { @Resource private WxMerchantBUserMapper merchantBUserMapper; - @Resource - private WxMerchantMapper wxMerchantMapper; - @PostMapping("/createMsgModel") public ResultData createMsgModel(@RequestParam String content, @RequestParam Integer code) { 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 63c136265..9c8a4780b 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -1,18 +1,17 @@ package com.iformall.controller.sys; +import com.alibaba.fastjson.JSON; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallPermission; -import com.iformall.domain.po.MallRole; -import com.iformall.domain.po.MallRolePermission; -import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.*; import com.iformall.enums.EnumPermissionType; import com.iformall.exception.MallinkException; import com.iformall.mapper.MallMenuMapper; import com.iformall.mapper.MallPermissionMapper; +import com.iformall.mapper.WxLogicPermissionMapper; import com.iformall.service.MallPermissionService; import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallRoleService; @@ -63,6 +62,9 @@ public class SysMenuController extends BaseController { @Autowired private MallPermissionMapper mallPermissionMapper; + @Autowired + private WxLogicPermissionMapper permissionMapper; + @ApiOperation("导航菜单") @GetMapping("/nav") public ResultData nav(){ @@ -180,6 +182,9 @@ public class SysMenuController extends BaseController { for(MallPermission mp: mpList) { if (mallRolePermissionList.stream().anyMatch(mallRolePermission -> mp.getId().equals(mallRolePermission.getPermissionId()))) continue; + // TODO 过滤招商权限 + if(Objects.equals(mp.getParentId(),11L)) + continue; // 3.1 添加到mall_role_permission try { mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ @@ -592,5 +597,68 @@ public class SysMenuController extends BaseController { } } + /** + * 初始化超过招商权限 + * + * @return + */ + @GetMapping("/addInvestPerm") + public ResultData addInvestPerm() { + try { + MallUserInfo userInfo = getUser(); + if (userInfo.isFmSuperAdmin()) { + doAddInvestPerm(); + return new ResultData(); + } + } catch (Exception e) { + logger.error("DataInitController::fixCredit error ", e); + return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR, e.getMessage()); + } + + return new ResultData(); + } + + private void doAddInvestPerm() { + WxLogicPermission logicPermissions = permissionMapper.selectById(1L); + List investAdminList = JSON.parseArray(logicPermissions.getPermission(), Long.class); + // 1. 获取已有管理员 + MallRole mrQ = new MallRole(); + mrQ.setName("系统管理员"); + mrQ.setAvailable("0"); + List mallRoleList = mallRoleService.getList(mrQ); + // 2. 获取全部permission + MallPermission mpQ = new MallPermission(); + mpQ.setAvailable("Y"); + List mpList = mallPermissionService.getList(mpQ); + for (MallRole mallRole : mallRoleList) { + MallRolePermission qRP = new MallRolePermission(); + qRP.setRoleId(mallRole.getId()); + List mallRolePermissionList = mallRolePermissionService.getList(qRP); + //if (mpList.size() != mallRolePermissionList.size()) { + // 3. permission不一致, 添加到mall_role_permission + for (MallPermission mp : mpList) { + if (mallRolePermissionList.stream().anyMatch(mallRolePermission -> mp.getId().equals(mallRolePermission.getPermissionId()))) + continue; + //过滤非招商权限 + if (!investAdminList.contains(mp.getId())) { + continue; + } + // 3.1 添加到mall_role_permission + try { + MallRolePermission perm = new MallRolePermission() {{ + updateTenantInfo(mallRole); + setPermissionId(mp.getId()); + setRoleId(mallRole.getId()); + }}; + mallRolePermissionService.saveOrUpdate(perm); + logger.info("add perm {}", JSON.toJSONString(perm)); + } catch (Exception e) { + logger.error(e.getMessage()); + } + } + //} + } + } + } From 9b0ede88afed14df2d29f554cd16002c1692966d Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 6 Nov 2019 14:32:02 +0800 Subject: [PATCH 06/12] =?UTF-8?q?[=E6=8B=9B=E5=95=86=E6=9D=83=E9=99=90]?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/sys/SysMenuController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9c8a4780b..4bd20a7aa 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -611,7 +611,7 @@ public class SysMenuController extends BaseController { return new ResultData(); } } catch (Exception e) { - logger.error("DataInitController::fixCredit error ", e); + logger.error("SysMenuController::addInvestPerm error ", e); return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR, e.getMessage()); } From 1b71d9773fb76f6bf7f2e6103cfc0c923d8ba3e3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 6 Nov 2019 14:32:58 +0800 Subject: [PATCH 07/12] =?UTF-8?q?[=E5=95=86=E6=88=B7=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=88=97=E8=A1=A8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=8A=E8=AF=A6=E6=83=85]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 54702a4d1..5bb2a53c7 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -426,8 +426,8 @@