瀏覽代碼

Merge branch 'test'

zhaoxian 2 年之前
父節點
當前提交
16119278b6
共有 27 個文件被更改,包括 2118 次插入44 次删除
  1. 1 0
      ruixuan-framework/src/main/java/com/ruixuan/framework/config/SecurityConfig.java
  2. 8 6
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java
  3. 79 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouAccountController.java
  4. 70 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouAdvertiserController.java
  5. 106 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouAgentAccountListController.java
  6. 70 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouProjectController.java
  7. 118 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouAccount.java
  8. 75 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouAdvertiser.java
  9. 165 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouAgentAccountList.java
  10. 106 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouProject.java
  11. 62 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAccountMapper.java
  12. 54 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAdvertiserMapper.java
  13. 65 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAgentAccountListMapper.java
  14. 54 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouProjectMapper.java
  15. 62 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAccountService.java
  16. 53 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAdvertiserService.java
  17. 65 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAgentAccountListService.java
  18. 53 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouProjectService.java
  19. 87 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAccountServiceImpl.java
  20. 76 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAdvertiserServiceImpl.java
  21. 93 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAgentAccountListServiceImpl.java
  22. 77 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouProjectServiceImpl.java
  23. 26 38
      ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml
  24. 138 0
      ruixuan-live/src/main/resources/mapper/jinniu/KuaishouAccountMapper.xml
  25. 96 0
      ruixuan-live/src/main/resources/mapper/jinniu/KuaishouAdvertiserMapper.xml
  26. 101 0
      ruixuan-live/src/main/resources/mapper/jinniu/KuaishouAgentAccountListMapper.xml
  27. 158 0
      ruixuan-live/src/main/resources/mapper/jinniu/KuaishouProjectMapper.xml

+ 1 - 0
ruixuan-framework/src/main/java/com/ruixuan/framework/config/SecurityConfig.java

@@ -123,6 +123,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/item/*").permitAll()
                 .antMatchers("/item/*").permitAll()
                 .antMatchers("/system/user/*").permitAll()
                 .antMatchers("/system/user/*").permitAll()
                 .antMatchers("/kuaishou/promoter/*").permitAll()
                 .antMatchers("/kuaishou/promoter/*").permitAll()
+                .antMatchers("/rx/**").permitAll()
 
 
                 // 除上面外的所有请求全部需要鉴权认证
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .anyRequest().authenticated()

+ 8 - 6
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java

@@ -640,9 +640,10 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                     JSONObject obj = new JSONObject();
                     JSONObject obj = new JSONObject();
                     obj.put("date", date);
                     obj.put("date", date);
                     obj.put("orderAmount", 0);
                     obj.put("orderAmount", 0);
-                    obj.put("totalRegimentalSettleAmount", 0);
+                    obj.put("regimentalPromotionAmount", 0);
                     obj.put("promoterCount", 0);
                     obj.put("promoterCount", 0);
                     obj.put("orderCount", 0);
                     obj.put("orderCount", 0);
+                    obj.put("validOrderCount", 0);
                     list.add(obj);
                     list.add(obj);
                 }
                 }
             }
             }
@@ -659,9 +660,9 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         JSONObject amount = supplyChainService.getMonthOrderAmountTotal(map);
         JSONObject amount = supplyChainService.getMonthOrderAmountTotal(map);
         if (Check.isNotNull(amount)) {
         if (Check.isNotNull(amount)) {
             data.put("orderAmount", amount.getInteger("orderAmount"));
             data.put("orderAmount", amount.getInteger("orderAmount"));
-            data.put("totalRegimentalSettleAmount", amount.getInteger("totalRegimentalSettleAmount"));
+            data.put("regimentalPromotionAmount", amount.getInteger("regimentalPromotionAmount"));
             data.put("orderAmountRate", amount.getString("orderAmountRate"));
             data.put("orderAmountRate", amount.getString("orderAmountRate"));
-            data.put("totalRegimentalSettleAmountRate", amount.getString("totalRegimentalSettleAmountRate"));
+            data.put("regimentalPromotionAmountRate", amount.getString("regimentalPromotionAmountRate"));
         }
         }
         JSONObject promoter = promoterService.getgetMonthPromoterTotal(userList, startDate, endDate);
         JSONObject promoter = promoterService.getgetMonthPromoterTotal(userList, startDate, endDate);
         if (Check.isNotNull(promoter)) {
         if (Check.isNotNull(promoter)) {
@@ -699,8 +700,9 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                         JSONObject obj = new JSONObject();
                         JSONObject obj = new JSONObject();
                         obj.put("date", date);
                         obj.put("date", date);
                         obj.put("orderAmount", 0);
                         obj.put("orderAmount", 0);
-                        obj.put("totalRegimentalSettleAmount", 0);
+                        obj.put("regimentalPromotionAmount", 0);
                         obj.put("orderCount", 0);
                         obj.put("orderCount", 0);
+                        obj.put("validOrderCount", 0);
                         list.add(obj);
                         list.add(obj);
                     }
                     }
                 }
                 }
@@ -716,9 +718,9 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
             JSONObject amount = supplyChainService.getMonthOrderAmountTotalByItems(map);
             JSONObject amount = supplyChainService.getMonthOrderAmountTotalByItems(map);
             if (Check.isNotNull(amount)) {
             if (Check.isNotNull(amount)) {
                 data.put("orderAmount", amount.getInteger("orderAmount"));
                 data.put("orderAmount", amount.getInteger("orderAmount"));
-                data.put("totalRegimentalSettleAmount", amount.getInteger("totalRegimentalSettleAmount"));
+                data.put("regimentalPromotionAmount", amount.getInteger("regimentalPromotionAmount"));
                 data.put("orderAmountRate", amount.getString("orderAmountRate"));
                 data.put("orderAmountRate", amount.getString("orderAmountRate"));
-                data.put("totalRegimentalSettleAmountRate", amount.getString("totalRegimentalSettleAmountRate"));
+                data.put("regimentalPromotionAmountRate", amount.getString("regimentalPromotionAmountRate"));
                 data.put("orderCount", amount.getString("orderCount"));
                 data.put("orderCount", amount.getString("orderCount"));
                 data.put("orderCountRate", amount.getString("orderCountRate"));
                 data.put("orderCountRate", amount.getString("orderCountRate"));
             }
             }

+ 79 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouAccountController.java

@@ -0,0 +1,79 @@
+package com.ruixuan.jinniu.controller;
+
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruixuan.common.core.controller.BaseController;
+import com.ruixuan.common.core.domain.AjaxResult;
+import com.ruixuan.common.core.page.TableDataInfo;
+import com.ruixuan.jinniu.entity.KuaishouAccount;
+import com.ruixuan.jinniu.service.IKuaishouAccountService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 账户Controller
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+@RestController
+@RequestMapping("/system/account")
+public class KuaishouAccountController extends BaseController {
+    @Autowired
+    private IKuaishouAccountService kuaishouAccountService;
+
+    /**
+     * 查询账户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:account:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(KuaishouAccount kuaishouAccount) {
+        startPage();
+        List<KuaishouAccount> list = kuaishouAccountService.selectKuaishouAccountList(kuaishouAccount);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取账户详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:account:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(kuaishouAccountService.selectKuaishouAccountById(id));
+    }
+
+    /**
+     * 新增账户
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody KuaishouAccount kuaishouAccount) {
+        return toAjax(kuaishouAccountService.insertKuaishouAccount(kuaishouAccount));
+    }
+
+    /**
+     * 修改账户
+     */
+    @PutMapping
+    public AjaxResult edit(@RequestBody KuaishouAccount kuaishouAccount) {
+        return toAjax(kuaishouAccountService.updateKuaishouAccount(kuaishouAccount));
+    }
+
+    /**
+     * 删除账户
+     */
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(kuaishouAccountService.deleteKuaishouAccountByIds(ids));
+    }
+}

+ 70 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouAdvertiserController.java

