diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 36a723781..c62d18daf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -149,10 +149,10 @@ public class WxProjectConfigController extends BaseController { if(wxMall.getId() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - TenantEntity TenantEntity = new TenantEntity(){{ - setTenantId(wxMall.getId().toString()); - }}; - WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxMall.getId().toString()); + + WxMall parentWxMall = wxMallService.getByTenantInfo(tenantEntity); if(parentWxMall == null || parentWxMall.getSaleType() != 100 || !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ @@ -558,74 +558,72 @@ public class WxProjectConfigController extends BaseController { map.put("wxMall",wxMall); List subWxMall = wxMallService.getSubByParentTenantId(wxMall.getTenantId()); map.put("subWxMall",subWxMall); - WxCouponSendConfig wxCouponSendConfig = new WxCouponSendConfig(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxCouponSendConfig wxCouponSendConfig = new WxCouponSendConfig(); + wxCouponSendConfig.setTenantId(wxMall.getTenantId()); List wxCouponSendConfigList = wxCouponSendConfigService.findList(wxCouponSendConfig); map.put("wxCouponSendConfigList",wxCouponSendConfigList); - WxScoreRules wxScoreRules = new WxScoreRules(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxScoreRules wxScoreRules = new WxScoreRules(); + wxScoreRules.setTenantId(wxMall.getTenantId()); List wxScoreRulesList = wxScoreRulesService.findList(wxScoreRules); map.put("wxScoreRulesList",wxScoreRulesList); - WxTemplateMsg wxTemplateMsg = new WxTemplateMsg(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxTemplateMsg wxTemplateMsg = new WxTemplateMsg(); + wxTemplateMsg.setTenantId(wxMall.getTenantId()); + List wxTemplateMsgList = wxTemplateMsgService.findList(wxTemplateMsg); map.put("wxTemplateMsgList",wxTemplateMsgList); - WxQuestion wxQuestion = new WxQuestion(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxQuestion wxQuestion = new WxQuestion(); + wxQuestion.setTenantId(wxMall.getTenantId()); + List wxQuestionList = wxQuestionService.findList(wxQuestion); map.put("wxQuestionList",wxQuestionList); - WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); + wxMsgValidationcodeModel.setTenantId(wxMall.getTenantId()); + List wxMsgValidationcodeModelList = wxMsgValidationcodeModelService.findList(wxMsgValidationcodeModel); map.put("wxMsgValidationcodeModelList",wxMsgValidationcodeModelList); - WxFlowConfig wxFlowConfig = new WxFlowConfig(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxFlowConfig wxFlowConfig = new WxFlowConfig(); + wxFlowConfig.setTenantId(wxMall.getTenantId()); + List wxFlowConfigList = wxFlowConfigService.findList(wxFlowConfig); map.put("wxFlowConfigList",wxFlowConfigList); - TenantEntity tenantEntity = new TenantEntity() {{ - setTenantId(wxMall.getTenantId()); - }}; + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxMall.getTenantId()); + ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(tenantEntity); map.put("wxMallBuildingFloorList",wxMallBuildingFloorList.data); WxPayAccount wxPayAccount = wxPayAccountService.getByTenantId(wxMall.getTenantId()); map.put("wxPayAccount",wxPayAccount); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxMall.getTenantId()); map.put("wxPayAccountBill",wxPayAccountBill); - WxAppinfo wxAppinfo = new WxAppinfo() {{ - setTenantId(wxMall.getTenantId()); - }}; + WxAppinfo wxAppinfo = new WxAppinfo(); + wxAppinfo.setTenantId(wxMall.getTenantId()); + List wxAppinfoList = wxAppinfoService.getList(wxAppinfo); map.put("wxAppinfoList",wxAppinfoList); - MallUserInfo mallUserInfo = new MallUserInfo() {{ - setTenantId(wxMall.getTenantId()); - setIsAdmin(1); - }}; + MallUserInfo mallUserInfo = new MallUserInfo(); + mallUserInfo.setTenantId(wxMall.getTenantId()); + mallUserInfo. setIsAdmin(1); + List mallUserInfoList = mallUserInfoService.findList(mallUserInfo); map.put("mallUserInfoList",mallUserInfoList); - WxMsgConfig wxMsgConfig = new WxMsgConfig() {{ - setTenantId(wxMall.getTenantId()); - }}; + WxMsgConfig wxMsgConfig = new WxMsgConfig(); + wxMsgConfig.setTenantId(wxMall.getTenantId()); + WxMsgConfig wxMsgConfigObject = wxMsgConfigService.findObject(wxMsgConfig); map.put("wxMsgConfig",wxMsgConfigObject); - WxPark wxPark = new WxPark(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxPark wxPark = new WxPark(); + wxPark.setTenantId(wxMall.getTenantId()); + WxPark wxParkObj = wxParkService.getByObj(wxPark); map.put("wxPark",wxParkObj); - WxWiWideInfo wxWiWideInfo = new WxWiWideInfo(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxWiWideInfo wxWiWideInfo = new WxWiWideInfo(); + wxWiWideInfo.setTenantId(wxMall.getTenantId()); + WxWiWideInfo wxWiWideInfoObject = wxWiWideInfoService.findObject(wxWiWideInfo); map.put("wxWiWideInfo",wxWiWideInfoObject); - WxWeappInfo wxWeappInfo = new WxWeappInfo(){{ - setTenantId(wxMall.getTenantId()); - }}; + WxWeappInfo wxWeappInfo = new WxWeappInfo(); + wxWeappInfo.setTenantId(wxMall.getTenantId()); + List wxAuthorizerInfoList = wxAuthorizerInfoService.getList(wxWeappInfo); map.put("wxAuthorizerInfoList",wxAuthorizerInfoList); @@ -652,10 +650,9 @@ public class WxProjectConfigController extends BaseController { // if(subTenantIds == null || subTenantIds.length == 0){ // return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); // } - TenantEntity TenantEntity = new TenantEntity(){{ - setTenantId(tenantId); - }}; - WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + WxMall parentWxMall = wxMallService.getByTenantInfo(tenantEntity); if(parentWxMall == null || parentWxMall.getSaleType() != 100 || !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 7cd88acfb..47523890e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -138,10 +138,10 @@ public class WxCreditHistoryController extends BaseController { @ApiOperation("积分清零计划") - @GetMapping("clearCreditByYear") + @PostMapping("clearCreditByYear") @SystemControllerLog(description = "积分清零计划") @TenantIgnore - public ResultData clearCreditByYear(@ModelAttribute WxCreditHistory wxCreditHistory) { + public ResultData clearCreditByYear(@RequestBody WxCreditHistory wxCreditHistory) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::clearCreditByYear"); if(wxCreditHistory == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java index c7511943d..6d8994969 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java @@ -33,6 +33,6 @@ public interface WxCreditHistoryMapper extends CommonMapper - {call user_credit_clear(#{cutOffDate},#{finalTableIndex})} diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java index 574d6cd2c..e69fec026 100644 --- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java +++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java @@ -94,10 +94,10 @@ public class ShardingSpherePlugin implements MyBatisPlus { //if (method != null) { // IgnoreSharding ignore = method.getAnnotation(IgnoreSharding.class); // if (null == ignore) { - Object parameterObject = metaStatementHandler.getValue("delegate.boundSql.parameterObject"); - BoundSql boundSql = statementHandler.getBoundSql(); - String newSQL = buildTable(boundSql,parameterObject,chainMap); - metaStatementHandler.setValue("delegate.boundSql.sql", newSQL); +// Object parameterObject = metaStatementHandler.getValue("delegate.boundSql.parameterObject"); +// BoundSql boundSql = statementHandler.getBoundSql(); +// String newSQL = buildTable(boundSql,parameterObject,chainMap); +// metaStatementHandler.setValue("delegate.boundSql.sql", newSQL); // } //} //没有添加字段,只是根据字段分表,没有别的需要返回