Merge remote-tracking branch 'origin/master'

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentAuditController.java

@@ -1,115 +1,21 @@
 package com.fdkankan.agent.controller;
 
 
-import com.fdkankan.agent.controller.request.RequestAgentAudit;
-import com.fdkankan.agent.controller.request.RequestNote;
-import com.fdkankan.agent.controller.request.RequestSearch;
-import com.fdkankan.agent.entity.AgentAudit;
-import com.fdkankan.agent.service.IAgentAuditService;
-import com.fdkankan.common.constant.ConstantRegex;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.validation.ValidationUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
-import java.util.LinkedHashMap;
-import java.util.List;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 经销商申请模块
+ * <p>
+ * 代理商申请表 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
  */
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/agent/agent-audit")
 public class AgentAuditController {
 
-    @Autowired
-    IAgentAuditService agentAuditService;
-
-    private static Logger log = LoggerFactory.getLogger("programLog");
-
-    /**
-     * 保存申请信息
-     */
-    @PostMapping("/agentAduit/save")
-    public ResultData agentAuditSave(
-            @RequestBody RequestAgentAudit param) {
-        if(param == null || StringUtils.isEmpty(param.getName()) || StringUtils.isEmpty(param.getAddress()) ||
-                StringUtils.isEmpty(param.getCountry()) || StringUtils.isEmpty(param.getRegion()) ||
-                StringUtils.isEmpty(param.getSurName()) || StringUtils.isEmpty(param.getUserName()) ||
-                StringUtils.isEmpty(param.getPost()) || StringUtils.isEmpty(param.getAreaCode()) ||
-                StringUtils.isEmpty(param.getPhone()) || StringUtils.isEmpty(param.getEmail())){
-            return ResultData.error(ErrorCode.FAILURE_CODE_3001);
-        }
-
-        if(!param.getEmail().matches(ConstantRegex.EMAIL_REGEX)){
-            return ResultData.error(ErrorCode.FAILURE_CODE_3019);
-        }
-
-        AgentAudit agentAudit = new AgentAudit();
-        BeanUtils.copyProperties(param,agentAudit);
-        agentAudit.setRecStatus("A");
-        agentAudit.setNoteType(1);
-        agentAudit.setState(1);
-        agentAuditService.insert(agentAudit);
-        return ResultData.ok();
-    }
-
-    @GetMapping("/manager/agentAduit/list")
-    public ResultData list(
-            @RequestParam(value="pageNum", defaultValue="1", required = false) Integer pageNum,
-            @RequestParam(value="pageSize", defaultValue="10", required = false) Integer pageSize) {
-
-        LinkedHashMap<String,String> condition = new LinkedHashMap<>();
-        condition.put("rec_status = 'A'","and");
-        List<AgentAudit> agentAuditList = agentAuditService.getList(condition,pageNum, pageSize, "create_time desc");
-        int count = agentAuditService.getCount(condition, null);
-        return ResultData.ok(pageNum,pageSize,count,agentAuditList);
-    }
-
-    @PostMapping("/manager/agentAduit/update/active/{id}/{state}")
-    private ResultData updateActive(
-            @PathVariable("id") Long id, @PathVariable("state") String state) {
-        LinkedHashMap<String,String> condition = new LinkedHashMap<>();
-        condition.put("id ="+id,"and");
-        condition.put("rec_status = 'A'","and");
-        AgentAudit agentAudit = agentAuditService.getOne(condition);
-        int iState = Integer.parseInt(state);
-        if (agentAudit == null || !ValidationUtils.validateState(iState)) {
-            log.info("state: {}", state);
-            return ResultData.error(ErrorCode.FAILURE_CODE_3001);
-        }
-        agentAudit.setState(iState);
-        agentAuditService.update(agentAudit);
-        return ResultData.ok();
-    }
-
-
-    @PostMapping("/manager/agentAduit/update/note")
-    private ResultData updateNote(@RequestBody RequestNote param){
-        LinkedHashMap<String,String> condition = new LinkedHashMap<>();
-        condition.put("id ="+param.getId(),"and");
-        condition.put("rec_status = 'A'","and");
-        AgentAudit agentAudit = agentAuditService.getOne(condition);
-        if (agentAudit == null) {
-            return ResultData.error(ErrorCode.FAILURE_CODE_3001);
-        }
-        if (!ValidationUtils.validateInteger(param.getNoteType())){
-            log.info("NoteType: {}", param.getNoteType());
-            return ResultData.error(ErrorCode.FAILURE_CODE_3001);
-        }
-        agentAudit.setNoteType(param.getNoteType());
-        agentAudit.setNoteContent(param.getNoteContent());
-        agentAuditService.update(agentAudit);
-        return ResultData.ok();
-    }
-
-    @PostMapping("/manager/agentAduit/search")
-    private ResultData search(@RequestBody RequestSearch param) {
-        return  agentAuditService.searchLike(param);
-    }
 }
+

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentController.java

@@ -1,64 +1,21 @@
 package com.fdkankan.agent.controller;
 
 
-import com.auth0.jwt.JWT;
-import com.fdkankan.agent.entity.Agent;
-import com.fdkankan.agent.entity.AgentNotice;
-import com.fdkankan.agent.service.IAgentNoticeService;
-import com.fdkankan.agent.service.IAgentService;
-import com.fdkankan.agent.vo.AgentNoticeVo;
-import com.fdkankan.agent.vo.AgentVo;
-import com.fdkankan.common.response.ResultData;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.LinkedHashMap;
-import java.util.List;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * <p>
+ * 代理商表 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
 @RestController
-@RequestMapping("/api/agent")
+@RequestMapping("/agent/agent")
 public class AgentController {
 
-
-    @Autowired
-    IAgentService agentService;
-    @Autowired
-    IAgentNoticeService agentNoticeService;
-
-    /**
-     * 获取代理商信息
-     * @return
-     */
-    @PostMapping(value = "/detail")
-    public ResultData detail(HttpServletRequest request ) {
-        String userName = JWT.decode( request.getHeader("token")).getClaim("userName").asString();
-        String agentId = userName.split(":")[1];
-        LinkedHashMap<String,String > queryMap = new LinkedHashMap<>();
-        queryMap.put("agent_id = "+agentId ,"and");
-        queryMap.put("rec_status = A" ,"and");
-        Agent one = agentService.getOne(queryMap);
-        AgentVo agentDto = new AgentVo();
-        BeanUtils.copyProperties(one, agentDto);
-        return ResultData.ok(agentDto);
-    }
-    /**
-     * 获取代理商公告
-     * @return
-     */
-    @PostMapping(value = "/notice")
-    public ResultData notice(HttpServletRequest request ) {
-        AgentNoticeVo agentNoticeVo = new AgentNoticeVo();
-        LinkedHashMap<String,String> queryMap = new LinkedHashMap<>();
-        queryMap.put("rec_status = A" ,"and");
-        List<AgentNotice> notices = agentNoticeService.getList(queryMap, 1, 1, "create_time desc");
-        if (notices != null && notices.size() > 0){
-            BeanUtils.copyProperties(notices.get(0), agentNoticeVo);
-        }
-        return ResultData.ok(agentNoticeVo);
-    }
-
 }
+

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentFrameworkController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.agent.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 代理商架构管理 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@RestController
+@RequestMapping("/agent/agent-framework")
+public class AgentFrameworkController {
+
+}
+

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentNoticeController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.agent.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 代理商公告表 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@RestController
+@RequestMapping("/agent/agent-notice")
+public class AgentNoticeController {
+
+}
+

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/request/RequestAgentAudit.java

@@ -1,61 +0,0 @@
-package com.fdkankan.agent.controller.request;
-
-import com.fdkankan.common.base.request.RequestBase;
-import lombok.Data;
-
-@Data
-public class RequestAgentAudit extends RequestBase {
-
-    /**
-     * 经销商公司名称
-     */
-    private String name;
-    /**
-     * 国家
-     */
-    private String country;
-    /**
-     * 地区
-     */
-    private String region;
-    /**
-     * 地址
-     */
-    private String address;
-    /**
-     * 类型，1为线下，2为线上
-     */
-    private Integer type;
-    /**
-     * 线下门店地址或线上网站
-     */
-    private String storeAddress;
-    /**
-     * 申请人的姓
-     */
-    private String surName;
-    /**
-     * 状态，0申请中，1审核通过，2审核失败
-     */
-    private int state;
-    /**
-     * 申请人的名字
-     */
-    private String userName;
-    /**
-     * 申请人职位
-     */
-    private String post;
-    /**
-     * 区号
-     */
-    private String areaCode;
-    /**
-     * 手机号
-     */
-    private String phone;
-    /**
-     * 邮箱地址
-     */
-    private String email;
-}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/request/RequestNote.java

@@ -1,25 +0,0 @@
-package com.fdkankan.agent.controller.request;
-
-
-import com.fdkankan.common.base.request.RequestBase;
-import lombok.Data;
-
-/**
- * 备注信息
- */
-
-@Data
-public class RequestNote extends RequestBase {
-
-    private Long id;
-
-    /**
-     * 备注等级
-     */
-    private Integer noteType;
-
-    /**
-     * 备注内容
-     */
-    private String noteContent;
-}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/request/RequestSearch.java

@@ -1,17 +0,0 @@
-package com.fdkankan.agent.controller.request;
-
-import com.fdkankan.common.base.request.RequestBase;
-import lombok.Data;
-
-@Data
-public class RequestSearch extends RequestBase {
-
-    private String itemName;
-
-    private String startDate;
-
-    private String endDate;
-
-    private String type;
-
-}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/Agent.java

