Browse Source

返回消息修改

yangzian 3 năm trước cách đây
mục cha
commit
f1d1b3d125

+ 6 - 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -213,6 +213,12 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ai/projectCreate/*", "anon");
         filterChainDefinitionMap.put("/cwjsPolicyInfo/**", "anon");
 
+        filterChainDefinitionMap.put("/exportReportController/**", "anon");
+        filterChainDefinitionMap.put("/settLementController/**", "anon");
+        filterChainDefinitionMap.put("/settLementFileController/**", "anon");
+        filterChainDefinitionMap.put("/ctop/projectMember/**", "anon");
+
+
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<>(1);
         filterMap.put("jwt", new JwtFilter());

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -281,7 +281,7 @@ public class CwjsPolicyInfoController {
 		pageInfo.setTotal(cwjsPolicyInfoList.size());
 		pageInfo.setPageSize(pageSize);
 		pageInfo.setPageNum(pageNo);
-		return Result.successMsg("成功",pageInfo);
+		return Result.successMsg("成功",pageInfo);
 	}
 
 

+ 3 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementController.java

@@ -103,7 +103,7 @@ public class SettlementController {
         if ("admin".equals(roleCode)){
             //查询所有销售 && 媒介
             List allSaleList = cwjsPolicyInfoService.getAllSaleAndMeidaManager();
-            return Result.successMsg("查询所有销售和媒介用户",allSaleList);
+            return Result.successMsg("查询所有销售和媒介用户",allSaleList);
 
         }else if ("saleDirector".equals(roleCode) || //销售总监
                 "kuaishou_operations_director".equals(roleCode) || //快手运营总监
@@ -117,7 +117,7 @@ public class SettlementController {
             ids = materialReportOverViewService.recursiveQuerySubordinate(userId);
         }
         List<Map<String,Object>> list = settlementInfoService.getUserByIds(ids);
-        return Result.successMsg("查询用户",list);
+        return Result.successMsg("查询用户",list);
     }
 
 
@@ -126,7 +126,7 @@ public class SettlementController {
     @GetMapping("/getAllOperationUser")
     public Result getAllOperationUser() {
         List<Map<String,Object>> list = cwjsPolicyInfoService.getAllOperationUser();
-        return Result.successMsg("查询运营用户列表",list);
+        return Result.successMsg("查询运营用户列表",list);
     }
 
 

+ 7 - 7
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -87,7 +87,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             List<String> accountIdList = reportSettlementMapper.getAccountIdBytedance(paramsVo);
 
             if (Check.isNull(accountIdList)){
-                return Result.errorMsg("该广告主和产品下无法查询到绑定的账户信息");
+                return Result.errorMsg("该广告主和产品下无法查询到绑定的账户信息");
             }
 
             int num = 0;
@@ -226,7 +226,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             }
 
             if(accountIdList.size() == num){
-                return Result.errorMsg("暂无账户流水数据");
+                return Result.errorMsg("暂无账户流水数据");
             }
 
             response.setCharacterEncoding("UTF-8");
@@ -273,7 +273,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             List<String> accountIdList = reportSettlementMapper.getAccountIdBytedance(paramsVo);
 
             if (Check.isNull(accountIdList)){
-                return Result.errorMsg("该广告主和产品下无法查询到绑定的快手账户信息");
+                return Result.errorMsg("该广告主和产品下无法查询到绑定的快手账户信息");
             }
 
             int num = 0;
@@ -413,7 +413,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             }
 
             if(accountIdList.size() == num){
-                return Result.errorMsg("暂无数据");
+                return Result.errorMsg("暂无数据");
             }
 
             response.setCharacterEncoding("UTF-8");
@@ -455,7 +455,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             //查询 头条利润表 时间段内 所有 账户
             List<Map<String,Object>> list = reportSettlementMapper.getProfitBytedanceAccountCost(null,paramsVo.getStartTime(),paramsVo.getEndTime());
             if (Check.isNull(list)){
-                return Result.errorMsg("暂无数据");
+                return Result.errorMsg("暂无数据");
             }
             List<ProfitReportBytedanceVo> resultList = new ArrayList<>(list.size());
             for (Map<String, Object> map : list) {
@@ -584,7 +584,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             //查询 快手利润表  时间段内的 所有账户
             List<Map<String,Object>> list = reportSettlementMapper.getProfitKuaiShouAccountCost(null,paramsVo.getStartTime(),paramsVo.getEndTime());
             if (Check.isNull(list)){
-                return Result.errorMsg("暂无数据");
+                return Result.errorMsg("暂无数据");
             }
             List<ProfitReportKuaiShouVo> resultList = new ArrayList<>(list.size());
             for (Map<String, Object> map : list) {
@@ -741,7 +741,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             String msg = MessageFormat.format(message,userMap.get("userName").toString(),month,productNum,accountNum,productInfo);
             corpWexinUtils.sendMessageByWeChatId(jsonObject,msg);
         }
-        return Result.successMsg("成功",null);
+        return Result.successMsg("成功",null);
     }
 
 

+ 5 - 5
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementFileInfoServiceImpl.java

@@ -135,7 +135,7 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
 
 
         PageInfo<Map<String,String>> pageInfo = new PageInfo<>(list);
-        return Result.successMsg("财务结算-结算单列表查询成功", pageInfo);
+        return Result.successMsg("财务结算-结算单列表查询成功", pageInfo);
     }
 
 
@@ -150,7 +150,7 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
     @Override
     public Result deleteSettlementFile(SettlementFileParamsVo paramsVo) {
         settlementFileInfoMapper.deleteSettlementFile(paramsVo);
-        return Result.successMsg("删除成功",null);
+        return Result.successMsg("删除成功",null);
     }
 
 
@@ -171,12 +171,12 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
             Map<String,String> map = settlementFileInfoMapper.getSettlementAccount(settlement.getAccountId(),String.valueOf(settlementFileInfo.getMediaId()));
             if (Check.isNull(map)){
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return Result.errorMsg("无法查询到账户【"+settlement.getAccountId()+"】信息,请到账户列表上传正确的账户信息");
+                return Result.errorMsg("无法查询到账户【"+settlement.getAccountId()+"】信息,请到账户列表上传正确的账户信息");
             }
             BeanUtils.copyProperties(settlementFileInfo,settlement,SettlementUtil.getNullPropertyNames(settlementFileInfo));
             settlementFileInfoMapper.insert(settlement);
         }
-        return Result.successMsg("账户截图上传成功",null);
+        return Result.successMsg("账户截图上传成功",null);
     }
 
 
@@ -189,7 +189,7 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
     @Override
     public Result getAccountNumAndImgNum(SettlementFileParamsVo paramsVo) {
         Map<String,String> map =  settlementFileInfoMapper.getAccountNumAndImgNum(paramsVo);
-        return Result.successMsg("查询账户数量以及图片数量成功",map);
+        return Result.successMsg("查询账户数量以及图片数量成功",map);
 
     }
 

+ 4 - 4
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementInfoServiceImpl.java

@@ -61,7 +61,7 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
         PageHelper.startPage(pageNo, pageSize);
         List<CtopCwjsSettlementInfo> list = settlementInfoMapper.getSettlementList(settlementInfo);
         PageInfo<CtopCwjsSettlementInfo> pageInfo = new PageInfo<>(list);
-        return Result.successMsg("财务结算-账户列表查询成功", pageInfo);
+        return Result.successMsg("财务结算-账户列表查询成功", pageInfo);
     }
 
 
@@ -89,7 +89,7 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
         }
 
 
-        return Result.successMsg("财务结算-修改账户状态成功", null);
+        return Result.successMsg("财务结算-修改账户状态成功", null);
     }
 
 
@@ -149,7 +149,7 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
     @Override
     public Result deleteSettlementById(Long id) {
         settlementInfoMapper.deleteSettlementById(id);
-        return Result.successMsg("财务结算-删除成功。.", null);
+        return Result.successMsg("财务结算-删除成功", null);
     }
 
 
@@ -187,7 +187,7 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
                 importParams.setNeedCheckOrder(true);
                 ExcelImportResult<AccountImportVo> importResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AccountImportVo.class,importParams);
                 if (importResult.getList().size() < 1){
-                    return Result.error("读取Excel失败,数据不能为空,请重新检查数据并导入");
+                    return Result.error("读取Excel失败,数据不能为空,请重新检查数据并导入");
                 }
 
                 for (AccountImportVo importVo : importResult.getList()) {