浏览代码

Merge branch 'master' into V2.0.1

zhaoxian 3 年之前
父节点
当前提交
2beafc5309
共有 16 个文件被更改,包括 443 次插入19 次删除
  1. 7 6
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java
  2. 1 1
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyApprovalLogMapper.xml
  3. 3 3
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java
  4. 2 2
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementFileInfoMapper.xml
  5. 3 3
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialStareMapper.xml
  6. 57 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/AgentConfig.java
  7. 5 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/Project.java
  8. 15 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/AgentConfigMapper.java
  9. 5 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/AgentConfigMapper.xml
  10. 18 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IAgentConfigService.java
  11. 1 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IOauthAgentTokenService.java
  12. 41 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/AgentConfigServiceImpl.java
  13. 20 2
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java
  14. 9 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/OauthAgentTokenServiceImpl.java
  15. 241 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AgentConfigController.java
  16. 15 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/TransferAccountServiceImpl.java

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

@@ -122,10 +122,10 @@ public class CwjsPolicyInfoController {
 	 private ICwjsCompanySubjectService cwjsCompanySubjectService;
 	 /**
 	  * 审核-master
-	  * @param id 政策id
-	  * @param type 类型
-	  * @param userId 用户id
-	  * @param approvalContent 审核内容
+	  *  id 政策id
+	  *  type 类型
+	  *  userId 用户id
+	  *  approvalContent 审核内容
 	  * @return
 	  */
 	 @PostMapping(value = "/policyApproval")
@@ -295,7 +295,7 @@ public class CwjsPolicyInfoController {
 			 }
 
 			 //老板
-			 if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")) {
+			 if (approvalUser.equals(userId) && userId.equals("4aba62011120ac565c7f2b9f8f4aa96b")) {
 				 cwjsPolicyInfo.setApprovedStatus(3);
 				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
@@ -472,7 +472,7 @@ public class CwjsPolicyInfoController {
 				cwjsPolicy.setTheBossRight("no");
 				if(cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4){
 					if (StringUtils.equals(cwjsPolicy.getApprovedProgress(),directorUserId) && directorUserId.equals(userId)
-							&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
+							&& !"4aba62011120ac565c7f2b9f8f4aa96b".equals(userId)){
 
 						if(examineUser.getString("departName").contains("渠道")){
 							cwjsPolicy.setTheBossRight("yes");
@@ -956,6 +956,7 @@ public class CwjsPolicyInfoController {
 	 }
 
 
+
 	 @ApiOperation(value="政策作废", notes="政策作废")
 	 @GetMapping(value = "/toVoidpolicy")
 	 public Result toVoidpolicy(@RequestParam(name="policyId") String policyId,

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyApprovalLogMapper.xml

@@ -36,7 +36,7 @@
     <select id="getBossOneByPolicyId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog">
         select * from ctop_cwjs_policy_approval_log
         where policy_id = #{policyId}
-          and create_user_id = '80e747cdea6f41dbbc8cde23046fd4e0'
+          and create_user_id = '4aba62011120ac565c7f2b9f8f4aa96b'
         order by create_time desc
             LIMIT 1
     </select>

+ 3 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -189,8 +189,8 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
     @Override
     public void automaticConveyBossExamine(CwjsPolicyInfo cwjsPolicyInfo) {
         cwjsPolicyInfo.setApprovedStatus(2);
-        cwjsPolicyInfo.setApprovedProgress("80e747cdea6f41dbbc8cde23046fd4e0");	//设置 boss 为审核人员
-        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("80e747cdea6f41dbbc8cde23046fd4e0");
+        cwjsPolicyInfo.setApprovedProgress("4aba62011120ac565c7f2b9f8f4aa96b");	//设置 boss 为审核人员
+        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("4aba62011120ac565c7f2b9f8f4aa96b");
         StringBuilder text = new StringBuilder();
         text.append("您有一条销售政策需要审核,该客户为:");
         text.append(cwjsPolicyInfo.getCompanyName());
@@ -263,7 +263,7 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
 
         for (String userId : userList) {
             //给销售总监发送
-            JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("80e747cdea6f41dbbc8cde23046fd4e0");
+            JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(userId);
             StringBuilder text = new StringBuilder();
             text.append(cwjsPolicyInfo.getCreateUserName()+"创建的政策,客户为:"+cwjsPolicyInfo.getCompanyName());
             text.append(",该销售政策已作废。");

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementFileInfoMapper.xml

@@ -111,7 +111,7 @@
         (SELECT su.realname FROM sys_user su  LEFT JOIN ctop_cwjs_settlement_info cwjs1  on su.id = cwjs1.create_user_id LIMIT 1 )
         ) as saleUserName,
         f.create_user_id AS operateUserId,
-        (SELECT su.realname FROM sys_user su  LEFT JOIN ctop_cwjs_settlement_file_info f1  on su.id = f1.create_user_id LIMIT 1 ) as operateUserName,
+        (SELECT su.realname FROM sys_user su  where su.id = f.create_user_id LIMIT 1 ) as operateUserName,
         MAX(f.create_time) create_time,
         MAX(f.update_time) update_time
         FROM
@@ -151,7 +151,7 @@
                 AND t.uploadYears &lt;= #{endTime}
             </if>
             <if test="createUserName !=null and createUserName != ''">
-                AND t.operateUserId like concat ('%',#{createUserName},'%')
+                AND t.operateUserName like concat ('%',#{createUserName},'%')
             </if>
 
             <if test="saleUserIds !=null and saleUserIds.size() >0 ">

+ 3 - 3
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialStareMapper.xml

@@ -205,7 +205,7 @@
         ORDER BY SUM( d.charge ) DESC
     </select>
 
-    <!-- 快手 -查询项目数据信息 test-->
+    <!-- 快手 -查询项目数据信息 master-->
     <select id="getKuaiShouOperateProjectInfo" resultType="org.jeecg.ctop.material.entity.vo.KuaiShouOperateProjectVo">
         SELECT
         SUM( d.charge ) AS totalCost,
@@ -283,7 +283,7 @@
         IF(SUM( d.event_pay ) / ( SUM( d.activation ) + SUM( d.form_count )) > 0.0001,CONCAT(ROUND( SUM( d.event_pay ) / ( SUM( d.activation ) + SUM( d.form_count )) * 100, 2 ),'%'),0.00) AS eventPayRate,
         IFNULL(SUM( d.event_new_user_pay ),0) AS eventNewUserPay,
         IFNULL(ROUND( SUM( d.charge ) / SUM( d.event_new_user_pay ), 2 ),0) AS eventNewUserPayCost,
-        IFNULL(ROUND( SUM( d.event_new_user_pay ) / ( SUM( d.activation ) + SUM( d.form_count )), 2 ),0.00) AS eventNewUserPayRate,
+        IFNULL(ROUND( SUM( d.event_new_user_pay ) / ( SUM( d.activation ) + SUM( d.form_count )), 2 ),0) AS eventNewUserPayRate,
         IFNULL(SUM( d.event_app_invoked ),0) AS eventAppInvoked,
         IFNULL(ROUND( SUM( d.charge ) / SUM( d.event_app_invoked ), 2 ),0) AS eventAppInvokedCost,
         IFNULL(SUM( d.event_register ),0) AS eventRegister,
@@ -1160,6 +1160,7 @@
 
 
 
+
     <select id="getColumnInfo" resultType="com.alibaba.fastjson.JSONObject">
 
         select json from ctop_column_load where user_id = #{userId} and column_type = #{columnType}
@@ -1167,5 +1168,4 @@
     </select>
 
 
-
 </mapper>

+ 57 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/AgentConfig.java

@@ -0,0 +1,57 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2022-05-17
+ */
+@Data
+@TableName("ctop_agent_config")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_agent_config对象", description = "代理商配置")
+public class AgentConfig {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * agentCode
+     */
+    @Excel(name = "agentCode", width = 15)
+    @ApiModelProperty(value = "agentCode")
+    private Long agentCode;
+    /**
+     * agentName
+     */
+    @Excel(name = "agentName", width = 15)
+    @ApiModelProperty(value = "agentName")
+    private String agentName;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/Project.java

@@ -150,4 +150,9 @@ public class Project {
     //深度转化目标
     @TableField(exist = false)
     private JSONArray deepConversionTypeArray;
+
+    private Long agentCode;
+    @TableField(exist = false)
+    private String agentCode_dictText;
+
 }

+ 15 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/AgentConfigMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.AgentConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * 2022-05-17
+ * @version V1.0
+ */
+public interface AgentConfigMapper extends BaseMapper<AgentConfig> {
+
+}

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/AgentConfigMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.common.module.mapper.AgentConfigMapper">
+
+</mapper>

+ 18 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IAgentConfigService.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.AgentConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * 2022-05-17
+ * @version V1.0
+ */
+public interface IAgentConfigService extends IService<AgentConfig> {
+
+    Map<Long, String> getAgentMap();
+}

+ 1 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IOauthAgentTokenService.java

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IOauthAgentTokenService extends IService<OauthAgentToken> {
 
+    OauthAgentToken getTokenByAppId(Long appId);
 }

+ 41 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/AgentConfigServiceImpl.java

@@ -0,0 +1,41 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.AgentConfig;
+import cn.com.ctop.common.module.mapper.AgentConfigMapper;
+import cn.com.ctop.common.module.service.IAgentConfigService;
+import cn.com.ctop.common.module.utils.Check;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * 2022-05-17
+ * @version V1.0
+ */
+@Service
+public class AgentConfigServiceImpl extends ServiceImpl<AgentConfigMapper, AgentConfig> implements IAgentConfigService {
+    @Autowired
+    private AgentConfigMapper agentConfigMapper;
+
+    @Override
+    public Map<Long, String> getAgentMap() {
+        Map<Long, String> agentMap = new HashMap<>();
+        QueryWrapper<AgentConfig> queryWrapper = new QueryWrapper();
+        List<AgentConfig> agentConfigs = agentConfigMapper.selectList(queryWrapper);
+        if (!Check.isNull(agentConfigs)) {
+            for (AgentConfig agentConfig : agentConfigs) {
+                agentMap.put(agentConfig.getAgentCode(), agentConfig.getAgentName());
+            }
+        }
+
+        return agentMap;
+    }
+}

+ 20 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -5,6 +5,7 @@ import cn.com.ctop.common.module.entity.OauthAgentToken;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.mapper.OauthAgentTokenMapper;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.IOauthAgentTokenService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.common.module.utils.PropertiesUtils;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.context.XxlJobHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -45,12 +47,21 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
     @Resource
     private OauthAgentTokenMapper agentTokenMapper;
 
+    @Autowired
+    private IOauthAgentTokenService agentTokenService;
     @Override
     public CtopOauthToken getOauthTokenByAccountId(String accountId) {
         QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("account_id", accountId).orderByDesc("create_time");
         queryWrapper.last("limit 1");
-        return this.getOne(queryWrapper);
+        CtopOauthToken one = this.getOne(queryWrapper);
+        if (one.getMediaId().equals("2") || one.getMediaId().equals("4")) {
+            OauthAgentToken tokenByAppId = agentTokenService.getTokenByAppId(one.getAppId());
+            if (!Check.isNull(tokenByAppId)) {
+                one.setAccessToken(tokenByAppId.getAccessToken());
+            }
+        }
+        return one;
     }
 
 
@@ -59,7 +70,14 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("account_id", accountId).orderByDesc("create_time");
         queryWrapper.last("limit 1");
-        return this.getOne(queryWrapper);
+        CtopOauthToken one = this.getOne(queryWrapper);
+        if (one.getMediaId().equals("2") || one.getMediaId().equals("4")) {
+            OauthAgentToken tokenByAppId = agentTokenService.getTokenByAppId(one.getAppId());
+            if (!Check.isNull(tokenByAppId)) {
+                one.setAccessToken(tokenByAppId.getAccessToken());
+            }
+        }
+        return one;
     }
 
     /**

+ 9 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/OauthAgentTokenServiceImpl.java

@@ -3,6 +3,7 @@ package cn.com.ctop.common.module.service.impl;
 import cn.com.ctop.common.module.entity.OauthAgentToken;
 import cn.com.ctop.common.module.mapper.OauthAgentTokenMapper;
 import cn.com.ctop.common.module.service.IOauthAgentTokenService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -16,4 +17,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class OauthAgentTokenServiceImpl extends ServiceImpl<OauthAgentTokenMapper, OauthAgentToken> implements IOauthAgentTokenService {
 
+    @Override
+    public OauthAgentToken getTokenByAppId(Long appId) {
+        QueryWrapper<OauthAgentToken> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("app_id",appId);
+        queryWrapper.last("limit 1");
+        OauthAgentToken one = this.getOne(queryWrapper);
+        return one;
+    }
 }

+ 241 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AgentConfigController.java

@@ -0,0 +1,241 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.entity.AgentConfig;
+import cn.com.ctop.common.module.service.IAgentConfigService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2022-05-17
+ */
+@Slf4j
+@Api(tags = "代理商配置")
+@RestController
+@RequestMapping("/agent/agentConfig")
+public class AgentConfigController {
+    @Autowired
+    private IAgentConfigService agentConfigService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param agentConfig
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-分页列表查询", notes = "代理商配置-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AgentConfig>> queryPageList(AgentConfig agentConfig,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        Result<IPage<AgentConfig>> result = new Result<>();
+        QueryWrapper<AgentConfig> queryWrapper = QueryGenerator.initQueryWrapper(agentConfig, req.getParameterMap());
+        Page<AgentConfig> page = new Page<AgentConfig>(pageNo, pageSize);
+        IPage<AgentConfig> pageList = agentConfigService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param agentConfig
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-添加", notes = "代理商配置-添加")
+    @PostMapping(value = "/add")
+    public Result<AgentConfig> add(@RequestBody AgentConfig agentConfig) {
+        Result<AgentConfig> result = new Result<>();
+        try {
+            agentConfigService.save(agentConfig);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param agentConfig
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-编辑", notes = "代理商配置-编辑")
+    @PutMapping(value = "/edit")
+    public Result<AgentConfig> edit(@RequestBody AgentConfig agentConfig) {
+        Result<AgentConfig> result = new Result<AgentConfig>();
+        AgentConfig agentConfigEntity = agentConfigService.getById(agentConfig.getId());
+        if (agentConfigEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = agentConfigService.updateById(agentConfig);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-通过id删除", notes = "代理商配置-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id") String id) {
+        try {
+            agentConfigService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-批量删除", notes = "代理商配置-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<AgentConfig> deleteBatch(@RequestParam(name = "ids") String ids) {
+        Result<AgentConfig> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.agentConfigService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-通过id查询", notes = "代理商配置-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AgentConfig> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<AgentConfig> result = new Result<>();
+        AgentConfig agentConfig = agentConfigService.getById(id);
+        if (agentConfig == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(agentConfig);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<AgentConfig> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                AgentConfig agentConfig = JSON.parseObject(deString, AgentConfig.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(agentConfig, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<AgentConfig> pageList = agentConfigService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "代理商配置列表");
+        mv.addObject(NormalExcelConstants.CLASS, AgentConfig.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("代理商配置列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<AgentConfig> listAgentConfigs = ExcelImportUtil.importExcel(file.getInputStream(), AgentConfig.class, params);
+                agentConfigService.saveBatch(listAgentConfigs);
+                return Result.ok("文件导入成功!数据行数:" + listAgentConfigs.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 15 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/TransferAccountServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.service.impl;
 
 import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.service.IAgentConfigService;
 import cn.com.ctop.common.module.service.IProductService;
 import cn.com.ctop.common.module.service.ISupplierListService;
 import cn.com.ctop.common.module.service.ISysUserService;
@@ -43,6 +44,8 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
     private IProductService productService;
     @Autowired
     private ISupplierListService supplierListService;
+    @Autowired
+    private IAgentConfigService agentConfigService;
 
     @Override
     public List<JSONObject> selectCost(Long accountId, String startDate, String endDate) {
@@ -55,6 +58,7 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
         return transferAccountMapper.getAccountQuarterDetail(accountId, startDate, endDate);
     }
 
+
     @Override
     public List<Project> getTransferInfoListByList(List<Project> records) {
         if (Check.isNull(records)) {
@@ -119,6 +123,9 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
             }
         }
 
+
+        Map<Long, String> agentMap = agentConfigService.getAgentMap();
+
         for (Project project : records) {
             if (!Check.isNullMap(advertiserMap)) {
                 project.setAdvertiserId_dictText(advertiserMap.get(project.getAdvertiserId()));
@@ -137,12 +144,18 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
             if (!Check.isNullMap(supplierMap)) {
                 project.setSupplierCode_dictText(supplierMap.get(project.getSupplierCode()));
             }
-            if (!Check.isNull(project.getOcpxActionType())&&!project.getOcpxActionType().isEmpty()) {
+            if (!Check.isNull(project.getOcpxActionType()) && !project.getOcpxActionType().isEmpty()) {
                 project.setOcpxActionTypeArray(JSONArray.parseArray(project.getOcpxActionType()));
             }
-            if (!Check.isNull(project.getDeepConversionType())&&!project.getDeepConversionType().isEmpty()) {
+            if (!Check.isNull(project.getDeepConversionType()) && !project.getDeepConversionType().isEmpty()) {
                 project.setDeepConversionTypeArray(JSONArray.parseArray(project.getDeepConversionType()));
             }
+            if (!Check.isNullMap(agentMap)) {
+                if (!Check.isNull(project.getAgentCode())) {
+                    project.setAgentCode_dictText(agentMap.get(project.getAgentCode()));
+                }
+
+            }
         }
         return records;
     }