@@ -1,121 +1,97 @@
 package com.fdkankan.agent.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 代理商表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_agent")
+public class Agent implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 代理商Id
+     */
+    private String agentId;
+
+    /**
+     * 代理商公司名称
+     */
+    private String agentName;
+
+    /**
+     * 代理商密码
+     */
+    private String agentPassword;
+
+    /**
+     * 代理商区域
+     */
+    private String agentArea;
+
+    /**
+     * 代理商邮箱
+     */
+    private String agentEmail;
+
+    /**
+     * 代理商电话
+     */
+    private String agentPhone;
+
+    /**
+     * 状态：1-正常，0-冻结
+     */
+    private Integer state;
+
+    /**
+     * 代理数量
+     */
+    private Integer agentNum;
+
+    /**
+     * 代理商所在的国家
+     */
+    private String agentCountry;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    private String recStatus;
+
+    /**
+     * 0正常 ，1删除
+     */
+    private Integer tbStatus;
 
-public class Agent implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String agentId; // 代理商Id
-	private String agentName; // 代理商公司名称
-	private String agentPassword; // 代理商密码
-	private String agentArea; // 代理商区域
-	private String agentEmail; // 代理商邮箱
-	private String agentPhone; // 代理商电话
-	private Integer state; // 状态：1-正常，0-冻结
-	private Integer agentNum; // 代理数量
-	private String agentCountry; // 代理商所在的国家
-	private String createTime; // 创建时间
-	private String updateTime; // 更新时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private Integer tbStatus; // 0正常 ，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getAgentId() {
-		return agentId;
-	}
-	public void setAgentId(String agentId) {
-		this.agentId = agentId;
-	}
-
-	public String getAgentName() {
-		return agentName;
-	}
-	public void setAgentName(String agentName) {
-		this.agentName = agentName;
-	}
-
-	public String getAgentPassword() {
-		return agentPassword;
-	}
-	public void setAgentPassword(String agentPassword) {
-		this.agentPassword = agentPassword;
-	}
-
-	public String getAgentArea() {
-		return agentArea;
-	}
-	public void setAgentArea(String agentArea) {
-		this.agentArea = agentArea;
-	}
-
-	public String getAgentEmail() {
-		return agentEmail;
-	}
-	public void setAgentEmail(String agentEmail) {
-		this.agentEmail = agentEmail;
-	}
-
-	public String getAgentPhone() {
-		return agentPhone;
-	}
-	public void setAgentPhone(String agentPhone) {
-		this.agentPhone = agentPhone;
-	}
-
-	public Integer getState() {
-		return state;
-	}
-	public void setState(Integer state) {
-		this.state = state;
-	}
-
-	public Integer getAgentNum() {
-		return agentNum;
-	}
-	public void setAgentNum(Integer agentNum) {
-		this.agentNum = agentNum;
-	}
-
-	public String getAgentCountry() {
-		return agentCountry;
-	}
-	public void setAgentCountry(String agentCountry) {
-		this.agentCountry = agentCountry;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
 
 }
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentAudit.java

@@ -1,169 +1,127 @@
 package com.fdkankan.agent.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 代理商申请表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_agent_audit")
+public class AgentAudit implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 经销商公司名称
+     */
+    private String auditName;
+
+    /**
+     * 国家
+     */
+    private String country;
+
+    /**
+     * 地区
+     */
+    private String region;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 类型，1为线下，2为线上
+     */
+    private Integer auditType;
+
+    /**
+     * 线下门店地址或线上网站
+     */
+    private String storeAddress;
+
+    /**
+     * 申请人的姓
+     */
+    private String surName;
+
+    /**
+     * 申请人的名字
+     */
+    private String userName;
+
+    /**
+     * 申请人职位
+     */
+    private String post;
+
+    /**
+     * 区号
+     */
+    private String areaCode;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 邮箱地址
+     */
+    private String email;
+
+    /**
+     * 状态，0申请中，1审核通过，2审核失败
+     */
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    private String recStatus;
+
+    /**
+     * 备注等级
+     */
+    private Integer noteType;
+
+    /**
+     * 备注内容
+     */
+    private String noteContent;
+
+    /**
+     * 0正常，1删除
+     */
+    private Integer tbStatus;
 