@@ -0,0 +1,70 @@
+package com.ruixuan.jinniu.controller;
+
+import com.ruixuan.common.core.controller.BaseController;
+import com.ruixuan.common.core.domain.AjaxResult;
+import com.ruixuan.common.core.page.TableDataInfo;
+import com.ruixuan.jinniu.entity.KuaishouAdvertiser;
+import com.ruixuan.jinniu.service.IKuaishouAdvertiserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 广告主Controller
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+@Api(tags = "广告主")
+@RestController
+@RequestMapping("/Kuaishou/advertiser")
+public class KuaishouAdvertiserController extends BaseController {
+    @Autowired
+    private IKuaishouAdvertiserService KuaishouAdvertiserService;
+
+    /**
+     * 查询广告主列表
+     */
+    @ApiOperation(value = "查询广告主列表")
+    @GetMapping("/list")
+    public TableDataInfo list(KuaishouAdvertiser kuaishouAdvertiser) {
+        startPage();
+        List<KuaishouAdvertiser> list = KuaishouAdvertiserService.selectKuaishouAdvertiserList(kuaishouAdvertiser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增广告主
+     */
+    @ApiOperation(value = "新增广告主")
+    @PostMapping(value = "/add")
+    public AjaxResult add(@RequestBody KuaishouAdvertiser kuaishouAdvertiser) {
+        return toAjax(KuaishouAdvertiserService.insertKuaishouAdvertiser(kuaishouAdvertiser));
+    }
+
+    /**
+     * 修改广告主
+     */
+    @ApiOperation(value = "修改广告主")
+    @PostMapping(value = "/edit")
+    public AjaxResult edit(@RequestBody KuaishouAdvertiser kuaishouAdvertiser) {
+        return toAjax(KuaishouAdvertiserService.updateKuaishouAdvertiser(kuaishouAdvertiser));
+    }
+
+    /**
+     * 获取广告主详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(KuaishouAdvertiserService.selectKuaishouAdvertiserById(id));
+    }
+}
+

+ 106 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouAgentAccountListController.java

@@ -0,0 +1,106 @@
+package com.ruixuan.jinniu.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruixuan.common.annotation.Log;
+import com.ruixuan.common.core.controller.BaseController;
+import com.ruixuan.common.core.domain.AjaxResult;
+import com.ruixuan.common.core.page.TableDataInfo;
+import com.ruixuan.common.enums.BusinessType;
+import com.ruixuan.common.utils.poi.ExcelUtil;
+import com.ruixuan.jinniu.entity.KuaishouAgentAccountList;
+import com.ruixuan.jinniu.service.IKuaishouAgentAccountListService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 【请填写功能名称】Controller
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+@RestController
+@RequestMapping("/agent/account")
+public class KuaishouAgentAccountListController extends BaseController
+{
+    @Autowired
+    private IKuaishouAgentAccountListService kuaishouAgentAccountListService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(KuaishouAgentAccountList kuaishouAgentAccountList)
+    {
+        startPage();
+        List<KuaishouAgentAccountList> list = kuaishouAgentAccountListService.selectKuaishouAgentAccountListList(kuaishouAgentAccountList);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, KuaishouAgentAccountList kuaishouAgentAccountList)
+    {
+        List<KuaishouAgentAccountList> list = kuaishouAgentAccountListService.selectKuaishouAgentAccountListList(kuaishouAgentAccountList);
+        ExcelUtil<KuaishouAgentAccountList> util = new ExcelUtil<KuaishouAgentAccountList>(KuaishouAgentAccountList.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:query')")
+    @GetMapping(value = "/{accountId}")
+    public AjaxResult getInfo(@PathVariable("accountId") Long accountId)
+    {
+        return AjaxResult.success(kuaishouAgentAccountListService.selectKuaishouAgentAccountListByAccountId(accountId));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody KuaishouAgentAccountList kuaishouAgentAccountList)
+    {
+        return toAjax(kuaishouAgentAccountListService.insertKuaishouAgentAccountList(kuaishouAgentAccountList));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody KuaishouAgentAccountList kuaishouAgentAccountList)
+    {
+        return toAjax(kuaishouAgentAccountListService.updateKuaishouAgentAccountList(kuaishouAgentAccountList));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:remove')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{accountIds}")
+    public AjaxResult remove(@PathVariable Long[] accountIds)
+    {
+        return toAjax(kuaishouAgentAccountListService.deleteKuaishouAgentAccountListByAccountIds(accountIds));
+    }
+}
+

+ 70 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouProjectController.java

@@ -0,0 +1,70 @@
+package com.ruixuan.jinniu.controller;
+
+
+import com.ruixuan.common.core.controller.BaseController;
+import com.ruixuan.common.core.domain.AjaxResult;
+import com.ruixuan.common.core.page.TableDataInfo;
+import com.ruixuan.jinniu.entity.KuaishouProject;
+import com.ruixuan.jinniu.service.IKuaishouProjectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 项目信息Controller
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+@Api(tags = "项目")
+@RestController
+@RequestMapping("/Kuaishou/project")
+public class KuaishouProjectController extends BaseController {
+    @Autowired
+    private IKuaishouProjectService KuaishouProjectService;
+
+    /**
+     * 查询项目信息列表
+     */
+    @ApiOperation(value = "查询项目信息列表")
+    @GetMapping("/list")
+    public TableDataInfo list(KuaishouProject kuaishouProject) {
+        startPage();
+        List<KuaishouProject> list = KuaishouProjectService.selectKuaishouProjectList(kuaishouProject);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增项目信息
+     */
+    @ApiOperation(value = "新增项目信息")
+    @PostMapping(value = "/add")
+    public AjaxResult add(@RequestBody KuaishouProject kuaishouProject) {
+        return toAjax(KuaishouProjectService.insertKuaishouProject(kuaishouProject));
+    }
+
+    /**
+     * 修改项目信息
+     */
+    @ApiOperation(value = "修改项目信息")
+    @PostMapping(value = "/edit")
+    public AjaxResult edit(@RequestBody KuaishouProject kuaishouProject) {
+        return toAjax(KuaishouProjectService.updateKuaishouProject(kuaishouProject));
+    }
+
+    /**
+     * 获取项目信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(KuaishouProjectService.selectKuaishouProjectById(id));
+    }
+}

+ 118 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouAccount.java

@@ -0,0 +1,118 @@
+package com.ruixuan.jinniu.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruixuan.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * 账户对象 kuaishou_account
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public class KuaishouAccount extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 账户ID
+     */
+    @ApiModelProperty(name = "账户ID")
+    private Long accountId;
+
+    /**
+     * 账户名称
+     */
+    @ApiModelProperty(name = "账户名称")
+    private String accountName;
+
+    /**
+     * 项目ID
+     */
+    @ApiModelProperty(name = "项目ID")
+    private Long projectId;
+
+    /**
+     * 项目名称
+     */
+    @ApiModelProperty(name = "项目名称")
+    private String projectName;
+
+    /**
+     * 媒体类型 磁力金牛、千川
+     */
+    @ApiModelProperty(name = "媒体类型 磁力金牛、千川")
+    private String mediaCode;
+
+    /**
+     * 快手ID
+     */
+    @ApiModelProperty(name = "快手ID")
+    private Long ksId;
+
+    /**
+     * 快手昵称
+     */
+    @ApiModelProperty(name = "快手昵称")
+    private String ksName;
+
+    /**
+     * 运营(优化)负责人Id
+     */
+    @ApiModelProperty(name = "运营(优化)负责人Id")
+    private String operatorId;
+
+    /**
+     * 运营(优化)负责人
+     */
+    @ApiModelProperty(name = "运营(优化)负责人")
+    private String operatorLeader;
+
+    /**
+     * 产品名称
+     */
+    @ApiModelProperty(name = "产品名称")
+    private String productName;
+
+    /**
+     * 一级行业
+     */
+    @ApiModelProperty(name = "一级行业")
+    private String industry;
+
+    /**
+     * 二级行业
+     */
+    @ApiModelProperty(name = "二级行业")
+    private String secondIndustry;
+
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty(name = "公司名称")
+    private String corporationName;
+
+    /**
+     * 账户状态
+     */
+    @ApiModelProperty(name = "账户状态")
+    private String accountStatus;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

+ 75 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouAdvertiser.java

@@ -0,0 +1,75 @@
+package com.ruixuan.jinniu.entity;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 广告主对象 rx_advertiser
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+@Data
+@ApiModel(value = "rx_advertiser", description = "广告主对象")
+public class KuaishouAdvertiser implements Serializable {
+
+    private static final long serialVersionUID = -8714484660488441769L;
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 主体名称
+     */
+    @ApiModelProperty(name = "主体名称")
+    private String advertiserName;
+
+    /**
+     * 负责人id
+     */
+    @ApiModelProperty(name = "负责人id")
+    private Long userId;
+
+    /**
+     * 负责人手机
+     */
+    @ApiModelProperty(name = "负责人手机")
+    private String mobile;
+
+    /**
+     * 负责人邮箱
+     */
+    @ApiModelProperty(name = "负责人邮箱")
+    private String email;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(name = "创建人")
+    private Long createBy;
+
+    /**
+     * 修改人
+     */
+    @ApiModelProperty(name = "修改人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

+ 165 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouAgentAccountList.java

@@ -0,0 +1,165 @@
+package com.ruixuan.jinniu.entity;
+
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruixuan.common.annotation.Excel;
+import com.ruixuan.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+
+/**
+ * 【请填写功能名称】对象 kuaishou_agent_account_list
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public class KuaishouAgentAccountList extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 账户ID
+     */
+    private Long accountId;
+
+    /**
+     * 快手ID
+     */
+    @Excel(name = "快手ID")
+    private Long userId;
+
+    /**
+     * 账户名称
+     */
+    @Excel(name = "账户名称")
+    private String accountName;
+
+    /**
+     * 快手名称
+     */
+    @Excel(name = "快手名称")
+    private String userName;
+
+    /**
+     * 账户创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "账户创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date accountCreateTime;
+
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /**
+     * 一级行业
+     */
+    @Excel(name = "一级行业")
+    private String industry;
+
+    /**
+     * 二级行业
+     */
+    @Excel(name = "二级行业")
+    private String secondIndustry;
+
+    /**
+     * 公司名称
+     */
+    @Excel(name = "公司名称")
+    private String corporationName;
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setAccountCreateTime(Date accountCreateTime) {
+        this.accountCreateTime = accountCreateTime;
+    }
+
+    public Date getAccountCreateTime() {
+        return accountCreateTime;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setIndustry(String industry) {
+        this.industry = industry;
+    }
+
+    public String getIndustry() {
+        return industry;
+    }
+
+    public void setSecondIndustry(String secondIndustry) {
+        this.secondIndustry = secondIndustry;
+    }
+
+    public String getSecondIndustry() {
+        return secondIndustry;
+    }
+
+    public void setCorporationName(String corporationName) {
+        this.corporationName = corporationName;
+    }
+
+    public String getCorporationName() {
+        return corporationName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("accountId", getAccountId())
+                .append("userId", getUserId())
+                .append("accountName", getAccountName())
+                .append("userName", getUserName())
+                .append("accountCreateTime", getAccountCreateTime())
+                .append("productName", getProductName())
+                .append("industry", getIndustry())
+                .append("secondIndustry", getSecondIndustry())
+                .append("corporationName", getCorporationName())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}
+

+ 106 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouProject.java

@@ -0,0 +1,106 @@
+package com.ruixuan.jinniu.entity;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 项目信息对象 rx_project
+ */
+@Data
+@ApiModel(value = "rx_project", description = "项目信息对象")
+public class KuaishouProject implements Serializable {
+    private static final long serialVersionUID = -124355905527263391L;
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 项目名称
+     */
+    @ApiModelProperty(name = "项目名称")
+    private String projectName;
+
+    /**
+     * 媒体类型 磁力金牛、千川
+     */
+    @ApiModelProperty(name = "媒体类型 磁力金牛、千川")
+    private String mediaCode;
+
+    /**
+     * 供应商
+     */
+    @ApiModelProperty(name = "供应商")
+    private String supplierCode;
+
+    /**
+     * 销售ID
+     */
+    @ApiModelProperty(name = "销售ID")
+    private Long saleId;
+
+    /**
+     * 销售人员
+     */
+    @ApiModelProperty(name = "销售人员")
+    private String saleName;
+
+    /**
+     * 运营负责人ID
+     */
+    @ApiModelProperty(name = "运营负责人ID")
+    private Long businessId;
+
+    /**
+     * 运营负责人
+     */
+    @ApiModelProperty(name = "运营负责人")
+    private String businessName;
+
+    /**
+     * 设计负责人ID
+     */
+    @ApiModelProperty(name = "设计负责人ID")
+    private Long designResponsibleId;
+
+    /**
+     * 设计负责人
+     */
+    @ApiModelProperty(name = "设计负责人")
+    private String designResponsibleName;
+
+    /**
+     * 转化目标
+     */
+    @ApiModelProperty(name = "转化目标")
+    private String ocpxActionType;
+
+    /**
+     * 广告主名称
+     */
+    @ApiModelProperty(name = "广告主名称")
+    private String advertiserName;
+
+    /**
+     * 广告主ID
+     */
+    @ApiModelProperty(name = "广告主ID")
+    private String advertiserId;
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

+ 62 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAccountMapper.java

@@ -0,0 +1,62 @@
+package com.ruixuan.jinniu.mapper;
+
+
+import com.ruixuan.jinniu.entity.KuaishouAccount;
+
+import java.util.List;
+
+/**
+ * 账户Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public interface KuaishouAccountMapper {
+    /**
+     * 查询账户
+     *
+     * @param id 账户主键
+     * @return 账户
+     */
+    public KuaishouAccount selectKuaishouAccountById(Long id);
+
+    /**
+     * 查询账户列表
+     *
+     * @param kuaishouAccount 账户
+     * @return 账户集合
+     */
+    public List<KuaishouAccount> selectKuaishouAccountList(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 新增账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    public int insertKuaishouAccount(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 修改账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    public int updateKuaishouAccount(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 删除账户
+     *
+     * @param id 账户主键
+     * @return 结果
+     */
+    public int deleteKuaishouAccountById(Long id);
+
+    /**
+     * 批量删除账户
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteKuaishouAccountByIds(Long[] ids);
+}

+ 54 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAdvertiserMapper.java

@@ -0,0 +1,54 @@
+package com.ruixuan.jinniu.mapper;
+
+import com.ruixuan.jinniu.entity.KuaishouAdvertiser;
+
+import java.util.List;
+
+/**
+ * 广告主Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+public interface KuaishouAdvertiserMapper {
+    /**
+     * 查询广告主
+     *
+     * @param id 广告主主键
+     * @return 广告主
+     */
+    public KuaishouAdvertiser selectKuaishouAdvertiserById(Long id);
+
+    /**
+     * 查询广告主列表
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 广告主集合
+     */
+    public List<KuaishouAdvertiser> selectKuaishouAdvertiserList(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 新增广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    public int insertKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 修改广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    public int updateKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 删除广告主
+     *
+     * @param id 广告主主键
+     * @return 结果
+     */
+    public int deleteKuaishouAdvertiserById(Long id);
+
+}

+ 65 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAgentAccountListMapper.java

@@ -0,0 +1,65 @@
+package com.ruixuan.jinniu.mapper;
+
+
+
+import com.ruixuan.jinniu.entity.KuaishouAgentAccountList;
+
+import java.util.List;
+
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public interface KuaishouAgentAccountListMapper
+{
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param accountId 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public KuaishouAgentAccountList selectKuaishouAgentAccountListByAccountId(Long accountId);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<KuaishouAgentAccountList> selectKuaishouAgentAccountListList(KuaishouAgentAccountList kuaishouAgentAccountList);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertKuaishouAgentAccountList(KuaishouAgentAccountList kuaishouAgentAccountList);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateKuaishouAgentAccountList(KuaishouAgentAccountList kuaishouAgentAccountList);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param accountId 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteKuaishouAgentAccountListByAccountId(Long accountId);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param accountIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteKuaishouAgentAccountListByAccountIds(Long[] accountIds);
+}

+ 54 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouProjectMapper.java

@@ -0,0 +1,54 @@
+package com.ruixuan.jinniu.mapper;
+
+import com.ruixuan.jinniu.entity.KuaishouProject;
+
+import java.util.List;
+
+/**
+ * 项目信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+public interface KuaishouProjectMapper {
+    /**
+     * 查询项目信息
+     *
+     * @param id 项目信息主键
+     * @return 项目信息
+     */
+    public KuaishouProject selectKuaishouProjectById(Long id);
+
+    /**
+     * 查询项目信息列表
+     *
+     * @param kuaishouProject 项目信息
+     * @return 项目信息集合
+     */
+    public List<KuaishouProject> selectKuaishouProjectList(KuaishouProject kuaishouProject);
+
+    /**
+     * 新增项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    public int insertKuaishouProject(KuaishouProject kuaishouProject);
+
+    /**
+     * 修改项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    public int updateKuaishouProject(KuaishouProject kuaishouProject);
+
+    /**
+     * 删除项目信息
+     *
+     * @param id 项目信息主键
+     * @return 结果
+     */
+    public int deleteKuaishouProjectById(Long id);
+
+}

+ 62 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAccountService.java

@@ -0,0 +1,62 @@
+package com.ruixuan.jinniu.service;
+
+
+import com.ruixuan.jinniu.entity.KuaishouAccount;
+
+import java.util.List;
+
+/**
+ * 账户Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public interface IKuaishouAccountService {
+    /**
+     * 查询账户
+     *
+     * @param id 账户主键
+     * @return 账户
+     */
+    public KuaishouAccount selectKuaishouAccountById(Long id);
+
+    /**
+     * 查询账户列表
+     *
+     * @param kuaishouAccount 账户
+     * @return 账户集合
+     */
+    public List<KuaishouAccount> selectKuaishouAccountList(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 新增账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    public int insertKuaishouAccount(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 修改账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    public int updateKuaishouAccount(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 批量删除账户
+     *
+     * @param ids 需要删除的账户主键集合
+     * @return 结果
+     */
+    public int deleteKuaishouAccountByIds(Long[] ids);
+
+    /**
+     * 删除账户信息
+     *
+     * @param id 账户主键
+     * @return 结果
+     */
+    public int deleteKuaishouAccountById(Long id);
+}

+ 53 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAdvertiserService.java

@@ -0,0 +1,53 @@
+package com.ruixuan.jinniu.service;
+
+import com.ruixuan.jinniu.entity.KuaishouAdvertiser;
+
+import java.util.List;
+
+/**
+ * 广告主Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+public interface IKuaishouAdvertiserService {
+    /**
+     * 查询广告主
+     *
+     * @param id 广告主主键
+     * @return 广告主
+     */
+    public KuaishouAdvertiser selectKuaishouAdvertiserById(Long id);
+
+    /**
+     * 查询广告主列表
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 广告主集合
+     */
+    public List<KuaishouAdvertiser> selectKuaishouAdvertiserList(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 新增广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    public int insertKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 修改广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    public int updateKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 删除广告主信息
+     *
+     * @param id 广告主主键
+     * @return 结果
+     */
+    public int deleteKuaishouAdvertiserById(Long id);
+}

+ 65 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAgentAccountListService.java

@@ -0,0 +1,65 @@
+package com.ruixuan.jinniu.service;
+
+
+import com.ruixuan.jinniu.entity.KuaishouAgentAccountList;
+
+import java.util.List;
+
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public interface IKuaishouAgentAccountListService
+{
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param accountId 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public KuaishouAgentAccountList selectKuaishouAgentAccountListByAccountId(Long accountId);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<KuaishouAgentAccountList> selectKuaishouAgentAccountListList(KuaishouAgentAccountList kuaishouAgentAccountList);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertKuaishouAgentAccountList(KuaishouAgentAccountList kuaishouAgentAccountList);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateKuaishouAgentAccountList(KuaishouAgentAccountList kuaishouAgentAccountList);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param accountIds 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    public int deleteKuaishouAgentAccountListByAccountIds(Long[] accountIds);
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param accountId 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteKuaishouAgentAccountListByAccountId(Long accountId);
+}
+

+ 53 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouProjectService.java

@@ -0,0 +1,53 @@
+package com.ruixuan.jinniu.service;
+
+import com.ruixuan.jinniu.entity.KuaishouProject;
+
+import java.util.List;
+
+/**
+ * 项目信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+public interface IKuaishouProjectService {
+    /**
+     * 查询项目信息
+     *
+     * @param id 项目信息主键
+     * @return 项目信息
+     */
+    public KuaishouProject selectKuaishouProjectById(Long id);
+
+    /**
+     * 查询项目信息列表
+     *
+     * @param kuaishouProject 项目信息
+     * @return 项目信息集合
+     */
+    public List<KuaishouProject> selectKuaishouProjectList(KuaishouProject kuaishouProject);
+
+    /**
+     * 新增项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    public int insertKuaishouProject(KuaishouProject kuaishouProject);
+
+    /**
+     * 修改项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    public int updateKuaishouProject(KuaishouProject kuaishouProject);
+
+    /**
+     * 删除项目信息信息
+     *
+     * @param id 项目信息主键
+     * @return 结果
+     */
+    public int deleteKuaishouProjectById(Long id);
+}

+ 87 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAccountServiceImpl.java

@@ -0,0 +1,87 @@
+package com.ruixuan.jinniu.service.impl;
+
+import com.ruixuan.jinniu.entity.KuaishouAccount;
+import com.ruixuan.jinniu.mapper.KuaishouAccountMapper;
+import com.ruixuan.jinniu.service.IKuaishouAccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 账户Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+@Service
+public class KuaishouAccountServiceImpl implements IKuaishouAccountService {
+    @Autowired
+    private KuaishouAccountMapper kuaishouAccountMapper;
+
+    /**
+     * 查询账户
+     *
+     * @param id 账户主键
+     * @return 账户
+     */
+    @Override
+    public KuaishouAccount selectKuaishouAccountById(Long id) {
+        return kuaishouAccountMapper.selectKuaishouAccountById(id);
+    }
+
+    /**
+     * 查询账户列表
+     *
+     * @param kuaishouAccount 账户
+     * @return 账户
+     */
+    @Override
+    public List<KuaishouAccount> selectKuaishouAccountList(KuaishouAccount kuaishouAccount) {
+        return kuaishouAccountMapper.selectKuaishouAccountList(kuaishouAccount);
+    }
+
+    /**
+     * 新增账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    @Override
+    public int insertKuaishouAccount(KuaishouAccount kuaishouAccount) {
+        return kuaishouAccountMapper.insertKuaishouAccount(kuaishouAccount);
+    }
+
+    /**
+     * 修改账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    @Override
+    public int updateKuaishouAccount(KuaishouAccount kuaishouAccount) {
+        return kuaishouAccountMapper.updateKuaishouAccount(kuaishouAccount);
+    }
+
+    /**
+     * 批量删除账户
+     *
+     * @param ids 需要删除的账户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouAccountByIds(Long[] ids) {
+        return kuaishouAccountMapper.deleteKuaishouAccountByIds(ids);
+    }
+
+    /**
+     * 删除账户信息
+     *
+     * @param id 账户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouAccountById(Long id) {
+        return kuaishouAccountMapper.deleteKuaishouAccountById(id);
+    }
+}

+ 76 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAdvertiserServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruixuan.jinniu.service.impl;
+
+import com.ruixuan.jinniu.entity.KuaishouAdvertiser;
+import com.ruixuan.jinniu.mapper.KuaishouAdvertiserMapper;
+import com.ruixuan.jinniu.service.IKuaishouAdvertiserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 广告主Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+@Service
+public class KuaishouAdvertiserServiceImpl implements IKuaishouAdvertiserService {
+    @Autowired
+    private KuaishouAdvertiserMapper KuaishouAdvertiserMapper;
+
+    /**
+     * 查询广告主
+     *
+     * @param id 广告主主键
+     * @return 广告主
+     */
+    @Override
+    public KuaishouAdvertiser selectKuaishouAdvertiserById(Long id) {
+        return KuaishouAdvertiserMapper.selectKuaishouAdvertiserById(id);
+    }
+
+    /**
+     * 查询广告主列表
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 广告主
+     */
+    @Override
+    public List<KuaishouAdvertiser> selectKuaishouAdvertiserList(KuaishouAdvertiser kuaishouAdvertiser) {
+        return KuaishouAdvertiserMapper.selectKuaishouAdvertiserList(kuaishouAdvertiser);
+    }
+
+    /**
+     * 新增广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    @Override
+    public int insertKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser) {
+        return KuaishouAdvertiserMapper.insertKuaishouAdvertiser(kuaishouAdvertiser);
+    }
+
+    /**
+     * 修改广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    @Override
+    public int updateKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser) {
+        return KuaishouAdvertiserMapper.updateKuaishouAdvertiser(kuaishouAdvertiser);
+    }
+
+    /**
+     * 删除广告主信息
+     *
+     * @param id 广告主主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouAdvertiserById(Long id) {
+        return KuaishouAdvertiserMapper.deleteKuaishouAdvertiserById(id);
+    }
+}

+ 93 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAgentAccountListServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruixuan.jinniu.service.impl;
+
+
+import java.util.List;
+
+import com.ruixuan.common.utils.DateUtils;
+import com.ruixuan.jinniu.entity.KuaishouAgentAccountList;
+import com.ruixuan.jinniu.mapper.KuaishouAgentAccountListMapper;
+import com.ruixuan.jinniu.service.IKuaishouAgentAccountListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+@Service
+public class KuaishouAgentAccountListServiceImpl implements IKuaishouAgentAccountListService {
+    @Autowired
+    private KuaishouAgentAccountListMapper kuaishouAgentAccountListMapper;
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param accountId 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public KuaishouAgentAccountList selectKuaishouAgentAccountListByAccountId(Long accountId) {
+        return kuaishouAgentAccountListMapper.selectKuaishouAgentAccountListByAccountId(accountId);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<KuaishouAgentAccountList> selectKuaishouAgentAccountListList(KuaishouAgentAccountList kuaishouAgentAccountList) {
+        return kuaishouAgentAccountListMapper.selectKuaishouAgentAccountListList(kuaishouAgentAccountList);
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertKuaishouAgentAccountList(KuaishouAgentAccountList kuaishouAgentAccountList) {
+        kuaishouAgentAccountList.setCreateTime(DateUtils.getNowDate());
+        return kuaishouAgentAccountListMapper.insertKuaishouAgentAccountList(kuaishouAgentAccountList);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param kuaishouAgentAccountList 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateKuaishouAgentAccountList(KuaishouAgentAccountList kuaishouAgentAccountList) {
+        kuaishouAgentAccountList.setUpdateTime(DateUtils.getNowDate());
+        return kuaishouAgentAccountListMapper.updateKuaishouAgentAccountList(kuaishouAgentAccountList);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param accountIds 需要删除的【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouAgentAccountListByAccountIds(Long[] accountIds) {
+        return kuaishouAgentAccountListMapper.deleteKuaishouAgentAccountListByAccountIds(accountIds);
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param accountId 【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouAgentAccountListByAccountId(Long accountId) {
+        return kuaishouAgentAccountListMapper.deleteKuaishouAgentAccountListByAccountId(accountId);
+    }
+}
+

+ 77 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouProjectServiceImpl.java

@@ -0,0 +1,77 @@
+package com.ruixuan.jinniu.service.impl;
+
+
+import com.ruixuan.jinniu.entity.KuaishouProject;
+import com.ruixuan.jinniu.mapper.KuaishouProjectMapper;
+import com.ruixuan.jinniu.service.IKuaishouProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 项目信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+@Service
+public class KuaishouProjectServiceImpl implements IKuaishouProjectService {
+    @Autowired
+    private KuaishouProjectMapper KuaishouProjectMapper;
+
+    /**
+     * 查询项目信息
+     *
+     * @param id 项目信息主键
+     * @return 项目信息
+     */
+    @Override
+    public KuaishouProject selectKuaishouProjectById(Long id) {
+        return KuaishouProjectMapper.selectKuaishouProjectById(id);
+    }
+
+    /**
+     * 查询项目信息列表
+     *
+     * @param kuaishouProject 项目信息
+     * @return 项目信息
+     */
+    @Override
+    public List<KuaishouProject> selectKuaishouProjectList(KuaishouProject kuaishouProject) {
+        return KuaishouProjectMapper.selectKuaishouProjectList(kuaishouProject);
+    }
+
+    /**
+     * 新增项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    @Override
+    public int insertKuaishouProject(KuaishouProject kuaishouProject) {
+        return KuaishouProjectMapper.insertKuaishouProject(kuaishouProject);
+    }
+
+    /**
+     * 修改项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    @Override
+    public int updateKuaishouProject(KuaishouProject kuaishouProject) {
+        return KuaishouProjectMapper.updateKuaishouProject(kuaishouProject);
+    }
+
+    /**
+     * 删除项目信息信息
+     *
+     * @param id 项目信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouProjectById(Long id) {
+        return KuaishouProjectMapper.deleteKuaishouProjectById(id);
+    }
+}

+ 26 - 38
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -1078,7 +1078,7 @@
         CONCAT(IFNULL(ROUND(sendCount / allNumber * 100, 2),0), '%') as 'sendRate'
         CONCAT(IFNULL(ROUND(sendCount / allNumber * 100, 2),0), '%') as 'sendRate'
         FROM (
         FROM (
         SELECT
         SELECT
-        count(DISTINCT promoter_id) as 'promoterCount',
+        COUNT(DISTINCT promoter_id) as 'promoterCount',
         COUNT(oid) as 'allNumber',
         COUNT(oid) as 'allNumber',
         IFNULL(SUM(CASE WHEN order_status != 80 THEN 1 ELSE 0 END), 0) AS 'validOrderNUm',
         IFNULL(SUM(CASE WHEN order_status != 80 THEN 1 ELSE 0 END), 0) AS 'validOrderNUm',
         IFNULL(SUM(CASE WHEN order_status != 80 THEN order_amount ELSE 0 END), 0) AS 'orderAmount',
         IFNULL(SUM(CASE WHEN order_status != 80 THEN order_amount ELSE 0 END), 0) AS 'orderAmount',
@@ -1131,45 +1131,35 @@
     <select id="getMonthOrderAmount" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getMonthOrderAmount" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
         FROM_UNIXTIME(order_create_time / 1000, '%Y-%m-%d') as 'date',
         FROM_UNIXTIME(order_create_time / 1000, '%Y-%m-%d') as 'date',
-        IFNULL(SUM(CASE WHEN order_status != 80 THEN 1 ELSE 0 END), 0) AS 'orderCount',
-        IFNULL(SUM(order_amount),0) AS 'orderAmount',
-        IFNULL(SUM(regimental_promotion_amount),0) AS 'totalRegimentalSettleAmount',
-        IFNULL(promoterCount,0) AS 'promoterCount'
+        count(1) AS 'orderCount',
+        IFNULL(SUM(CASE WHEN order_status != 80 THEN 1 ELSE 0 END), 0) AS 'validOrderCount',
+        IFNULL(SUM(CASE WHEN order_status != 80 THEN order_amount ELSE 0 END),0) AS 'orderAmount',
+        IFNULL(SUM(CASE WHEN order_status != 80 THEN regimental_promotion_amount ELSE 0 END),0) AS
+        'regimentalPromotionAmount',
+        COUNT(DISTINCT promoter_id) as 'promoterCount'
         FROM kuaishou_supply_chain t1
         FROM kuaishou_supply_chain t1
-        LEFT JOIN (
-        SELECT count(promoter_id) as 'promoterCount', DATE_FORMAT(create_time, '%Y-%m-%d') as 'date'
-        FROM kuaishou_promoter
-        WHERE DATE_FORMAT(create_time, '%Y-%m-%d') >= #{start}
-        AND DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{end}
-        <if test="userList != null and userList.size() > 0 ">
-            AND user_id in
-            <foreach collection="userList" item="item" separator=","
-                     open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
-        GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
-        ) t2 ON FROM_UNIXTIME(t1.order_create_time / 1000, '%Y-%m-%d') = t2.date
-        WHERE order_status != 80
+        WHERE order_create_time >= #{startLong}
+        AND order_create_time &lt;= #{endLong}
         <if test='promoterIds != null and promoterIds.size() > 0'>
         <if test='promoterIds != null and promoterIds.size() > 0'>
             AND promoter_id in
             AND promoter_id in
             <foreach collection="promoterIds" item="item" separator="," open="(" close=")">
             <foreach collection="promoterIds" item="item" separator="," open="(" close=")">
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND order_create_time >= #{startLong}
-        AND order_create_time &lt;= #{endLong}
         GROUP BY FROM_UNIXTIME(order_create_time / 1000, '%Y-%m-%d')
         GROUP BY FROM_UNIXTIME(order_create_time / 1000, '%Y-%m-%d')
     </select>
     </select>
 
 
     <select id="getMonthOrderAmountByItems" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getMonthOrderAmountByItems" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
         FROM_UNIXTIME(order_create_time / 1000, '%Y-%m-%d') as 'date',
         FROM_UNIXTIME(order_create_time / 1000, '%Y-%m-%d') as 'date',
-        IFNULL(SUM(CASE WHEN order_status != 80 THEN 1 ELSE 0 END), 0) AS 'orderCount',
-        IFNULL(SUM(order_amount),0) AS 'orderAmount',
-        IFNULL(SUM(regimental_promotion_amount),0) AS 'totalRegimentalSettleAmount'
+        count(1) AS 'orderCount',
+        IFNULL(SUM(CASE WHEN order_status != 80 THEN 1 ELSE 0 END), 0) AS 'validOrderCount',
+        IFNULL(SUM(CASE WHEN order_status != 80 THEN order_amount ELSE 0 END),0) AS 'orderAmount',
+        IFNULL(SUM(CASE WHEN order_status != 80 THEN regimental_promotion_amount ELSE 0 END),0) AS
+        'regimentalPromotionAmount'
         FROM kuaishou_supply_chain
         FROM kuaishou_supply_chain
-        WHERE order_status != 80
+        WHERE order_create_time >= #{startLong}
+        AND order_create_time &lt;= #{endLong}
         <if test='itemIds != null and itemIds.size() > 0'>
         <if test='itemIds != null and itemIds.size() > 0'>
             AND item_id in
             AND item_id in
             <foreach collection="itemIds" item="item" separator=","
             <foreach collection="itemIds" item="item" separator=","
@@ -1177,23 +1167,21 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND order_create_time >= #{startLong}
-        AND order_create_time &lt;= #{endLong}
         GROUP BY FROM_UNIXTIME(order_create_time / 1000, '%Y-%m-%d')
         GROUP BY FROM_UNIXTIME(order_create_time / 1000, '%Y-%m-%d')
     </select>
     </select>
 
 
     <select id="getMonthOrderAmountTotal" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getMonthOrderAmountTotal" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
         t1.orderAmount,
         t1.orderAmount,
-        t1.totalRegimentalSettleAmount,
+        t1.regimentalPromotionAmount,
         CONCAT(IFNULL(ROUND(t2.orderAmount/t1.orderAmount*100,2),0),'%') as 'orderAmountRate',
         CONCAT(IFNULL(ROUND(t2.orderAmount/t1.orderAmount*100,2),0),'%') as 'orderAmountRate',
-        CONCAT(IFNULL(ROUND(t2.totalRegimentalSettleAmount/t1.totalRegimentalSettleAmount*100,2),0),'%') as
-        'totalRegimentalSettleAmountRate'
+        CONCAT(IFNULL(ROUND(t2.regimentalPromotionAmount/t1.regimentalPromotionAmount*100,2),0),'%') as
+        'regimentalPromotionAmountRate'
         FROM
         FROM
         (
         (
         SELECT
         SELECT
         IFNULL(SUM(order_amount),0) AS 'orderAmount',
         IFNULL(SUM(order_amount),0) AS 'orderAmount',
-        IFNULL(SUM(regimental_promotion_amount),0) AS 'totalRegimentalSettleAmount'
+        IFNULL(SUM(regimental_promotion_amount),0) AS 'regimentalPromotionAmount'
         FROM kuaishou_supply_chain t1
         FROM kuaishou_supply_chain t1
         WHERE order_status != 80
         WHERE order_status != 80
         <if test='promoterIds != null and promoterIds.size() > 0'>
         <if test='promoterIds != null and promoterIds.size() > 0'>
@@ -1208,7 +1196,7 @@
         (
         (
         SELECT
         SELECT
         IFNULL(SUM(order_amount),0) AS 'orderAmount',
         IFNULL(SUM(order_amount),0) AS 'orderAmount',
-        IFNULL(SUM(regimental_promotion_amount),0) AS 'totalRegimentalSettleAmount'
+        IFNULL(SUM(regimental_promotion_amount),0) AS 'regimentalPromotionAmount'
         FROM kuaishou_supply_chain t1
         FROM kuaishou_supply_chain t1
         WHERE order_status != 80
         WHERE order_status != 80
         <if test='promoterIds != null and promoterIds.size() > 0'>
         <if test='promoterIds != null and promoterIds.size() > 0'>
@@ -1224,17 +1212,17 @@
     <select id="getMonthOrderAmountTotalByItems" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getMonthOrderAmountTotalByItems" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
         t1.orderAmount,
         t1.orderAmount,
-        t1.totalRegimentalSettleAmount,
+        t1.regimentalPromotionAmount,
         t1.orderCount,
         t1.orderCount,
         CONCAT(IFNULL(ROUND(t2.orderAmount/t1.orderAmount*100,2),0),'%') as 'orderAmountRate',
         CONCAT(IFNULL(ROUND(t2.orderAmount/t1.orderAmount*100,2),0),'%') as 'orderAmountRate',
         CONCAT(IFNULL(ROUND(t2.orderCount/t1.orderCount*100,2),0),'%') as 'orderCountRate',
         CONCAT(IFNULL(ROUND(t2.orderCount/t1.orderCount*100,2),0),'%') as 'orderCountRate',
-        CONCAT(IFNULL(ROUND(t2.totalRegimentalSettleAmount/t1.totalRegimentalSettleAmount*100,2),0),'%') as
-        'totalRegimentalSettleAmountRate'
+        CONCAT(IFNULL(ROUND(t2.regimentalPromotionAmount/t1.regimentalPromotionAmount*100,2),0),'%') as
+        'regimentalPromotionAmountRate'
         FROM
         FROM
         (
         (
         SELECT
         SELECT
         IFNULL(SUM(order_amount),0) AS 'orderAmount',
         IFNULL(SUM(order_amount),0) AS 'orderAmount',
-        IFNULL(SUM(regimental_promotion_amount),0) AS 'totalRegimentalSettleAmount',
+        IFNULL(SUM(regimental_promotion_amount),0) AS 'regimentalPromotionAmount',
         COUNT(oid) as 'orderCount'
         COUNT(oid) as 'orderCount'
         FROM kuaishou_supply_chain t1
         FROM kuaishou_supply_chain t1
         WHERE order_status != 80
         WHERE order_status != 80
@@ -1252,7 +1240,7 @@
         (
         (
         SELECT
         SELECT
         IFNULL(SUM(order_amount),0) AS 'orderAmount',
         IFNULL(SUM(order_amount),0) AS 'orderAmount',
-        IFNULL(SUM(regimental_promotion_amount),0) AS 'totalRegimentalSettleAmount',
+        IFNULL(SUM(regimental_promotion_amount),0) AS 'regimentalPromotionAmount',
         COUNT(oid) as 'orderCount'
         COUNT(oid) as 'orderCount'
         FROM kuaishou_supply_chain t1
         FROM kuaishou_supply_chain t1
         WHERE order_status != 80
         WHERE order_status != 80

+ 138 - 0
ruixuan-live/src/main/resources/mapper/jinniu/KuaishouAccountMapper.xml

@@ -0,0 +1,138 @@
+<?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="com.ruixuan.jinniu.mapper.KuaishouProjectMapper">
+
+    <resultMap type="com.ruixuan.jinniu.entity.KuaishouProject" id="KuaishouProjectResult">
+        <result property="id" column="id"/>
+        <result property="projectName" column="project_name"/>
+        <result property="mediaCode" column="media_code"/>
+        <result property="supplierCode" column="supplier_code"/>
+        <result property="saleId" column="sale_id"/>
+        <result property="saleName" column="sale_name"/>
+        <result property="businessId" column="business_id"/>
+        <result property="businessName" column="business_name"/>
+        <result property="designResponsibleId" column="design_responsible_id"/>
+        <result property="designResponsibleName" column="design_responsible_name"/>
+        <result property="ocpxActionType" column="ocpx_action_type"/>
+        <result property="advertiserName" column="advertiser_name"/>
+        <result property="advertiserId" column="advertiser_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectKuaishouProjectVo">
+        select id,
+               project_name,
+               media_code,
+               supplier_code,
+               sale_id,
+               sale_name,
+               business_id,
+               business_name,
+               design_responsible_id,
+               design_responsible_name,
+               ocpx_action_type,
+               advertiser_name,
+               advertiser_id,
+               create_time,
+               update_time
+        from Kuaishou_project
+    </sql>
+
+    <select id="selectKuaishouProjectList" parameterType="com.ruixuan.jinniu.entity.KuaishouProject" resultMap="KuaishouProjectResult">
+        <include refid="selectKuaishouProjectVo"/>
+        <where>
+            <if test="projectName != null  and projectName != ''">and project_name like concat('%', #{projectName},
+                '%')
+            </if>
+            <if test="mediaCode != null  and mediaCode != ''">and media_code = #{mediaCode}</if>
+            <if test="supplierCode != null  and supplierCode != ''">and supplier_code = #{supplierCode}</if>
+            <if test="saleId != null ">and sale_id = #{saleId}</if>
+            <if test="saleName != null  and saleName != ''">and sale_name like concat('%', #{saleName}, '%')</if>
+            <if test="businessId != null ">and business_id = #{businessId}</if>
+            <if test="businessName != null  and businessName != ''">and business_name like concat('%', #{businessName},
+                '%')
+            </if>
+            <if test="designResponsibleId != null ">and design_responsible_id = #{designResponsibleId}</if>
+            <if test="designResponsibleName != null  and designResponsibleName != ''">and design_responsible_name like
+                concat('%', #{designResponsibleName}, '%')
+            </if>
+            <if test="ocpxActionType != null  and ocpxActionType != ''">and ocpx_action_type = #{ocpxActionType}</if>
+            <if test="advertiserName != null  and advertiserName != ''">and advertiser_name like concat('%',
+                #{advertiserName}, '%')
+            </if>
+            <if test="advertiserId != null  and advertiserId != ''">and advertiser_id = #{advertiserId}</if>
+        </where>
+    </select>
+
+    <select id="selectKuaishouProjectById" parameterType="Long" resultMap="KuaishouProjectResult">
+        <include refid="selectKuaishouProjectVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertKuaishouProject" parameterType="com.ruixuan.jinniu.entity.KuaishouProject" useGeneratedKeys="true" keyProperty="id">
+        insert into Kuaishou_project
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectName != null">project_name,</if>
+            <if test="mediaCode != null">media_code,</if>
+            <if test="supplierCode != null">supplier_code,</if>
+            <if test="saleId != null">sale_id,</if>
+            <if test="saleName != null">sale_name,</if>
+            <if test="businessId != null">business_id,</if>
+            <if test="businessName != null">business_name,</if>
+            <if test="designResponsibleId != null">design_responsible_id,</if>
+            <if test="designResponsibleName != null">design_responsible_name,</if>
+            <if test="ocpxActionType != null">ocpx_action_type,</if>
+            <if test="advertiserName != null">advertiser_name,</if>
+            <if test="advertiserId != null">advertiser_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectName != null">#{projectName},</if>
+            <if test="mediaCode != null">#{mediaCode},</if>
+            <if test="supplierCode != null">#{supplierCode},</if>
+            <if test="saleId != null">#{saleId},</if>
+            <if test="saleName != null">#{saleName},</if>
+            <if test="businessId != null">#{businessId},</if>
+            <if test="businessName != null">#{businessName},</if>
+            <if test="designResponsibleId != null">#{designResponsibleId},</if>
+            <if test="designResponsibleName != null">#{designResponsibleName},</if>
+            <if test="ocpxActionType != null">#{ocpxActionType},</if>
+            <if test="advertiserName != null">#{advertiserName},</if>
+            <if test="advertiserId != null">#{advertiserId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateKuaishouProject" parameterType="com.ruixuan.jinniu.entity.KuaishouProject">
+        update Kuaishou_project
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="mediaCode != null">media_code = #{mediaCode},</if>
+            <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
+            <if test="saleId != null">sale_id = #{saleId},</if>
+            <if test="saleName != null">sale_name = #{saleName},</if>
+            <if test="businessId != null">business_id = #{businessId},</if>
+            <if test="businessName != null">business_name = #{businessName},</if>
+            <if test="designResponsibleId != null">design_responsible_id = #{designResponsibleId},</if>
+            <if test="designResponsibleName != null">design_responsible_name = #{designResponsibleName},</if>
+            <if test="ocpxActionType != null">ocpx_action_type = #{ocpxActionType},</if>
+            <if test="advertiserName != null">advertiser_name = #{advertiserName},</if>
+            <if test="advertiserId != null">advertiser_id = #{advertiserId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKuaishouProjectById" parameterType="Long">
+        delete
+        from Kuaishou_project
+        where id = #{id}
+    </delete>
+
+</mapper>

+ 96 - 0
ruixuan-live/src/main/resources/mapper/jinniu/KuaishouAdvertiserMapper.xml

@@ -0,0 +1,96 @@
+<?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="com.ruixuan.jinniu.mapper.KuaishouAdvertiserMapper">
+
+    <resultMap type="com.ruixuan.jinniu.entity.KuaishouAdvertiser" id="KuaishouAdvertiserResult">
+        <result property="id" column="id"/>
+        <result property="advertiserName" column="advertiser_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="mobile" column="mobile"/>
+        <result property="email" column="email"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectKuaishouAdvertiserVo">
+        select id,
+               advertiser_name,
+               user_id,
+               mobile,
+               email,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from Kuaishou_advertiser
+    </sql>
+
+    <select id="selectKuaishouAdvertiserList" parameterType="com.ruixuan.jinniu.entity.KuaishouAdvertiser" resultMap="KuaishouAdvertiserResult">
+        <include refid="selectKuaishouAdvertiserVo"/>
+        <where>
+            <if test="advertiserName != null  and advertiserName != ''">and advertiser_name like concat('%',
+                #{advertiserName}, '%')
+            </if>
+            <if test="userId != null  and userId != ''">and user_id = #{userId}</if>
+            <if test="mobile != null  and mobile != ''">and mobile = #{mobile}</if>
+            <if test="email != null  and email != ''">and email = #{email}</if>
+        </where>
+    </select>
+
+    <select id="selectKuaishouAdvertiserById" parameterType="Long" resultMap="KuaishouAdvertiserResult">
+        <include refid="selectKuaishouAdvertiserVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertKuaishouAdvertiser" parameterType="com.ruixuan.jinniu.entity.KuaishouAdvertiser">
+        insert into Kuaishou_advertiser
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="advertiserName != null and advertiserName != ''">advertiser_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="mobile != null and mobile != ''">mobile,</if>
+            <if test="email != null and email != ''">email,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="advertiserName != null and advertiserName != ''">#{advertiserName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="mobile != null and mobile != ''">#{mobile},</if>
+            <if test="email != null and email != ''">#{email},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateKuaishouAdvertiser" parameterType="com.ruixuan.jinniu.entity.KuaishouAdvertiser">
+        update Kuaishou_advertiser
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="advertiserName != null and advertiserName != ''">advertiser_name = #{advertiserName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="mobile != null and mobile != ''">mobile = #{mobile},</if>
+            <if test="email != null and email != ''">email = #{email},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKuaishouAdvertiserById" parameterType="Long">
+        delete
+        from Kuaishou_advertiser
+        where id = #{id}
+    </delete>
+
+</mapper>

+ 101 - 0
ruixuan-live/src/main/resources/mapper/jinniu/KuaishouAgentAccountListMapper.xml

@@ -0,0 +1,101 @@
+<?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="com.ruixuan.jinniu.mapper.KuaishouAgentAccountListMapper">
+
+    <resultMap type="com.ruixuan.jinniu.entity.KuaishouAgentAccountList" id="KuaishouAgentAccountListResult">
+        <result property="accountId"    column="account_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="accountName"    column="account_name"    />
+        <result property="userName"    column="user_name"    />
+        <result property="accountCreateTime"    column="account_create_time"    />
+        <result property="productName"    column="product_name"    />
+        <result property="industry"    column="industry"    />
+        <result property="secondIndustry"    column="second_industry"    />
+        <result property="corporationName"    column="corporation_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectKuaishouAgentAccountListVo">
+        select account_id, user_id, account_name, user_name, account_create_time, product_name, industry, second_industry, corporation_name, create_time, update_time from kuaishou_agent_account_list
+    </sql>
+
+    <select id="selectKuaishouAgentAccountListList" parameterType="com.ruixuan.jinniu.entity.KuaishouAgentAccountList" resultMap="KuaishouAgentAccountListResult">
+        <include refid="selectKuaishouAgentAccountListVo"/>
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="accountName != null  and accountName != ''"> and account_name like concat('%', #{accountName}, '%')</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="accountCreateTime != null "> and account_create_time = #{accountCreateTime}</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="industry != null  and industry != ''"> and industry = #{industry}</if>
+            <if test="secondIndustry != null  and secondIndustry != ''"> and second_industry = #{secondIndustry}</if>
+            <if test="corporationName != null  and corporationName != ''"> and corporation_name like concat('%', #{corporationName}, '%')</if>
+        </where>
+    </select>
+
+    <select id="selectKuaishouAgentAccountListByAccountId" parameterType="Long" resultMap="KuaishouAgentAccountListResult">
+        <include refid="selectKuaishouAgentAccountListVo"/>
+        where account_id = #{accountId}
+    </select>
+
+    <insert id="insertKuaishouAgentAccountList" parameterType="com.ruixuan.jinniu.entity.KuaishouAgentAccountList">
+        insert into kuaishou_agent_account_list
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="accountId != null">account_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="accountName != null">account_name,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="accountCreateTime != null">account_create_time,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="industry != null">industry,</if>
+            <if test="secondIndustry != null">second_industry,</if>
+            <if test="corporationName != null">corporation_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="accountId != null">#{accountId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="accountName != null">#{accountName},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="accountCreateTime != null">#{accountCreateTime},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="industry != null">#{industry},</if>
+            <if test="secondIndustry != null">#{secondIndustry},</if>
+            <if test="corporationName != null">#{corporationName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateKuaishouAgentAccountList" parameterType="com.ruixuan.jinniu.entity.KuaishouAgentAccountList">
+        update kuaishou_agent_account_list
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="accountName != null">account_name = #{accountName},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="accountCreateTime != null">account_create_time = #{accountCreateTime},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="industry != null">industry = #{industry},</if>
+            <if test="secondIndustry != null">second_industry = #{secondIndustry},</if>
+            <if test="corporationName != null">corporation_name = #{corporationName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where account_id = #{accountId}
+    </update>
+
+    <delete id="deleteKuaishouAgentAccountListByAccountId" parameterType="Long">
+        delete from kuaishou_agent_account_list where account_id = #{accountId}
+    </delete>
+
+    <delete id="deleteKuaishouAgentAccountListByAccountIds" parameterType="String">
+        delete from kuaishou_agent_account_list where account_id in
+        <foreach item="accountId" collection="array" open="(" separator="," close=")">
+            #{accountId}
+        </foreach>
+    </delete>
+</mapper>

+ 158 - 0
ruixuan-live/src/main/resources/mapper/jinniu/KuaishouProjectMapper.xml

@@ -0,0 +1,158 @@
+<?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="com.ruixuan.jinniu.mapper.KuaishouAccountMapper">
+
+    <resultMap type="com.ruixuan.jinniu.entity.KuaishouAccount" id="KuaishouAccountResult">
+        <result property="id" column="id"/>
+        <result property="accountId" column="account_id"/>
+        <result property="accountName" column="account_name"/>
+        <result property="projectId" column="project_id"/>
+        <result property="projectName" column="project_name"/>
+        <result property="mediaCode" column="media_code"/>
+        <result property="ksId" column="ks_id"/>
+        <result property="ksName" column="ks_name"/>
+        <result property="operatorId" column="operator_id"/>
+        <result property="operatorLeader" column="operator_leader"/>
+        <result property="productName" column="product_name"/>
+        <result property="industry" column="industry"/>
+        <result property="secondIndustry" column="second_industry"/>
+        <result property="corporationName" column="corporation_name"/>
+        <result property="accountStatus" column="account_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectKuaishouAccountVo">
+        select id,
+               account_id,
+               account_name,
+               project_id,
+               project_name,
+               media_code,
+               ks_id,
+               ks_name,
+               operator_id,
+               operator_leader,
+               product_name,
+               industry,
+               second_industry,
+               corporation_name,
+               account_status,
+               create_time,
+               update_time
+        from kuaishou_account
+    </sql>
+
+    <select id="selectKuaishouAccountList" parameterType="com.ruixuan.jinniu.entity.KuaishouAccount"
+            resultMap="KuaishouAccountResult">
+        <include refid="selectKuaishouAccountVo"/>
+        <where>
+            <if test="accountId != null ">and account_id = #{accountId}</if>
+            <if test="accountName != null  and accountName != ''">and account_name like concat('%', #{accountName},
+                '%')
+            </if>
+            <if test="projectId != null ">and project_id = #{projectId}</if>
+            <if test="projectName != null  and projectName != ''">and project_name like concat('%', #{projectName},
+                '%')
+            </if>
+            <if test="mediaCode != null  and mediaCode != ''">and media_code = #{mediaCode}</if>
+            <if test="ksId != null ">and ks_id = #{ksId}</if>
+            <if test="ksName != null  and ksName != ''">and ks_name like concat('%', #{ksName}, '%')</if>
+            <if test="operatorId != null  and operatorId != ''">and operator_id = #{operatorId}</if>
+            <if test="operatorLeader != null  and operatorLeader != ''">and operator_leader = #{operatorLeader}</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="industry != null  and industry != ''">and industry = #{industry}</if>
+            <if test="secondIndustry != null  and secondIndustry != ''">and second_industry = #{secondIndustry}</if>
+            <if test="corporationName != null  and corporationName != ''">and corporation_name like concat('%',
+                #{corporationName}, '%')
+            </if>
+            <if test="accountStatus != null  and accountStatus != ''">and account_status = #{accountStatus}</if>
+        </where>
+    </select>
+
+    <select id="selectKuaishouAccountById" parameterType="Long" resultMap="KuaishouAccountResult">
+        <include refid="selectKuaishouAccountVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertKuaishouAccount" parameterType="com.ruixuan.jinniu.entity.KuaishouAccount" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into kuaishou_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="accountId != null">account_id,</if>
+            <if test="accountName != null">account_name,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="projectName != null">project_name,</if>
+            <if test="mediaCode != null">media_code,</if>
+            <if test="ksId != null">ks_id,</if>
+            <if test="ksName != null">ks_name,</if>
+            <if test="operatorId != null">operator_id,</if>
+            <if test="operatorLeader != null">operator_leader,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="industry != null">industry,</if>
+            <if test="secondIndustry != null">second_industry,</if>
+            <if test="corporationName != null">corporation_name,</if>
+            <if test="accountStatus != null">account_status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="accountId != null">#{accountId},</if>
+            <if test="accountName != null">#{accountName},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="mediaCode != null">#{mediaCode},</if>
+            <if test="ksId != null">#{ksId},</if>
+            <if test="ksName != null">#{ksName},</if>
+            <if test="operatorId != null">#{operatorId},</if>
+            <if test="operatorLeader != null">#{operatorLeader},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="industry != null">#{industry},</if>
+            <if test="secondIndustry != null">#{secondIndustry},</if>
+            <if test="corporationName != null">#{corporationName},</if>
+            <if test="accountStatus != null">#{accountStatus},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateKuaishouAccount" parameterType="com.ruixuan.jinniu.entity.KuaishouAccount">
+        update kuaishou_account
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="accountId != null">account_id = #{accountId},</if>
+            <if test="accountName != null">account_name = #{accountName},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="mediaCode != null">media_code = #{mediaCode},</if>
+            <if test="ksId != null">ks_id = #{ksId},</if>
+            <if test="ksName != null">ks_name = #{ksName},</if>
+            <if test="operatorId != null">operator_id = #{operatorId},</if>
+            <if test="operatorLeader != null">operator_leader = #{operatorLeader},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="industry != null">industry = #{industry},</if>
+            <if test="secondIndustry != null">second_industry = #{secondIndustry},</if>
+            <if test="corporationName != null">corporation_name = #{corporationName},</if>
+            <if test="accountStatus != null">account_status = #{accountStatus},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKuaishouAccountById" parameterType="Long">
+        delete
+        from kuaishou_account
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteKuaishouAccountByIds" parameterType="String">
+        delete from kuaishou_account where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>