-public class AgentAudit implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String auditName; // 经销商公司名称
-	private String country; // 国家
-	private String region; // 地区
-	private String address; // 地址
-	private Integer auditType; // 类型，1为线下，2为线上
-	private String storeAddress; // 线下门店地址或线上网站
-	private String surName; // 申请人的姓
-	private String userName; // 申请人的名字
-	private String post; // 申请人职位
-	private String areaCode; // 区号
-	private String phone; // 手机号
-	private String email; // 邮箱地址
-	private Integer state; // 状态，0申请中，1审核通过，2审核失败
-	private String createTime; // 创建时间
-	private String updateTime; // 更新时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private Integer noteType; // 备注等级
-	private String noteContent; // 备注内容
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getAuditName() {
-		return auditName;
-	}
-	public void setAuditName(String auditName) {
-		this.auditName = auditName;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	public String getRegion() {
-		return region;
-	}
-	public void setRegion(String region) {
-		this.region = region;
-	}
-
-	public String getAddress() {
-		return address;
-	}
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	public Integer getAuditType() {
-		return auditType;
-	}
-	public void setAuditType(Integer auditType) {
-		this.auditType = auditType;
-	}
-
-	public String getStoreAddress() {
-		return storeAddress;
-	}
-	public void setStoreAddress(String storeAddress) {
-		this.storeAddress = storeAddress;
-	}
-
-	public String getSurName() {
-		return surName;
-	}
-	public void setSurName(String surName) {
-		this.surName = surName;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getPost() {
-		return post;
-	}
-	public void setPost(String post) {
-		this.post = post;
-	}
-
-	public String getAreaCode() {
-		return areaCode;
-	}
-	public void setAreaCode(String areaCode) {
-		this.areaCode = areaCode;
-	}
-
-	public String getPhone() {
-		return phone;
-	}
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public Integer getState() {
-		return state;
-	}
-	public void setState(Integer state) {
-		this.state = state;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getNoteType() {
-		return noteType;
-	}
-	public void setNoteType(Integer noteType) {
-		this.noteType = noteType;
-	}
-
-	public String getNoteContent() {
-		return noteContent;
-	}
-	public void setNoteContent(String noteContent) {
-		this.noteContent = noteContent;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
 
 }
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentFramework.java

@@ -1,64 +1,53 @@
 package com.fdkankan.agent.entity;
 
-public class AgentFramework implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 代理商架构管理
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_agent_framework")
+public class AgentFramework implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 上级架构id
+     */
+    private Long parentId;
+
+    /**
+     * 代理商名称
+     */
+    private String agentName;
+
+    private String recStatus;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    /**
+     * 0正常，1删除
+     */
+    private Integer tbStatus;
 
-	private String id; // 
-	private String parentId; // 上级架构id
-	private String agentName; // 代理商名称
-	private String recStatus; // 
-	private String createTime; // 
-	private String updateTime; // 
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getParentId() {
-		return parentId;
-	}
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-
-	public String getAgentName() {
-		return agentName;
-	}
-	public void setAgentName(String agentName) {
-		this.agentName = agentName;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
 
 }
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentNotice.java

@@ -1,65 +1,62 @@
 package com.fdkankan.agent.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 代理商公告表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_agent_notice")
+public class AgentNotice implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 公告内容
+     */
+    private String content;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    private String recStatus;
+
+    /**
+     * 0正常，1删除
+     */
+    private Integer tbStatus;
 
-public class AgentNotice implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String title; // 标题
-	private String content; // 公告内容
-	private String createTime; // 创建时间
-	private String updateTime; // 更新时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getContent() {
-		return content;
-	}
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
 
 }
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentAuditMapper.java

@@ -0,0 +1,16 @@
+package com.fdkankan.agent.mapper;
+
+import com.fdkankan.agent.entity.AgentAudit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 代理商申请表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+public interface AgentAuditMapper extends BaseMapper<AgentAudit> {
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentFrameworkMapper.java

@@ -0,0 +1,16 @@
+package com.fdkankan.agent.mapper;
+
+import com.fdkankan.agent.entity.AgentFramework;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 代理商架构管理 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+public interface AgentFrameworkMapper extends BaseMapper<AgentFramework> {
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentMapper.java

@@ -0,0 +1,16 @@
+package com.fdkankan.agent.mapper;
+
+import com.fdkankan.agent.entity.Agent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 代理商表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+public interface AgentMapper extends BaseMapper<Agent> {
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentNoticeMapper.java

@@ -0,0 +1,16 @@
+package com.fdkankan.agent.mapper;
+
+import com.fdkankan.agent.entity.AgentNotice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 代理商公告表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+public interface AgentNoticeMapper extends BaseMapper<AgentNotice> {
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IAgentAuditMapper.java

@@ -1,9 +0,0 @@
-package com.fdkankan.agent.mapper;
-
-
-import com.fdkankan.agent.entity.AgentAudit;
-import com.fdkankan.common.base.IOperations;
-
-public interface IAgentAuditMapper extends IOperations<AgentAudit> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IAgentFrameworkMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.agent.mapper;
-
-import com.fdkankan.agent.entity.AgentFramework;
-import com.fdkankan.common.base.IOperations;
-
-public interface IAgentFrameworkMapper extends IOperations<AgentFramework> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IAgentMapper.java

@@ -1,9 +0,0 @@
-package com.fdkankan.agent.mapper;
-
-
-import com.fdkankan.agent.entity.Agent;
-import com.fdkankan.common.base.IOperations;
-
-public interface IAgentMapper extends IOperations<Agent> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IAgentNoticeMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.agent.mapper;
-
-import com.fdkankan.agent.entity.AgentNotice;
-import com.fdkankan.common.base.IOperations;
-
-public interface IAgentNoticeMapper extends IOperations<AgentNotice> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentAuditMapper.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="com.fdkankan.agent.mapper.AgentAuditMapper">
+
+</mapper>

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentFrameworkMapper.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="com.fdkankan.agent.mapper.AgentFrameworkMapper">
+
+</mapper>

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentMapper.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="com.fdkankan.agent.mapper.AgentMapper">
+
+</mapper>

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentNoticeMapper.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="com.fdkankan.agent.mapper.AgentNoticeMapper">
+
+</mapper>

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentAuditService.java

@@ -1,12 +1,16 @@
 package com.fdkankan.agent.service;
 
-import com.fdkankan.agent.controller.request.RequestSearch;
 import com.fdkankan.agent.entity.AgentAudit;
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.common.response.ResultData;
+import com.baomidou.mybatisplus.extension.service.IService;
 
-public interface IAgentAuditService extends IServiceOperations<AgentAudit> {
+/**
+ * <p>
+ * 代理商申请表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+public interface IAgentAuditService extends IService<AgentAudit> {
 
-    ResultData searchLike(RequestSearch param);
 }
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentFrameworkService.java

@@ -1,9 +1,16 @@
 package com.fdkankan.agent.service;
 
 import com.fdkankan.agent.entity.AgentFramework;
-import com.fdkankan.common.base.IServiceOperations;
+import com.baomidou.mybatisplus.extension.service.IService;
 
-public interface IAgentFrameworkService extends IServiceOperations<AgentFramework> {
+/**
+ * <p>
+ * 代理商架构管理 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+public interface IAgentFrameworkService extends IService<AgentFramework> {
 
 }
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentNoticeService.java

@@ -1,9 +1,16 @@
 package com.fdkankan.agent.service;
 
 import com.fdkankan.agent.entity.AgentNotice;
-import com.fdkankan.common.base.IServiceOperations;
+import com.baomidou.mybatisplus.extension.service.IService;
 
-public interface IAgentNoticeService extends IServiceOperations<AgentNotice> {
+/**
+ * <p>
+ * 代理商公告表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+public interface IAgentNoticeService extends IService<AgentNotice> {
 
 }
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentService.java

@@ -1,9 +1,16 @@
 package com.fdkankan.agent.service;
 
 import com.fdkankan.agent.entity.Agent;
-import com.fdkankan.common.base.IServiceOperations;
+import com.baomidou.mybatisplus.extension.service.IService;
 
-public interface IAgentService extends IServiceOperations<Agent> {
+/**
+ * <p>
+ * 代理商表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+public interface IAgentService extends IService<Agent> {
 
 }
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentAuditService.java

@@ -1,61 +0,0 @@
-package com.fdkankan.agent.service.impl;
-
-import com.fdkankan.agent.controller.request.RequestSearch;
-import com.fdkankan.agent.entity.AgentAudit;
-import com.fdkankan.agent.mapper.IAgentAuditMapper;
-import com.fdkankan.agent.service.IAgentAuditService;
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.common.response.ResultData;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-@Service("AgentAuditService")
-public class AgentAuditService extends AbstractService<AgentAudit> implements IAgentAuditService {
-
-	public AgentAuditService() {
-		this.setTableName("t_agent_audit");
-	}
-	@Resource
-	private IAgentAuditMapper tAgentAuditMapper;
-
-	@Override
-	protected IOperations<AgentAudit> getMapper() {
-		return tAgentAuditMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-
-	@Override
-	public ResultData searchLike(RequestSearch param) {
-		Integer pageNum = Integer.valueOf(param.getPageNum());
-		Integer pageSize = Integer.valueOf(param.getPageSize());
-		String startDate = param.getStartDate();
-		String endDate = param.getEndDate();
-		String itemName = param.getItemName();
-
-		LinkedHashMap<String,String> condition = new LinkedHashMap<>();
-		condition.put("rec_status ='A'","and");
-		if(StringUtils.isNotBlank(startDate)){
-			condition.put("create_time >= '"+startDate+"'","and");
-		}
-		if(StringUtils.isNotBlank(endDate)){
-			condition.put("create_time <= '"+endDate+"' ","and");
-		}
-		if(StringUtils.isNotBlank(itemName)){
-			condition.put("((audit_name like '%"+itemName+"%' )","and");
-			condition.put("(address like '%"+itemName+"%' )","or");
-			condition.put("(note_content like '%"+itemName+"%' ))","or");
-		}
-		List<AgentAudit> list = this.getList(condition, pageNum,pageSize,"create_time desc");
-		Integer total = this.getCount(condition,null);
-		return ResultData.ok(pageNum,pageSize,total,list);
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentAuditServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.agent.service.impl;
+
+import com.fdkankan.agent.entity.AgentAudit;
+import com.fdkankan.agent.mapper.AgentAuditMapper;
+import com.fdkankan.agent.service.IAgentAuditService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 代理商申请表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@Service
+public class AgentAuditServiceImpl extends ServiceImpl<AgentAuditMapper, AgentAudit> implements IAgentAuditService {
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentFrameworkService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.agent.service.impl;
-
-import com.fdkankan.agent.entity.AgentFramework;
-import com.fdkankan.agent.mapper.IAgentFrameworkMapper;
-import com.fdkankan.agent.service.IAgentFrameworkService;
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("AgentFrameworkService")
-public class AgentFrameworkService extends AbstractService<AgentFramework> implements IAgentFrameworkService {
-
-	public AgentFrameworkService() {
-		this.setTableName("t_agent_framework");
-	}
-	@Resource
-	private IAgentFrameworkMapper tAgentFrameworkMapper;
-
-	@Override
-	protected IOperations<AgentFramework> getMapper() {
-		return tAgentFrameworkMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentFrameworkServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.agent.service.impl;
+
+import com.fdkankan.agent.entity.AgentFramework;
+import com.fdkankan.agent.mapper.AgentFrameworkMapper;
+import com.fdkankan.agent.service.IAgentFrameworkService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 代理商架构管理 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@Service
+public class AgentFrameworkServiceImpl extends ServiceImpl<AgentFrameworkMapper, AgentFramework> implements IAgentFrameworkService {
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentNoticeService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.agent.service.impl;
-
-import com.fdkankan.agent.entity.AgentNotice;
-import com.fdkankan.agent.mapper.IAgentNoticeMapper;
-import com.fdkankan.agent.service.IAgentNoticeService;
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("AgentNoticeService")
-public class AgentNoticeService extends AbstractService<AgentNotice> implements IAgentNoticeService {
-
-	public AgentNoticeService() {
-		this.setTableName("t_agent_notice");
-	}
-	@Resource
-	private IAgentNoticeMapper tAgentNoticeMapper;
-
-	@Override
-	protected IOperations<AgentNotice> getMapper() {
-		return tAgentNoticeMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentNoticeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.agent.service.impl;
+
+import com.fdkankan.agent.entity.AgentNotice;
+import com.fdkankan.agent.mapper.AgentNoticeMapper;
+import com.fdkankan.agent.service.IAgentNoticeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 代理商公告表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@Service
+public class AgentNoticeServiceImpl extends ServiceImpl<AgentNoticeMapper, AgentNotice> implements IAgentNoticeService {
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.agent.service.impl;
-
-import com.fdkankan.agent.entity.Agent;
-import com.fdkankan.agent.mapper.IAgentMapper;
-import com.fdkankan.agent.service.IAgentService;
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("AgentService")
-public class AgentService extends AbstractService<Agent> implements IAgentService {
-
-	public AgentService() {
-		this.setTableName("t_agent");
-	}
-	@Resource
-	private IAgentMapper tAgentMapper;
-
-	@Override
-	protected IOperations<Agent> getMapper() {
-		return tAgentMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.agent.service.impl;
+
+import com.fdkankan.agent.entity.Agent;
+import com.fdkankan.agent.mapper.AgentMapper;
+import com.fdkankan.agent.service.IAgentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 代理商表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-12-22
+ */
+@Service
+public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements IAgentService {
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/agent/vo/AgentNoticeVo.java

@@ -1,65 +0,0 @@
-package com.fdkankan.agent.vo;
-
-
-public class AgentNoticeVo implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String title; // 标题
-	private String content; // 公告内容
-	private String createTime; // 创建时间
-	private String updateTime; // 更新时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getContent() {
-		return content;
-	}
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/agent/vo/AgentVo.java

@@ -1,121 +0,0 @@
-package com.fdkankan.agent.vo;
-
-
-public class AgentVo implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String agentId; // 代理商Id
-	private String agentName; // 代理商公司名称
-	private String agentPassword; // 代理商密码
-	private String agentArea; // 代理商区域
-	private String agentEmail; // 代理商邮箱
-	private String agentPhone; // 代理商电话
-	private Integer state; // 状态：1-正常，0-冻结
-	private Integer agentNum; // 代理数量
-	private String agentCountry; // 代理商所在的国家
-	private String createTime; // 创建时间
-	private String updateTime; // 更新时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private Integer tbStatus; // 0正常 ，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getAgentId() {
-		return agentId;
-	}
-	public void setAgentId(String agentId) {
-		this.agentId = agentId;
-	}
-
-	public String getAgentName() {
-		return agentName;
-	}
-	public void setAgentName(String agentName) {
-		this.agentName = agentName;
-	}
-
-	public String getAgentPassword() {
-		return agentPassword;
-	}
-	public void setAgentPassword(String agentPassword) {
-		this.agentPassword = agentPassword;
-	}
-
-	public String getAgentArea() {
-		return agentArea;
-	}
-	public void setAgentArea(String agentArea) {
-		this.agentArea = agentArea;
-	}
-
-	public String getAgentEmail() {
-		return agentEmail;
-	}
-	public void setAgentEmail(String agentEmail) {
-		this.agentEmail = agentEmail;
-	}
-
-	public String getAgentPhone() {
-		return agentPhone;
-	}
-	public void setAgentPhone(String agentPhone) {
-		this.agentPhone = agentPhone;
-	}
-
-	public Integer getState() {
-		return state;
-	}
-	public void setState(Integer state) {
-		this.state = state;
-	}
-
-	public Integer getAgentNum() {
-		return agentNum;
-	}
-	public void setAgentNum(Integer agentNum) {
-		this.agentNum = agentNum;
-	}
-
-	public String getAgentCountry() {
-		return agentCountry;
-	}
-	public void setAgentCountry(String agentCountry) {
-		this.agentCountry = agentCountry;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/controller/CameraVersionController.java

@@ -1,74 +0,0 @@
-package com.fdkankan.goods.controller;
-
-import com.fdkankan.agent.controller.request.RequestSearch;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.goods.controller.request.RequestCameraVersion;
-import com.fdkankan.goods.entity.CameraVersion;
-import com.fdkankan.goods.service.ICameraVersionService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-/**
- * 相机版本管理模块
- */
-@RequestMapping("/api")
-public class CameraVersionController {
-
-    @Autowired
-    private ICameraVersionService cameraVersionService;
-
-
-    /**
-     * 获取相机版本列表
-     */
-    @GetMapping("/manager/goods/version/list")
-    private ResultData getList(@RequestParam(value="pageNum", defaultValue="1", required = false) Integer pageNum,
-                               @RequestParam(value="pageSize", defaultValue="10", required = false) Integer pageSize,
-                               String type) {
-
-        LinkedHashMap<String,String> condition = new LinkedHashMap<>();
-        if(StringUtils.isBlank(type)){
-            type = "1";
-        }
-        condition.put("res_status = 'A'","and");
-        condition.put("type = "+ type,"and");
-        List<CameraVersion> list = cameraVersionService.getList(condition,pageNum, pageSize, "create_time desc");
-        Integer total = cameraVersionService.getCount(condition,null);
-        return ResultData.ok(pageNum,pageSize,total,list);
-    }
-
-    /**
-     * 更新状态
-     * @param id
-     * @param status   状态
-     * @param type     相机类型，1八目，2双目,不传默认八目 3:转台相机 4：激光
-     * @return
-     */
-    @GetMapping("/manager/goods/version/update/{id}/{status}/{type}")
-    private ResultData updateStatus(@PathVariable("id") Long id, @PathVariable("status") String status, @PathVariable("type") String type) {
-        return cameraVersionService.updateStatus(id, StringUtils.upperCase(status), type);
-    }
-
-
-    @PostMapping("/manager/goods/version/search")
-    private ResultData search(@RequestBody RequestSearch param){
-        return cameraVersionService.searchLike(param);
-    }
-
-
-    @PostMapping(value = "/manager/goods/version/upload", consumes = { "multipart/form-data" })
-    private ResultData upload(@RequestParam("file") MultipartFile file,
-                          @RequestParam("version") String version,
-                          @RequestParam("description") String description,
-                          @RequestParam("minVersion") String minVersion,
-                          String type) {
-
-        return cameraVersionService.upload(file, version,description,minVersion,type);
-    }
-}

4dkankan-center-platform/src/main/java/com/fdkankan/goods/controller/request/RequestCameraVersion.java

@@ -1,18 +0,0 @@
-package com.fdkankan.goods.controller.request;
-
-import lombok.Data;
-
-@Data
-public class RequestCameraVersion {
-
-    private static final long serialVersionUID = 2345798398902100085L;
-
-    private String description; // 描述
-
-    private String version; // 相机版本
-
-    private String minVersion; // 相机版本
-
-    private Integer type;
-
-}

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/Camera.java

@@ -1,97 +0,0 @@
-package com.fdkankan.goods.entity;
-
-
-public class Camera implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String childName; // 相机的Mac地址
-	private String activatedTime; // 激活时间
-	private String childPassword; // 相机密码
-	private String snCode; // sn码
-	private String wifiName; // wifi名称
-	private String wifiPassword; // wifi密码
-	private String createTime; // 创建时间
-	private String updateTime; // 更新时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getChildName() {
-		return childName;
-	}
-	public void setChildName(String childName) {
-		this.childName = childName;
-	}
-
-	public String getActivatedTime() {
-		return activatedTime;
-	}
-	public void setActivatedTime(String activatedTime) {
-		this.activatedTime = activatedTime;
-	}
-
-	public String getChildPassword() {
-		return childPassword;
-	}
-	public void setChildPassword(String childPassword) {
-		this.childPassword = childPassword;
-	}
-
-	public String getSnCode() {
-		return snCode;
-	}
-	public void setSnCode(String snCode) {
-		this.snCode = snCode;
-	}
-
-	public String getWifiName() {
-		return wifiName;
-	}
-	public void setWifiName(String wifiName) {
-		this.wifiName = wifiName;
-	}
-
-	public String getWifiPassword() {
-		return wifiPassword;
-	}
-	public void setWifiPassword(String wifiPassword) {
-		this.wifiPassword = wifiPassword;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraDetail.java

@@ -1,169 +0,0 @@
-package com.fdkankan.goods.entity;
-
-
-public class CameraDetail implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String balance; // 余额
-	private String userId; // 用户表t_user的id
-	private Integer own; // 0表示客户，1表示员工，2表示赠送，3表示其他，4经销商销售
-	private String orderSn; // 订单号
-	private Integer country; // 0表示本国，1表示国外
-	private String agency; // 经销商
-	private Integer cameraType; // 相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
-	private String totalSpace; // 总容量
-	private String usedSpace; // 已使用容量
-	private String cameraId; // 相机主表t_camera的id
-	private String goodsId; // 商品表t_goods的id
-	private String companyId; // 企业表t_company的id
-	private String agentFrameworkId; // 代理商架构管理t_agent_framework的id
-	private String cooperationUser; // 相机协作用户id
-	private String address; // 设备地址（追溯管理后台）
-	private String createTime; // 创建时间
-	private String updateTime; // 更新时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getBalance() {
-		return balance;
-	}
-	public void setBalance(String balance) {
-		this.balance = balance;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public Integer getOwn() {
-		return own;
-	}
-	public void setOwn(Integer own) {
-		this.own = own;
-	}
-
-	public String getOrderSn() {
-		return orderSn;
-	}
-	public void setOrderSn(String orderSn) {
-		this.orderSn = orderSn;
-	}
-
-	public Integer getCountry() {
-		return country;
-	}
-	public void setCountry(Integer country) {
-		this.country = country;
-	}
-
-	public String getAgency() {
-		return agency;
-	}
-	public void setAgency(String agency) {
-		this.agency = agency;
-	}
-
-	public Integer getCameraType() {
-		return cameraType;
-	}
-	public void setCameraType(Integer cameraType) {
-		this.cameraType = cameraType;
-	}
-
-	public String getTotalSpace() {
-		return totalSpace;
-	}
-	public void setTotalSpace(String totalSpace) {
-		this.totalSpace = totalSpace;
-	}
-
-	public String getUsedSpace() {
-		return usedSpace;
-	}
-	public void setUsedSpace(String usedSpace) {
-		this.usedSpace = usedSpace;
-	}
-
-	public String getCameraId() {
-		return cameraId;
-	}
-	public void setCameraId(String cameraId) {
-		this.cameraId = cameraId;
-	}
-
-	public String getGoodsId() {
-		return goodsId;
-	}
-	public void setGoodsId(String goodsId) {
-		this.goodsId = goodsId;
-	}
-
-	public String getCompanyId() {
-		return companyId;
-	}
-	public void setCompanyId(String companyId) {
-		this.companyId = companyId;
-	}
-
-	public String getAgentFrameworkId() {
-		return agentFrameworkId;
-	}
-	public void setAgentFrameworkId(String agentFrameworkId) {
-		this.agentFrameworkId = agentFrameworkId;
-	}
-
-	public String getCooperationUser() {
-		return cooperationUser;
-	}
-	public void setCooperationUser(String cooperationUser) {
-		this.cooperationUser = cooperationUser;
-	}
-
-	public String getAddress() {
-		return address;
-	}
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraOut.java

@@ -1,81 +0,0 @@
-package com.fdkankan.goods.entity;
-
-
-public class CameraOut implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String cameraId; // 相机id
-	private String orderId; // 订单id
-	private String agentName; // 经销商
-	private Integer outType; // 0:测试使用，1：线上出库，2：经销商出库
-	private String createTime; // 
-	private String updateTime; // 
-	private String recStatus; // 
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getCameraId() {
-		return cameraId;
-	}
-	public void setCameraId(String cameraId) {
-		this.cameraId = cameraId;
-	}
-
-	public String getOrderId() {
-		return orderId;
-	}
-	public void setOrderId(String orderId) {
-		this.orderId = orderId;
-	}
-
-	public String getAgentName() {
-		return agentName;
-	}
-	public void setAgentName(String agentName) {
-		this.agentName = agentName;
-	}
-
-	public Integer getOutType() {
-		return outType;
-	}
-	public void setOutType(Integer outType) {
-		this.outType = outType;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraSpace.java

@@ -1,105 +0,0 @@
-package com.fdkankan.goods.entity;
-
-
-public class CameraSpace implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String userId; // 用户表t_user的id
-	private String cameraId; // 相机主表t_camera的id
-	private String space; // 容量
-	private Integer spaceType; // 容量类型，0表示基础容量，1表示期限容量，2表示扩容容量
-	private String spaceStartTime; // 生效时间
-	private String spaceEndTime; // 结束时间
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private String orderSn; // 扩容订单集合
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getCameraId() {
-		return cameraId;
-	}
-	public void setCameraId(String cameraId) {
-		this.cameraId = cameraId;
-	}
-
-	public String getSpace() {
-		return space;
-	}
-	public void setSpace(String space) {
-		this.space = space;
-	}
-
-	public Integer getSpaceType() {
-		return spaceType;
-	}
-	public void setSpaceType(Integer spaceType) {
-		this.spaceType = spaceType;
-	}
-
-	public String getSpaceStartTime() {
-		return spaceStartTime;
-	}
-	public void setSpaceStartTime(String spaceStartTime) {
-		this.spaceStartTime = spaceStartTime;
-	}
-
-	public String getSpaceEndTime() {
-		return spaceEndTime;
-	}
-	public void setSpaceEndTime(String spaceEndTime) {
-		this.spaceEndTime = spaceEndTime;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getOrderSn() {
-		return orderSn;
-	}
-	public void setOrderSn(String orderSn) {
-		this.orderSn = orderSn;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraVersion.java

@@ -1,113 +0,0 @@
-package com.fdkankan.goods.entity;
-
-
-public class CameraVersion implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private Integer id; // 
-	private String fileName; // 名称
-	private String fileUrl; // 文件rul
-	private String fileMd5; // 文件MD5
-	private String description; // 描述
-	private String version; // 相机版本
-	private Integer cameraType; // 相机类型，1八目，2双目, 3转台双目, 4激光转台
-	private String acStatus; // 活动状态：A: 生效，I: 禁用
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String createTime; // 创建日期
-	private String updateTime; // 修改日期
-	private String minVersion; // 相机版本(最小)
-	private Integer tbStatus; // 0正常，1删除
-
-	public Integer getId() {
-		return id;
-	}
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getFileName() {
-		return fileName;
-	}
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-
-	public String getFileUrl() {
-		return fileUrl;
-	}
-	public void setFileUrl(String fileUrl) {
-		this.fileUrl = fileUrl;
-	}
-
-	public String getFileMd5() {
-		return fileMd5;
-	}
-	public void setFileMd5(String fileMd5) {
-		this.fileMd5 = fileMd5;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public Integer getCameraType() {
-		return cameraType;
-	}
-	public void setCameraType(Integer cameraType) {
-		this.cameraType = cameraType;
-	}
-
-	public String getAcStatus() {
-		return acStatus;
-	}
-	public void setAcStatus(String acStatus) {
-		this.acStatus = acStatus;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getMinVersion() {
-		return minVersion;
-	}
-	public void setMinVersion(String minVersion) {
-		this.minVersion = minVersion;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/Cart.java

@@ -1,106 +0,0 @@
-package com.fdkankan.goods.entity;
-import java.math.BigDecimal;
-
-
-public class Cart implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String userId; // t_user的id
-	private String goodsId; // t_goods的id
-	private String skuSn; // sku编号,唯一
-	private Integer goodsCount; // 商品数量
-	private BigDecimal price; // 价格
-	private BigDecimal amount; // 合计
-	private Integer payStatus; // 0表示未付，1表示已付
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getGoodsId() {
-		return goodsId;
-	}
-	public void setGoodsId(String goodsId) {
-		this.goodsId = goodsId;
-	}
-
-	public String getSkuSn() {
-		return skuSn;
-	}
-	public void setSkuSn(String skuSn) {
-		this.skuSn = skuSn;
-	}
-
-	public Integer getGoodsCount() {
-		return goodsCount;
-	}
-	public void setGoodsCount(Integer goodsCount) {
-		this.goodsCount = goodsCount;
-	}
-
-	public BigDecimal getPrice() {
-		return price;
-	}
-	public void setPrice(BigDecimal price) {
-		this.price = price;
-	}
-
-	public BigDecimal getAmount() {
-		return amount;
-	}
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-
-	public Integer getPayStatus() {
-		return payStatus;
-	}
-	public void setPayStatus(Integer payStatus) {
-		this.payStatus = payStatus;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CommerceOrder.java

@@ -1,138 +0,0 @@
-package com.fdkankan.goods.entity;
-import java.math.BigDecimal;
-
-
-public class CommerceOrder implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String orderSn; // 订单号
-	private BigDecimal amount; // 金额
-	private String number; // 支付宝的交易号或者微信支付订单号
-	private Integer payType; // 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他
-	private Integer payStatus; // 状态，0或-1表示未付款，1表示已付款
-	private String tradeTime; // 交易时间
-	private String userId; // 用户表t_user的id
-	private String cameraId; // 相机主表t_camera的id
-	private Integer commerceType; // 0表示年，1表示月
-	private Integer count; // 数量
-	private Integer abroad; // 0表示国内订单，1表示国外订单
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getOrderSn() {
-		return orderSn;
-	}
-	public void setOrderSn(String orderSn) {
-		this.orderSn = orderSn;
-	}
-
-	public BigDecimal getAmount() {
-		return amount;
-	}
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-
-	public String getNumber() {
-		return number;
-	}
-	public void setNumber(String number) {
-		this.number = number;
-	}
-
-	public Integer getPayType() {
-		return payType;
-	}
-	public void setPayType(Integer payType) {
-		this.payType = payType;
-	}
-
-	public Integer getPayStatus() {
-		return payStatus;
-	}
-	public void setPayStatus(Integer payStatus) {
-		this.payStatus = payStatus;
-	}
-
-	public String getTradeTime() {
-		return tradeTime;
-	}
-	public void setTradeTime(String tradeTime) {
-		this.tradeTime = tradeTime;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getCameraId() {
-		return cameraId;
-	}
-	public void setCameraId(String cameraId) {
-		this.cameraId = cameraId;
-	}
-
-	public Integer getCommerceType() {
-		return commerceType;
-	}
-	public void setCommerceType(Integer commerceType) {
-		this.commerceType = commerceType;
-	}
-
-	public Integer getCount() {
-		return count;
-	}
-	public void setCount(Integer count) {
-		this.count = count;
-	}
-
-	public Integer getAbroad() {
-		return abroad;
-	}
-	public void setAbroad(Integer abroad) {
-		this.abroad = abroad;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/Company.java

@@ -1,113 +0,0 @@
-package com.fdkankan.goods.entity;
-
-
-public class Company implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String companyName; // 公司名称
-	private String topLogo; // 顶部logo
-	private String floorLogo; // 地面logo
-	private String markerLogo; // 地面点位logo
-	private String qrLogo; // 二维码logo
-	private Integer showLogo; // 是否显示初始logo，0隐藏，1显示
-	private String managerId; // t_manager表的id
-	private Integer cameraDelete; // 新增的相机是否注册，0否，1删
-	private String createTime; // 创建时间
-	private String updateTime; // 更新时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getCompanyName() {
-		return companyName;
-	}
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-
-	public String getTopLogo() {
-		return topLogo;
-	}
-	public void setTopLogo(String topLogo) {
-		this.topLogo = topLogo;
-	}
-
-	public String getFloorLogo() {
-		return floorLogo;
-	}
-	public void setFloorLogo(String floorLogo) {
-		this.floorLogo = floorLogo;
-	}
-
-	public String getMarkerLogo() {
-		return markerLogo;
-	}
-	public void setMarkerLogo(String markerLogo) {
-		this.markerLogo = markerLogo;
-	}
-
-	public String getQrLogo() {
-		return qrLogo;
-	}
-	public void setQrLogo(String qrLogo) {
-		this.qrLogo = qrLogo;
-	}
-
-	public Integer getShowLogo() {
-		return showLogo;
-	}
-	public void setShowLogo(Integer showLogo) {
-		this.showLogo = showLogo;
-	}
-
-	public String getManagerId() {
-		return managerId;
-	}
-	public void setManagerId(String managerId) {
-		this.managerId = managerId;
-	}
-
-	public Integer getCameraDelete() {
-		return cameraDelete;
-	}
-	public void setCameraDelete(Integer cameraDelete) {
-		this.cameraDelete = cameraDelete;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/DownloadOrder.java

@@ -1,146 +0,0 @@
-package com.fdkankan.goods.entity;
-import java.math.BigDecimal;
-
-
-public class DownloadOrder implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String orderSn; // 订单号
-	private BigDecimal amount; // 金额
-	private String number; // 支付宝的交易号或者微信支付订单号
-	private Integer payType; // 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他
-	private Integer payStatus; // 状态，0或-1表示未付款，-2表示已退款,1表示已付款
-	private Integer downStatus; // 状态，1增加下载次数
-	private String tradeTime; // 交易时间
-	private String userId; // 用户表t_user的id
-	private Integer count; // 购买数量
-	private Integer abroad; // 0表示国内订单，1表示国外订单
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private String sceneNum; // 场景码
-	private String sceneName; // 场景名
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getOrderSn() {
-		return orderSn;
-	}
-	public void setOrderSn(String orderSn) {
-		this.orderSn = orderSn;
-	}
-
-	public BigDecimal getAmount() {
-		return amount;
-	}
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-
-	public String getNumber() {
-		return number;
-	}
-	public void setNumber(String number) {
-		this.number = number;
-	}
-
-	public Integer getPayType() {
-		return payType;
-	}
-	public void setPayType(Integer payType) {
-		this.payType = payType;
-	}
-
-	public Integer getPayStatus() {
-		return payStatus;
-	}
-	public void setPayStatus(Integer payStatus) {
-		this.payStatus = payStatus;
-	}
-
-	public Integer getDownStatus() {
-		return downStatus;
-	}
-	public void setDownStatus(Integer downStatus) {
-		this.downStatus = downStatus;
-	}
-
-	public String getTradeTime() {
-		return tradeTime;
-	}
-	public void setTradeTime(String tradeTime) {
-		this.tradeTime = tradeTime;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public Integer getCount() {
-		return count;
-	}
-	public void setCount(Integer count) {
-		this.count = count;
-	}
-
-	public Integer getAbroad() {
-		return abroad;
-	}
-	public void setAbroad(Integer abroad) {
-		this.abroad = abroad;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getSceneNum() {
-		return sceneNum;
-	}
-	public void setSceneNum(String sceneNum) {
-		this.sceneNum = sceneNum;
-	}
-
-	public String getSceneName() {
-		return sceneName;
-	}
-	public void setSceneName(String sceneName) {
-		this.sceneName = sceneName;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/ExpansionOrder.java

@@ -1,170 +0,0 @@
-package com.fdkankan.goods.entity;
-import java.math.BigDecimal;
-
-
-public class ExpansionOrder implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String orderSn; // 订单号
-	private BigDecimal amount; // 金额
-	private String number; // 支付宝的交易号或者微信支付订单号
-	private Integer payType; // 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他
-	private Integer payStatus; // 状态，0或-1表示未付款，-2表示已退款,1表示已付款
-	private Integer status; // 状态，1表示充值，0表示系统赠送，2表示升级套餐
-	private String tradeTime; // 交易时间
-	private String userId; // 用户表t_user的id
-	private Integer month; // 期限，月为单位
-	private Integer years; // 期限，年为单位
-	private Integer delay; // 延期，天为单位
-	private Integer unitSize; // 容量大小
-	private String unit; // 容量单位，\"GB\", \"TB\", \"PB\"
-	private String cameraId; // 相机主表t_camera的id
-	private Integer abroad; // 0表示国内订单，1表示国外订单
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getOrderSn() {
-		return orderSn;
-	}
-	public void setOrderSn(String orderSn) {
-		this.orderSn = orderSn;
-	}
-
-	public BigDecimal getAmount() {
-		return amount;
-	}
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-
-	public String getNumber() {
-		return number;
-	}
-	public void setNumber(String number) {
-		this.number = number;
-	}
-
-	public Integer getPayType() {
-		return payType;
-	}
-	public void setPayType(Integer payType) {
-		this.payType = payType;
-	}
-
-	public Integer getPayStatus() {
-		return payStatus;
-	}
-	public void setPayStatus(Integer payStatus) {
-		this.payStatus = payStatus;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public String getTradeTime() {
-		return tradeTime;
-	}
-	public void setTradeTime(String tradeTime) {
-		this.tradeTime = tradeTime;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public Integer getMonth() {
-		return month;
-	}
-	public void setMonth(Integer month) {
-		this.month = month;
-	}
-
-	public Integer getYears() {
-		return years;
-	}
-	public void setYears(Integer years) {
-		this.years = years;
-	}
-
-	public Integer getDelay() {
-		return delay;
-	}
-	public void setDelay(Integer delay) {
-		this.delay = delay;
-	}
-
-	public Integer getUnitSize() {
-		return unitSize;
-	}
-	public void setUnitSize(Integer unitSize) {
-		this.unitSize = unitSize;
-	}
-
-	public String getUnit() {
-		return unit;
-	}
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
-	public String getCameraId() {
-		return cameraId;
-	}
-	public void setCameraId(String cameraId) {
-		this.cameraId = cameraId;
-	}
-
-	public Integer getAbroad() {
-		return abroad;
-	}
-	public void setAbroad(Integer abroad) {
-		this.abroad = abroad;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/Goods.java

@@ -1,130 +0,0 @@
-package com.fdkankan.goods.entity;
-import java.math.BigDecimal;
-
-
-public class Goods implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String goodName; // 商品名称
-	private String description; // 商品描述
-	private String goodsSn; // 商品编号
-	private String goodsStatus; // 商品状态，上架下架
-	private String imageUrl; // 商品图片
-	private String pic; // 商品图片2
-	private BigDecimal expressPrice; // 快递价格
-	private Integer sort; // 排序
-	private BigDecimal goodsPrice; // 价格
-	private BigDecimal goodsDollarPrice; // 价格(美元)
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getGoodName() {
-		return goodName;
-	}
-	public void setGoodName(String goodName) {
-		this.goodName = goodName;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getGoodsSn() {
-		return goodsSn;
-	}
-	public void setGoodsSn(String goodsSn) {
-		this.goodsSn = goodsSn;
-	}
-
-	public String getGoodsStatus() {
-		return goodsStatus;
-	}
-	public void setGoodsStatus(String goodsStatus) {
-		this.goodsStatus = goodsStatus;
-	}
-
-	public String getImageUrl() {
-		return imageUrl;
-	}
-	public void setImageUrl(String imageUrl) {
-		this.imageUrl = imageUrl;
-	}
-
-	public String getPic() {
-		return pic;
-	}
-	public void setPic(String pic) {
-		this.pic = pic;
-	}
-
-	public BigDecimal getExpressPrice() {
-		return expressPrice;
-	}
-	public void setExpressPrice(BigDecimal expressPrice) {
-		this.expressPrice = expressPrice;
-	}
-
-	public Integer getSort() {
-		return sort;
-	}
-	public void setSort(Integer sort) {
-		this.sort = sort;
-	}
-
-	public BigDecimal getGoodsPrice() {
-		return goodsPrice;
-	}
-	public void setGoodsPrice(BigDecimal goodsPrice) {
-		this.goodsPrice = goodsPrice;
-	}
-
-	public BigDecimal getGoodsDollarPrice() {
-		return goodsDollarPrice;
-	}
-	public void setGoodsDollarPrice(BigDecimal goodsDollarPrice) {
-		this.goodsDollarPrice = goodsDollarPrice;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/GoodsSku.java

@@ -1,122 +0,0 @@
-package com.fdkankan.goods.entity;
-import java.math.BigDecimal;
-
-
-public class GoodsSku implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String goodsId; // 商品表t_goods的id
-	private String skuSn; // sku编号,唯一
-	private String description; // 规格描述
-	private Integer stock; // 库存,-1指充足
-	private BigDecimal price; // 价格（RMB）
-	private BigDecimal dollarPrice; // 价格（美元）
-	private Integer unitSize; // 容量大小
-	private String unit; // 容量单位，\"GB\", \"TB\", \"PB\"
-	private Integer month; // 容量时长
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getGoodsId() {
-		return goodsId;
-	}
-	public void setGoodsId(String goodsId) {
-		this.goodsId = goodsId;
-	}
-
-	public String getSkuSn() {
-		return skuSn;
-	}
-	public void setSkuSn(String skuSn) {
-		this.skuSn = skuSn;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public Integer getStock() {
-		return stock;
-	}
-	public void setStock(Integer stock) {
-		this.stock = stock;
-	}
-
-	public BigDecimal getPrice() {
-		return price;
-	}
-	public void setPrice(BigDecimal price) {
-		this.price = price;
-	}
-
-	public BigDecimal getDollarPrice() {
-		return dollarPrice;
-	}
-	public void setDollarPrice(BigDecimal dollarPrice) {
-		this.dollarPrice = dollarPrice;
-	}
-
-	public Integer getUnitSize() {
-		return unitSize;
-	}
-	public void setUnitSize(Integer unitSize) {
-		this.unitSize = unitSize;
-	}
-
-	public String getUnit() {
-		return unit;
-	}
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
-	public Integer getMonth() {
-		return month;
-	}
-	public void setMonth(Integer month) {
-		this.month = month;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/GoodsSpec.java

@@ -1,56 +0,0 @@
-package com.fdkankan.goods.entity;
-
-public class GoodsSpec implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String specName; // 规格名称
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getSpecName() {
-		return specName;
-	}
-	public void setSpecName(String specName) {
-		this.specName = specName;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/GoodsSpecValue.java

@@ -1,65 +0,0 @@
-package com.fdkankan.goods.entity;
-
-
-public class GoodsSpecValue implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String goodsSpecId; // 规格id
-	private String goodsSpecValue; // 规格值
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getGoodsSpecId() {
-		return goodsSpecId;
-	}
-	public void setGoodsSpecId(String goodsSpecId) {
-		this.goodsSpecId = goodsSpecId;
-	}
-
-	public String getGoodsSpecValue() {
-		return goodsSpecValue;
-	}
-	public void setGoodsSpecValue(String goodsSpecValue) {
-		this.goodsSpecValue = goodsSpecValue;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/GoodsSpuSpec.java

@@ -1,65 +0,0 @@
-package com.fdkankan.goods.entity;
-
-
-public class GoodsSpuSpec implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String id; // 
-	private String goodsId; // 商品表id
-	private String goodsSpecId; // 商品规格表id
-	private String createTime; // 创建时间
-	private String recStatus; // 记录的状态，A: 生效，I: 禁用
-	private String updateTime; // 更新时间
-	private Integer tbStatus; // 0正常，1删除
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getGoodsId() {
-		return goodsId;
-	}
-	public void setGoodsId(String goodsId) {
-		this.goodsId = goodsId;
-	}
-
-	public String getGoodsSpecId() {
-		return goodsSpecId;
-	}
-	public void setGoodsSpecId(String goodsSpecId) {
-		this.goodsSpecId = goodsSpecId;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getRecStatus() {
-		return recStatus;
-	}
-	public void setRecStatus(String recStatus) {
-		this.recStatus = recStatus;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Integer getTbStatus() {
-		return tbStatus;
-	}
-	public void setTbStatus(Integer tbStatus) {
-		this.tbStatus = tbStatus;
-	}
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraDetailMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CameraDetail;
-
-public interface ICameraDetailMapper extends IOperations<CameraDetail> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.Camera;
-
-public interface ICameraMapper extends IOperations<Camera> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraOutMapper.java

@@ -1,7 +0,0 @@
-package com.fdkankan.goods.mapper;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CameraOut;
-
-public interface ICameraOutMapper extends IOperations<CameraOut> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraSpaceMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CameraSpace;
-
-public interface ICameraSpaceMapper extends IOperations<CameraSpace> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraVersionMapper.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CameraVersion;
-
-public interface ICameraVersionMapper extends IOperations<CameraVersion> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICartMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.Cart;
-
-public interface ICartMapper extends IOperations<Cart> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICommerceOrderMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CommerceOrder;
-
-public interface ICommerceOrderMapper extends IOperations<CommerceOrder> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICompanyMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.Company;
-
-public interface ICompanyMapper extends IOperations<Company> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IDownloadOrderMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.DownloadOrder;
-
-public interface IDownloadOrderMapper extends IOperations<DownloadOrder> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IExpansionOrderMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.ExpansionOrder;
-
-public interface IExpansionOrderMapper extends IOperations<ExpansionOrder> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.Goods;
-
-public interface IGoodsMapper extends IOperations<Goods> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsSkuMapper.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.GoodsSku;
-
-public interface IGoodsSkuMapper extends IOperations<GoodsSku> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsSpecMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.GoodsSpec;
-
-public interface IGoodsSpecMapper extends IOperations<GoodsSpec> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsSpecValueMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.GoodsSpecValue;
-
-public interface IGoodsSpecValueMapper extends IOperations<GoodsSpecValue> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsSpuSpecMapper.java

@@ -1,8 +0,0 @@
-package com.fdkankan.goods.mapper;
-
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.GoodsSpuSpec;
-
-public interface IGoodsSpuSpecMapper extends IOperations<GoodsSpuSpec> {
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraDetailService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.CameraDetail;
-
-public interface ICameraDetailService extends IServiceOperations<CameraDetail> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraOutService.java

@@ -1,10 +0,0 @@
-package com.fdkankan.goods.service;
-
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.CameraOut;
-
-public interface ICameraOutService extends IServiceOperations<CameraOut> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.Camera;
-
-public interface ICameraService extends IServiceOperations<Camera> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraSpaceService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.CameraSpace;
-
-public interface ICameraSpaceService extends IServiceOperations<CameraSpace> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraVersionService.java

@@ -1,18 +0,0 @@
-package com.fdkankan.goods.service;
-
-
-import com.fdkankan.agent.controller.request.RequestSearch;
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.goods.entity.CameraVersion;
-import org.springframework.web.multipart.MultipartFile;
-
-public interface ICameraVersionService extends IServiceOperations<CameraVersion> {
-
-    ResultData updateStatus(Long id, String upperCase, String type);
-
-    ResultData searchLike(RequestSearch param);
-
-    ResultData upload(MultipartFile file, String version, String description, String minVersion, String type)throws Exception;
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICartService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.Cart;
-
-public interface ICartService extends IServiceOperations<Cart> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICommerceOrderService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.CommerceOrder;
-
-public interface ICommerceOrderService extends IServiceOperations<CommerceOrder> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICompanyService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.Company;
-
-public interface ICompanyService extends IServiceOperations<Company> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IDownloadOrderService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.DownloadOrder;
-
-public interface IDownloadOrderService extends IServiceOperations<DownloadOrder> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IExpansionOrderService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.ExpansionOrder;
-
-public interface IExpansionOrderService extends IServiceOperations<ExpansionOrder> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.Goods;
-
-public interface IGoodsService extends IServiceOperations<Goods> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsSkuService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.GoodsSku;
-
-public interface IGoodsSkuService extends IServiceOperations<GoodsSku> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsSpecService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.GoodsSpec;
-
-public interface IGoodsSpecService extends IServiceOperations<GoodsSpec> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsSpecValueService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.GoodsSpecValue;
-
-public interface IGoodsSpecValueService extends IServiceOperations<GoodsSpecValue> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsSpuSpecService.java

@@ -1,9 +0,0 @@
-package com.fdkankan.goods.service;
-
-import com.fdkankan.common.base.IServiceOperations;
-import com.fdkankan.goods.entity.GoodsSpuSpec;
-
-public interface IGoodsSpuSpecService extends IServiceOperations<GoodsSpuSpec> {
-
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraDetailService.java

@@ -1,31 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CameraDetail;
-import com.fdkankan.goods.mapper.ICameraDetailMapper;
-import com.fdkankan.goods.service.ICameraDetailService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("CameraDetailService")
-public class CameraDetailService extends AbstractService<CameraDetail> implements ICameraDetailService {
-
-	public CameraDetailService() {
-		this.setTableName("t_camera_detail");
-	}
-	@Resource
-	private ICameraDetailMapper tCameraDetailMapper;
-
-	@Override
-	protected IOperations<CameraDetail> getMapper() {
-		return tCameraDetailMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraOutService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CameraOut;
-import com.fdkankan.goods.mapper.ICameraOutMapper;
-import com.fdkankan.goods.service.ICameraOutService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("CameraOutService")
-public class CameraOutService extends AbstractService<CameraOut> implements ICameraOutService {
-
-	public CameraOutService() {
-		this.setTableName("t_camera_out");
-	}
-	@Resource
-	private ICameraOutMapper tCameraOutMapper;
-
-	@Override
-	protected IOperations<CameraOut> getMapper() {
-		return tCameraOutMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.Camera;
-import com.fdkankan.goods.mapper.ICameraMapper;
-import com.fdkankan.goods.service.ICameraService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("CameraService")
-public class CameraService extends AbstractService<Camera> implements ICameraService {
-
-	public CameraService() {
-		this.setTableName("t_camera");
-	}
-	@Resource
-	private ICameraMapper tCameraMapper;
-
-	@Override
-	protected IOperations<Camera> getMapper() {
-		return tCameraMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraSpaceService.java

@@ -1,31 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CameraSpace;
-import com.fdkankan.goods.mapper.ICameraSpaceMapper;
-import com.fdkankan.goods.service.ICameraSpaceService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-
-@Service("CameraSpaceService")
-public class CameraSpaceService extends AbstractService<CameraSpace> implements ICameraSpaceService {
-
-	public CameraSpaceService() {
-		this.setTableName("t_camera_space");
-	}
-	@Resource
-	private ICameraSpaceMapper tCameraSpaceMapper;
-
-	@Override
-	protected IOperations<CameraSpace> getMapper() {
-		return tCameraSpaceMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraVersionService.java

@@ -1,160 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.agent.controller.request.RequestSearch;
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.FileUtil;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.validation.ValidationUtils;
-import com.fdkankan.goods.entity.CameraVersion;
-import com.fdkankan.goods.mapper.ICameraVersionMapper;
-import com.fdkankan.goods.service.ICameraVersionService;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Base64;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-@Service("CameraVersionService")
-public class CameraVersionService extends AbstractService<CameraVersion> implements ICameraVersionService {
-
-	private static Logger log = LoggerFactory.getLogger("programLog");
-
-	private static String ALIYUN_SSO_PATH = "camera_version/";
-
-	private static String YAMAXUN_S3_PATH = "https://eurs3.4dkankan.com/camera_version/";
-
-	private static String DIR_NAME = "camera_version/";
-
-	public CameraVersionService() {
-		this.setTableName("t_camera_version");
-	}
-	@Resource
-	private ICameraVersionMapper tCameraVersionMapper;
-
-	@Override
-	protected IOperations<CameraVersion> getMapper() {
-		return tCameraVersionMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-
-	@Override
-	public ResultData updateStatus(Long id, String status, String type) {
-		LinkedHashMap<String,String> condition = new LinkedHashMap<>();
-		condition.put("id= "+id,"and");
-		CameraVersion cameraVersion = this.getOne(condition);
-		if(cameraVersion == null){
-			return ResultData.error(ErrorCode.FAILURE_CODE_3001);
-		}
-		if (!ValidationUtils.validateRecStatus(status)) {
-			return ResultData.error(ErrorCode.FAILURE_CODE_3001);
-		}
-
-		condition = new LinkedHashMap<>();
-		if(StringUtils.isBlank(type)){
-			type = "1";
-		}
-		condition.put("res_status = 'A'","and");
-		condition.put("type = "+ type,"and");
-		List<CameraVersion> list = this.getAllList(condition);
-		for (CameraVersion version : list) {
-			version.setAcStatus("I");
-		}
-		this.update(list);
-
-		cameraVersion.setAcStatus(status);
-		this.update(cameraVersion);
-		return ResultData.ok();
-	}
-
-	@Override
-	public ResultData searchLike(RequestSearch param) {
-		Integer pageNum = Integer.valueOf(param.getPageNum());
-		Integer pageSize = Integer.valueOf(param.getPageSize());
-		String startDate = param.getStartDate();
-		String endDate = param.getEndDate();
-		String itemName = param.getItemName();
-		Integer type = StringUtils.isNotBlank(param.getType()) ? Integer.valueOf(param.getType()) : 1;
-
-		LinkedHashMap<String,String> condition = new LinkedHashMap<>();
-		condition.put("rec_status ='A'","and");
-		condition.put("camera_type ="+type,"and");
-		if(StringUtils.isNotBlank(startDate)){
-			condition.put("create_time >= '"+startDate+"'","and");
-		}
-		if(StringUtils.isNotBlank(endDate)){
-			condition.put("create_time <= '"+endDate+"' ","and");
-		}
-		if(StringUtils.isNotBlank(itemName)){
-			condition.put("((file_name like '%"+itemName+"%' )","and");
-			condition.put("(version like '%"+itemName+"%' )","or");
-			condition.put("(note_content like '%"+itemName+"%' ))","or");
-		}
-		List<CameraVersion> list = this.getList(condition, pageNum,pageSize,"create_time desc");
-		Integer total = this.getCount(condition,null);
-		return ResultData.ok(pageNum,pageSize,total,list);
-	}
-
-
-	/**
-	 * 上传文件到阿里云
-	 */
-	@Override
-	public ResultData upload(MultipartFile file, String version, String description, String minVersion, String StringType) throws Exception{
-		Integer type = StringUtils.isNotBlank(StringType) ? Integer.valueOf(StringType) : 1;
-		log.info("run upload");
-		if (!file.isEmpty()&& file.getSize() <= 0) {
-			return ResultData.error(ErrorCode.FAILURE_CODE_3017);
-		}
-
-		// 文件名全名
-		String fullFileName = file.getOriginalFilename();
-
-		// 将文件转字节-> 字符串
-		String fileContent = Base64.getEncoder().encodeToString(file.getBytes());
-
-		// 获取类路径
-		String resourcePath = FileUtils.getResource();
-		log.info("resourcePath: {}", resourcePath);
-
-		// 创建目录
-		String dirPath = resourcePath + DIR_NAME  ;
-		FileUtils.createDir(dirPath);
-
-		// 拼接唯一文件名
-		String fileName = dateStr() + fullFileName;
-
-		// 文件保存路径
-		String filePath = dirPath + dateStr() + fullFileName;
-
-		// 写文件到本地
-		FileUtils.base64ToFileWriter(fileContent, filePath);
-		log.info("filePath: {}", filePath);
-
-		// 读取本地文件
-		byte[] content = FileUtil.getContent(filePath);
-
-		return null;
-	}
-
-	// 获取时间戳
-	private String dateStr() {
-		SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
-		String format = df.format(new Date());
-		long timeMillis = System.currentTimeMillis();
-		return format + "_" + timeMillis + "_";
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CartService.java

@@ -1,31 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.Cart;
-import com.fdkankan.goods.mapper.ICartMapper;
-import com.fdkankan.goods.service.ICartService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-
-@Service("CartService")
-public class CartService extends AbstractService<Cart> implements ICartService {
-
-	public CartService() {
-		this.setTableName("t_cart");
-	}
-	@Resource
-	private ICartMapper tCartMapper;
-
-	@Override
-	protected IOperations<Cart> getMapper() {
-		return tCartMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CommerceOrderService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.CommerceOrder;
-import com.fdkankan.goods.mapper.ICommerceOrderMapper;
-import com.fdkankan.goods.service.ICommerceOrderService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("CommerceOrderService")
-public class CommerceOrderService extends AbstractService<CommerceOrder> implements ICommerceOrderService {
-
-	public CommerceOrderService() {
-		this.setTableName("t_commerce_order");
-	}
-	@Resource
-	private ICommerceOrderMapper tCommerceOrderMapper;
-
-	@Override
-	protected IOperations<CommerceOrder> getMapper() {
-		return tCommerceOrderMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CompanyService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.Company;
-import com.fdkankan.goods.mapper.ICompanyMapper;
-import com.fdkankan.goods.service.ICompanyService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("CompanyService")
-public class CompanyService extends AbstractService<Company> implements ICompanyService {
-
-	public CompanyService() {
-		this.setTableName("t_company");
-	}
-	@Resource
-	private ICompanyMapper tCompanyMapper;
-
-	@Override
-	protected IOperations<Company> getMapper() {
-		return tCompanyMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/DownloadOrderService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.DownloadOrder;
-import com.fdkankan.goods.mapper.IDownloadOrderMapper;
-import com.fdkankan.goods.service.IDownloadOrderService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("DownloadOrderService")
-public class DownloadOrderService extends AbstractService<DownloadOrder> implements IDownloadOrderService {
-
-	public DownloadOrderService() {
-		this.setTableName("t_download_order");
-	}
-	@Resource
-	private IDownloadOrderMapper tDownloadOrderMapper;
-
-	@Override
-	protected IOperations<DownloadOrder> getMapper() {
-		return tDownloadOrderMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/ExpansionOrderService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.ExpansionOrder;
-import com.fdkankan.goods.mapper.IExpansionOrderMapper;
-import com.fdkankan.goods.service.IExpansionOrderService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("ExpansionOrderService")
-public class ExpansionOrderService extends AbstractService<ExpansionOrder> implements IExpansionOrderService {
-
-	public ExpansionOrderService() {
-		this.setTableName("t_expansion_order");
-	}
-	@Resource
-	private IExpansionOrderMapper tExpansionOrderMapper;
-
-	@Override
-	protected IOperations<ExpansionOrder> getMapper() {
-		return tExpansionOrderMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/GoodsService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.Goods;
-import com.fdkankan.goods.mapper.IGoodsMapper;
-import com.fdkankan.goods.service.IGoodsService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("GoodsService")
-public class GoodsService extends AbstractService<Goods> implements IGoodsService {
-
-	public GoodsService() {
-		this.setTableName("t_goods");
-	}
-	@Resource
-	private IGoodsMapper tGoodsMapper;
-
-	@Override
-	protected IOperations<Goods> getMapper() {
-		return tGoodsMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/GoodsSkuService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.GoodsSku;
-import com.fdkankan.goods.mapper.IGoodsSkuMapper;
-import com.fdkankan.goods.service.IGoodsSkuService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("GoodsSkuService")
-public class GoodsSkuService extends AbstractService<GoodsSku> implements IGoodsSkuService {
-
-	public GoodsSkuService() {
-		this.setTableName("t_goods_sku");
-	}
-	@Resource
-	private IGoodsSkuMapper tGoodsSkuMapper;
-
-	@Override
-	protected IOperations<GoodsSku> getMapper() {
-		return tGoodsSkuMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/GoodsSpecService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.GoodsSpec;
-import com.fdkankan.goods.mapper.IGoodsSpecMapper;
-import com.fdkankan.goods.service.IGoodsSpecService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("GoodsSpecService")
-public class GoodsSpecService extends AbstractService<GoodsSpec> implements IGoodsSpecService {
-
-	public GoodsSpecService() {
-		this.setTableName("t_goods_spec");
-	}
-	@Resource
-	private IGoodsSpecMapper tGoodsSpecMapper;
-
-	@Override
-	protected IOperations<GoodsSpec> getMapper() {
-		return tGoodsSpecMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/GoodsSpecValueService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.GoodsSpecValue;
-import com.fdkankan.goods.mapper.IGoodsSpecValueMapper;
-import com.fdkankan.goods.service.IGoodsSpecValueService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("GoodsSpecValueService")
-public class GoodsSpecValueService extends AbstractService<GoodsSpecValue> implements IGoodsSpecValueService {
-
-	public GoodsSpecValueService() {
-		this.setTableName("t_goods_spec_value");
-	}
-	@Resource
-	private IGoodsSpecValueMapper tGoodsSpecValueMapper;
-
-	@Override
-	protected IOperations<GoodsSpecValue> getMapper() {
-		return tGoodsSpecValueMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/GoodsSpuSpecService.java

@@ -1,30 +0,0 @@
-package com.fdkankan.goods.service.impl;
-
-import com.fdkankan.common.base.AbstractService;
-import com.fdkankan.common.base.IOperations;
-import com.fdkankan.goods.entity.GoodsSpuSpec;
-import com.fdkankan.goods.mapper.IGoodsSpuSpecMapper;
-import com.fdkankan.goods.service.IGoodsSpuSpecService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("GoodsSpuSpecService")
-public class GoodsSpuSpecService extends AbstractService<GoodsSpuSpec> implements IGoodsSpuSpecService {
-
-	public GoodsSpuSpecService() {
-		this.setTableName("t_goods_spu_spec");
-	}
-	@Resource
-	private IGoodsSpuSpecMapper tGoodsSpuSpecMapper;
-
-	@Override
-	protected IOperations<GoodsSpuSpec> getMapper() {
-		return tGoodsSpuSpecMapper;
-	}
-	@Override
-	public void setTableName(String tableName){
-		this.tableName = tableName;
-	}
-}
-