diff --git a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
index f3ccf34..a10a314 100644
--- a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
+++ b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
@@ -7,17 +7,19 @@ import com.sincere.wechatbusiness.dto.BaseDto;
 import com.sincere.wechatbusiness.dto.ChannelDto;
 import com.sincere.wechatbusiness.model.*;
 import com.sincere.wechatbusiness.service.*;
+import com.sincere.wechatbusiness.utils.HttpClientUtils;
 import com.sincere.wechatbusiness.utils.Page;
+import com.sincere.wechatbusiness.utils.TokenUtils;
 import io.swagger.annotations.ApiOperation;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.List;
@@ -43,6 +45,12 @@ public class ChannelController {
     @Autowired
     CatalogContentService catalogContentService;
 
+    @Autowired
+    AgentService agentService;
+
+    private String domain="https://mytest.myjxt.com:51314";
+//    private String domain="https://proxy.shunzhi.net:51314";
+
     @RequestMapping(value = "GetChannelList",method = RequestMethod.POST)
     @ApiOperation(value = "获取渠道商列表")
     public BaseDto<Page<Channel>> GetChannelList(@RequestBody ChannelDto channelDto){
@@ -58,7 +66,7 @@ public class ChannelController {
     @ApiOperation(value = "获取代理商品列表")
     public BaseDto<List<DiscountPackage>> GetPackageList(){
         BaseDto<List<DiscountPackage>> result=new BaseDto<>();
-        String r=Get("https://mytest.myjxt.com:51314/University/getPackageList","");
+        String r=Get(domain+"/University/getPackageList","");
         JSONObject jsonObject= JSONObject.parseObject(r);
         String data = jsonObject.getString("data");
         List<DiscountPackage> list=JSON.parseObject(data,new TypeReference<List<DiscountPackage>>(){});
@@ -201,7 +209,7 @@ public class ChannelController {
         catalog.setChannelId(channelId);
         catalog.setSort(sort);
         catalog=catalogService.getDetail(catalog);
-        catalog.setCatalogContentList(catalogContentService.getList(catalog.getId()));
+        if(catalog!=null) catalog.setCatalogContentList(catalogContentService.getList(catalog.getId()));
         result.setData(catalog);
         return result;
     }
@@ -241,6 +249,181 @@ public class ChannelController {
         return new BaseDto();
     }
 
+    @RequestMapping(value = "GetAgentList",method = RequestMethod.GET)
+    @ApiOperation(value = "获取推广代理列表")
+    public BaseDto<List<Agent>> GetAgentList(int id){
+        BaseDto<List<Agent>> result=new BaseDto<>();
+        result.setData(agentService.getList(id));
+        return result;
+    }
+
+    @RequestMapping(value = "AddAgent",method = RequestMethod.POST)
+    @ApiOperation(value = "新增推广代理")
+    public BaseDto AddAgent(@RequestBody Agent agent){
+        agentService.insert(agent);
+        return new BaseDto();
+    }
+
+    @RequestMapping(value = "UpdateAgent",method = RequestMethod.POST)
+    @ApiOperation(value = "编辑推广代理")
+    public BaseDto UpdateAgent(@RequestBody Agent agent){
+        agentService.update(agent);
+        return new BaseDto();
+    }
+
+    @RequestMapping(value = "DeleteAgent",method = RequestMethod.GET)
+    @ApiOperation(value = "删除推广代理")
+    public BaseDto DeleteAgent(int id){
+        agentService.deleteAgent(id);
+        return new BaseDto();
+    }
+
+    @RequestMapping(value = "GetCatalogList",method = RequestMethod.GET)
+    @ApiOperation(value = "获取栏目列表")
+    public BaseDto<List<Catalog>> GetCatalogList(int id){
+        BaseDto<List<Catalog>> result=new BaseDto<>();
+        result.setData(catalogService.getList(id));
+        return result;
+    }
+
+    @RequestMapping(value = "GetCatalogContByDate",method = RequestMethod.GET)
+    @ApiOperation(value ="根据日期获取栏目内容" )
+    public BaseDto<List<CatalogContent>> GetCatalogContByDate(int catalogId,String date){
+        BaseDto<List<CatalogContent>> result=new BaseDto<>();
+        result.setData(catalogContentService.getListByDate(catalogId,date));
+        return result;
+    }
+
+    @RequestMapping(value = "GetChannelProduct",method = RequestMethod.GET)
+    @ApiOperation(value = "获取代理商品详情")
+    public BaseDto<ChannelProduct> GetChannelProduct(int id){
+        BaseDto<ChannelProduct> result=new BaseDto<>();
+        result.setData(channelProductService.getDetail(id));
+        return result;
+    }
+
+    @RequestMapping(value = "GetDiscountPackage",method = RequestMethod.GET)
+    @ApiOperation(value = "获取商品详情")
+    public BaseDto<DiscountPackage> GetDiscountPackage(int id){
+        BaseDto<DiscountPackage> result=new BaseDto<>();
+        String r=Get(domain+"/University/getPackageById","id="+id);
+        JSONObject jsonObject= JSONObject.parseObject(r);
+        String data = jsonObject.getString("data");
+        DiscountPackage model=JSON.parseObject(data,new TypeReference<DiscountPackage>(){});
+        result.setData(model);
+        return result;
+    }
+
+    @RequestMapping(value = "GetWxSign",method = RequestMethod.GET)
+    @ApiOperation(value = "获取微信分享签名")
+    public BaseDto<WxSign> GetWxSign(String url){
+        BaseDto<WxSign> result=new BaseDto<>();
+        String r=Get("http://114.55.30.100:1111/api/UserRegisterApp/GetWxShareSign","url="+url);
+        JSONObject jsonObject= JSONObject.parseObject(r);
+        String data = jsonObject.getString("result");
+        WxSign wxSign=JSON.parseObject(data,new TypeReference<WxSign>(){});
+        result.setData(wxSign);
+        return result;
+    }
+
+    @RequestMapping(value = "AddVerificationCode",method = RequestMethod.GET)
+    @ApiOperation(value = "获取验证码")
+    public BaseDto AddVerificationCode(String mobile){
+        Get(domain+"/h5/MyVoluntary/AddVerificationCode","code=206&mobile="+mobile+"&type=1");
+        return new BaseDto();
+    }
+
+    @RequestMapping(value = "CheckCodeIsRight",method = RequestMethod.GET)
+    @ApiOperation(value = "判断验证码是否正确")
+    public BaseDto CheckCodeIsRight(String mobile, String captcha){
+        BaseDto result=new BaseDto();
+        String r=Get(domain+"/h5/MyVoluntary/CheckCodeIsRight","mobile="+mobile+"&captcha="+captcha);
+        JSONObject jsonObject= JSONObject.parseObject(r);
+        result.setSuccess(jsonObject.getString("success")=="true"?true:false);
+        result.setMessage(jsonObject.getString("message"));
+        return result;
+    }
+
+    @RequestMapping(value = "AdminLogin",method = RequestMethod.GET)
+    @ApiOperation(value = "管理员登录")
+    public BaseDto<String> AdminLogin(String mobile){
+        BaseDto<String> result=new BaseDto();
+        Manager manager=channelService.getManagerDetail(mobile);
+        if(manager==null){
+            result.setSuccess(false);
+            result.setMessage("账号不存在！");
+        }
+        Log log=new Log();
+        log.setOperation("账号登录");
+        log.setMobile(mobile);
+        channelService.insertLog(log);
+        result.setData(TokenUtils.buildToken(mobile));
+        return result;
+    }
+
+    @RequestMapping(value = "IsDianXin",method = RequestMethod.GET)
+    @ApiOperation(value = "判断是否是电信用户")
+    public BaseDto<List<Coupon>> IsDianXin(String mobile,int productId){
+        BaseDto<List<Coupon>> result=new BaseDto();
+        String r=Get(domain+"/admin/Voluntary/GetAccount","mobile="+mobile);
+        JSONObject jsonObject= JSONObject.parseObject(r);
+        String data = jsonObject.getString("data");
+        if(data==null){
+            result.setSuccess(false);
+            result.setMessage("非VIP邀请号码");
+        }
+        else {
+            Get(domain+"/h5/MyVoluntary/AddVerificationCode","code=206&mobile="+mobile+"&type=1");
+            String re=Get(domain+"/University/getMyCouponDetail","mobile="+mobile+"&type="+productId);
+            JSONObject jsonObject1= JSONObject.parseObject(re);
+            String data1 = jsonObject1.getString("data");
+            result.setData(JSON.parseObject(data1,new TypeReference<List<Coupon>>(){}));
+        }
+        return result;
+    }
+
+    @RequestMapping(value = "GetAddOrderDetail",method = RequestMethod.POST)
+    @ApiOperation(value = "生成预支付订单并返回详情")
+    public BaseDto<List<Order>> GetAddOrderDetail(@RequestBody Order order) {
+        BaseDto<List<Order>> result=new BaseDto<>();
+        JSONObject object = new JSONObject();
+        object.put("account",order.getAccount());
+        object.put("expert_id",0);
+        object.put("paymoney",order.getPaymoney());
+        object.put("payway",2);
+        object.put("product_detail","升学汇产品-代理商");
+        object.put("product_id",order.getProduct_id());
+        object.put("product_name",order.getProduct_name());
+        object.put("type",order.getProduct_id());
+        object.put("user_name",order.getUser_name());
+        object.put("buycount",0);
+        object.put("score_id",0);
+        JSONObject jsonObject = HttpClientUtils.httpPostJson(domain+"/University/GetAddOrderDetail",object.toJSONString());
+        String data = jsonObject.getString("data");
+        result.setData(JSON.parseObject(data,new TypeReference<List<Order>>(){}));
+        return result;
+    }
+
+    @RequestMapping(value = "WxPay",method = RequestMethod.POST)
+    @ApiOperation(value = "微信支付")
+    public BaseDto<WxResult> WxPay(@RequestBody WxPay pay){
+        BaseDto<WxResult> result = new BaseDto();
+        JSONObject object = new JSONObject();
+        object.put("attach",pay.getAttach());
+        object.put("notify_url",domain+"/Payment/WXPayBack");
+        object.put("outTradeNo",pay.getOutTradeNo());
+        object.put("payType",2);
+        object.put("payWay",2);
+        object.put("productId",pay.getProductId());
+        object.put("subject",pay.getSubject());
+        object.put("totalFee",pay.getTotalFee());
+        object.put("coupon_num",pay.getCoupon_num());
+        JSONObject jsonObject = HttpClientUtils.httpPostJson(domain+"/Payment/WxPay",object.toJSONString());
+        String data = jsonObject.getString("data");
+        result.setData(JSON.parseObject(data,new TypeReference<WxResult>(){}));
+        return result;
+    }
+
     public String Get(String url, String param) {
         String result = "";
         BufferedReader in = null;
@@ -285,4 +468,86 @@ public class ChannelController {
         }
         return result;
     }
+
+    public String Post(String httpUrl, String param)
+    {
+        HttpURLConnection connection = null;
+        InputStream is = null;
+        OutputStream os = null;
+        BufferedReader br = null;
+        String result = null;
+        try {
+            URL url = new URL(httpUrl);
+            // 通过远程url连接对象打开连接
+            connection = (HttpURLConnection) url.openConnection();
+            // 设置连接请求方式
+            connection.setRequestMethod("POST");
+            // 设置连接主机服务器超时时间：15000毫秒
+            connection.setConnectTimeout(15000);
+            // 设置读取主机服务器返回数据超时时间：60000毫秒
+            connection.setReadTimeout(60000);
+
+            // 默认值为：false，当向远程服务器传送数据/写数据时，需要设置为true
+            connection.setDoOutput(true);
+            // 默认值为：true，当前向远程服务读取数据时，设置为true，该参数可有可无
+            connection.setDoInput(true);
+            // 设置传入参数的格式:请求参数应该是 name1=value1&name2=value2 的形式。
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+
+            // 设置鉴权信息：Authorization: Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0
+            connection.setRequestProperty("Authorization", "Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0");
+
+            // 通过连接对象获取一个输出流
+            os = connection.getOutputStream();
+            // 通过输出流对象将参数写出去/传输出去,它是通过字节数组写出的
+            os.write(param.getBytes());
+            // 通过连接对象获取一个输入流，向远程读取
+            if (connection.getResponseCode() == 200) {
+
+                is = connection.getInputStream();
+                // 对输入流对象进行包装:charset根据工作项目组的要求来设置
+                br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+                StringBuffer sbf = new StringBuffer();
+                String temp = null;
+                // 循环遍历一行一行读取数据
+                while ((temp = br.readLine()) != null) {
+                    sbf.append(temp);
+                    sbf.append("\r\n");
+                }
+                result = sbf.toString();
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            // 关闭资源
+            if (null != br) {
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != os) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != is) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            // 断开与远程地址url的连接
+            connection.disconnect();
+        }
+        return result;
+    }
+
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/mapper/AgentMapper.java b/src/main/java/com/sincere/wechatbusiness/mapper/AgentMapper.java
new file mode 100644
index 0000000..6847e75
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/mapper/AgentMapper.java
@@ -0,0 +1,15 @@
+package com.sincere.wechatbusiness.mapper;
+
+import com.sincere.wechatbusiness.model.Agent;
+
+import java.util.List;
+
+public interface AgentMapper {
+    List<Agent> getList(int id);
+
+    int insert(Agent agent);
+
+    int update(Agent agent);
+
+    int deleteAgent(int id);
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/mapper/CatalogContentMapper.java b/src/main/java/com/sincere/wechatbusiness/mapper/CatalogContentMapper.java
index e613439..2bf56aa 100644
--- a/src/main/java/com/sincere/wechatbusiness/mapper/CatalogContentMapper.java
+++ b/src/main/java/com/sincere/wechatbusiness/mapper/CatalogContentMapper.java
@@ -1,6 +1,7 @@
 package com.sincere.wechatbusiness.mapper;
 
 import com.sincere.wechatbusiness.model.CatalogContent;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,4 +13,6 @@ public interface CatalogContentMapper {
     int update(CatalogContent catalogContent);
 
     int deleteCatalogContent(int id);
+
+    List<CatalogContent> getListByDate(@Param("catalogId") int catalogId,@Param("date") String date,@Param("state") int state);
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/mapper/CatalogMapper.java b/src/main/java/com/sincere/wechatbusiness/mapper/CatalogMapper.java
index 096c4c2..8ba6c7f 100644
--- a/src/main/java/com/sincere/wechatbusiness/mapper/CatalogMapper.java
+++ b/src/main/java/com/sincere/wechatbusiness/mapper/CatalogMapper.java
@@ -2,10 +2,14 @@ package com.sincere.wechatbusiness.mapper;
 
 import com.sincere.wechatbusiness.model.Catalog;
 
+import java.util.List;
+
 public interface CatalogMapper {
     Catalog getDetail(Catalog catalog);
 
     int insert(Catalog catalog);
 
     int update(Catalog catalog);
+
+    List<Catalog> getList(int id);
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java
index 449379d..cdba067 100644
--- a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java
+++ b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java
@@ -1,8 +1,6 @@
 package com.sincere.wechatbusiness.mapper;
 
-import com.sincere.wechatbusiness.model.Area;
-import com.sincere.wechatbusiness.model.Channel;
-import com.sincere.wechatbusiness.model.Template;
+import com.sincere.wechatbusiness.model.*;
 
 import java.util.List;
 
@@ -26,4 +24,8 @@ public interface ChannelMapper {
     List<Area> getArea(String areaCode);
 
     List<Template> getTemplateList();
+
+    Manager getManagerDetail(String mobile);
+
+    int insertLog(Log log);
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelProductMapper.java b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelProductMapper.java
index 71e27be..2abb2eb 100644
--- a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelProductMapper.java
+++ b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelProductMapper.java
@@ -12,4 +12,6 @@ public interface ChannelProductMapper {
     int update(ChannelProduct channelProduct);
 
     int deleteChannelProduct(int id);
+
+    ChannelProduct getDetail(int id);
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/model/Agent.java b/src/main/java/com/sincere/wechatbusiness/model/Agent.java
new file mode 100644
index 0000000..a742226
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/Agent.java
@@ -0,0 +1,65 @@
+package com.sincere.wechatbusiness.model;
+
+import java.util.Date;
+
+public class Agent {
+    private Integer id;
+
+    private int channelId;
+
+    private String name;
+
+    private String mobile;
+
+    private Integer state;
+
+    private Date createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public int getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(int channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/model/CatalogContent.java b/src/main/java/com/sincere/wechatbusiness/model/CatalogContent.java
index 78074e9..4eb67c7 100644
--- a/src/main/java/com/sincere/wechatbusiness/model/CatalogContent.java
+++ b/src/main/java/com/sincere/wechatbusiness/model/CatalogContent.java
@@ -27,6 +27,8 @@ public class CatalogContent {
 
     private Date createTime;
 
+    private Integer isStart;
+
     public Integer getId() {
         return id;
     }
@@ -106,4 +108,12 @@ public class CatalogContent {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Integer getIsStart() {
+        return isStart;
+    }
+
+    public void setIsStart(Integer isStart) {
+        this.isStart = isStart;
+    }
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java b/src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java
index b956f6d..d18a0fb 100644
--- a/src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java
+++ b/src/main/java/com/sincere/wechatbusiness/model/ChannelProduct.java
@@ -7,10 +7,14 @@ public class ChannelProduct {
 
     private Integer channelId;
 
+    private Integer productId;
+
     private String productName;
 
     private String price;
 
+    private String imgUrl;
+
     private String ChannelPrice;
 
     private String caption;
@@ -35,6 +39,14 @@ public class ChannelProduct {
         this.channelId = channelId;
     }
 
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
     public String getProductName() {
         return productName;
     }
@@ -51,6 +63,14 @@ public class ChannelProduct {
         this.price = price;
     }
 
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
     public String getChannelPrice() {
         return ChannelPrice;
     }
diff --git a/src/main/java/com/sincere/wechatbusiness/model/Coupon.java b/src/main/java/com/sincere/wechatbusiness/model/Coupon.java
new file mode 100644
index 0000000..2c514cf
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/Coupon.java
@@ -0,0 +1,224 @@
+package com.sincere.wechatbusiness.model;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@ApiModel
+public class Coupon {
+    private  Integer id;
+    @ApiModelProperty(value = "优惠券编号")
+    private  String  coupon_num;
+    @ApiModelProperty(value = "优惠券类型")
+    private  String  type;
+    @ApiModelProperty(value = "减免金额")
+    private  String  discount;
+    @ApiModelProperty(value = "减免条件")
+    private  String  condition;
+    @ApiModelProperty(value = "有效期")
+    private  String  expiry_date;
+    @ApiModelProperty(value = "发放类型")
+    private  Integer  sendtype;
+    @ApiModelProperty(value = "发放对象号码")
+    private  String  sendmobile;
+    @ApiModelProperty(value = "账号项目名称")
+    private  String  itemname;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private  Date start_time;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private  Date end_time;
+
+    private  String remark;
+
+    private  String  state;
+    private  Date create_time;
+
+    @ApiModelProperty(value = "总优惠券数")
+    private  Integer  allcount;
+    @ApiModelProperty(value = "实际生成优惠券数")
+    private  Integer actualcount;
+    @ApiModelProperty(value = "已发放优惠券数")
+    private  Integer  sendcount;
+    @ApiModelProperty(value = "已兑换优惠券数")
+    private  Integer  exchangecount;
+
+    private String  url;
+
+    private  Integer project_id;
+
+    @ApiModelProperty(value = "0- 计划数内新增优惠券   1-计划数已经新增完了 再新增优惠券")
+    private  Integer  flog;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCoupon_num() {
+        return coupon_num;
+    }
+
+    public void setCoupon_num(String coupon_num) {
+        this.coupon_num = coupon_num;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(String discount) {
+        this.discount = discount;
+    }
+
+    public String getCondition() {
+        return condition;
+    }
+
+    public void setCondition(String condition) {
+        this.condition = condition;
+    }
+
+    public String getExpiry_date() {
+        return expiry_date;
+    }
+
+    public void setExpiry_date(String expiry_date) {
+        this.expiry_date = expiry_date;
+    }
+
+    public Integer getSendtype() {
+        return sendtype;
+    }
+
+    public void setSendtype(Integer sendtype) {
+        this.sendtype = sendtype;
+    }
+
+    public String getSendmobile() {
+        return sendmobile;
+    }
+
+    public void setSendmobile(String sendmobile) {
+        this.sendmobile = sendmobile;
+    }
+
+    public String getItemname() {
+        return itemname;
+    }
+
+    public void setItemname(String itemname) {
+        this.itemname = itemname;
+    }
+
+    public Date getStart_time() {
+        return start_time;
+    }
+
+    public void setStart_time(Date start_time) {
+        this.start_time = start_time;
+    }
+
+    public Date getEnd_time() {
+        return end_time;
+    }
+
+    public void setEnd_time(Date end_time) {
+        this.end_time = end_time;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public Date getCreate_time() { return create_time; }
+
+    public void setCreate_time(Date create_time) { this.create_time = create_time; }
+
+
+    public Integer getAllcount() {
+        return allcount;
+    }
+
+    public void setAllcount(Integer allcount) {
+        this.allcount = allcount;
+    }
+
+    public Integer getActualcount() {
+        return actualcount;
+    }
+
+    public void setActualcount(Integer actualcount) {
+        this.actualcount = actualcount;
+    }
+
+    public Integer getSendcount() {
+        return sendcount;
+    }
+
+    public void setSendcount(Integer sendcount) {
+        this.sendcount = sendcount;
+    }
+
+    public Integer getExchangecount() {
+        return exchangecount;
+    }
+
+    public void setExchangecount(Integer exchangecount) {
+        this.exchangecount = exchangecount;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public Integer getProject_id() {
+        return project_id;
+    }
+
+    public void setProject_id(Integer project_id) {
+        this.project_id = project_id;
+    }
+
+    public Integer getFlog() {
+        return flog;
+    }
+
+    public void setFlog(Integer flog) {
+        this.flog = flog;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/model/Log.java b/src/main/java/com/sincere/wechatbusiness/model/Log.java
new file mode 100644
index 0000000..c17831d
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/Log.java
@@ -0,0 +1,45 @@
+package com.sincere.wechatbusiness.model;
+
+import java.util.Date;
+
+public class Log {
+    private Integer id;
+
+    private String mobile;
+
+    private String operation;
+
+    private Date createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/model/Manager.java b/src/main/java/com/sincere/wechatbusiness/model/Manager.java
new file mode 100644
index 0000000..713ee86
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/Manager.java
@@ -0,0 +1,45 @@
+package com.sincere.wechatbusiness.model;
+
+import java.util.Date;
+
+public class Manager {
+    private Integer id;
+
+    private String mobile;
+
+    private Integer state;
+
+    private Date createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/model/Order.java b/src/main/java/com/sincere/wechatbusiness/model/Order.java
new file mode 100644
index 0000000..bbf1575
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/Order.java
@@ -0,0 +1,217 @@
+package com.sincere.wechatbusiness.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel
+public class Order {
+    @ApiModelProperty(value = "主键 , 新增接口不用传")
+    private Integer id;
+    @ApiModelProperty(value = " 平台流水号")
+    private String trade_no;
+    @ApiModelProperty(value = " 商户订单号")
+    private String orderpaynum;
+    @ApiModelProperty(value = " 商品id")
+    private Integer product_id;
+    @ApiModelProperty(value = " 商品名称")
+    private String product_name;
+    @ApiModelProperty(value = " 商品详情")
+    private String product_detail;
+    @ApiModelProperty(value = " 账号")
+    private String account;
+    @ApiModelProperty(value = " 学生姓名")
+    private String user_name;
+    @ApiModelProperty(value = " ai填报 使用成绩id")
+    private Integer score_id;
+    @ApiModelProperty(value = " 支付方式")
+    private Integer payway;
+    @ApiModelProperty(value = " 支付金额")
+    private String paymoney;
+    @ApiModelProperty(value = " 支付状态")
+    private Integer paystate;
+    @ApiModelProperty(value = " 优惠券")
+    private String coupon;
+    @ApiModelProperty(value = " 优惠券名字")
+    private String coupon_name;
+    @ApiModelProperty(value = " 实际支付")
+    private String actualpay;
+    @ApiModelProperty(value = " 订单类型")
+    private Integer type;
+
+    private  Integer expert_id;
+    private String  address;
+
+    @ApiModelProperty(value = " 订购时间")
+    private Date intime;
+
+    private Integer  buycount;
+
+    private  String  discount;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getTrade_no() {
+        return trade_no;
+    }
+
+    public void setTrade_no(String trade_no) {
+        this.trade_no = trade_no;
+    }
+
+    public String getOrderpaynum() {
+        return orderpaynum;
+    }
+
+    public void setOrderpaynum(String orderpaynum) {
+        this.orderpaynum = orderpaynum;
+    }
+
+    public Integer getProduct_id() {
+        return product_id;
+    }
+
+    public void setProduct_id(Integer product_id) {
+        this.product_id = product_id;
+    }
+
+    public String getProduct_name() {
+        return product_name;
+    }
+
+    public void setProduct_name(String product_name) {
+        this.product_name = product_name;
+    }
+
+    public String getProduct_detail() {
+        return product_detail;
+    }
+
+    public void setProduct_detail(String product_detail) {
+        this.product_detail = product_detail;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getUser_name() {
+        return user_name;
+    }
+
+    public void setUser_name(String user_name) {
+        this.user_name = user_name;
+    }
+
+    public Integer getScore_id() {
+        return score_id;
+    }
+
+    public void setScore_id(Integer score_id) {
+        this.score_id = score_id;
+    }
+
+    public Integer getPayway() {
+        return payway;
+    }
+
+    public void setPayway(Integer payway) {
+        this.payway = payway;
+    }
+
+    public String getPaymoney() {
+        return paymoney;
+    }
+
+    public void setPaymoney(String paymoney) {
+        this.paymoney = paymoney;
+    }
+
+    public Integer getPaystate() {
+        return paystate;
+    }
+
+    public void setPaystate(Integer paystate) {
+        this.paystate = paystate;
+    }
+
+    public String getCoupon() {
+        return coupon;
+    }
+
+    public void setCoupon(String coupon) {
+        this.coupon = coupon;
+    }
+
+    public String getCoupon_name() {
+        return coupon_name;
+    }
+
+    public void setCoupon_name(String coupon_name) {
+        this.coupon_name = coupon_name;
+    }
+
+    public String getActualpay() {
+        return actualpay;
+    }
+
+    public void setActualpay(String actualpay) {
+        this.actualpay = actualpay;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getExpert_id() {
+        return expert_id;
+    }
+
+    public void setExpert_id(Integer expert_id) {
+        this.expert_id = expert_id;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Date getIntime() { return intime; }
+
+    public void setIntime(Date intime) { this.intime = intime; }
+
+    public Integer getBuycount() {
+        return buycount;
+    }
+
+    public void setBuycount(Integer buycount) {
+        this.buycount = buycount;
+    }
+
+    public String getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(String discount) {
+        this.discount = discount;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/model/WxPay.java b/src/main/java/com/sincere/wechatbusiness/model/WxPay.java
new file mode 100644
index 0000000..7edda26
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/WxPay.java
@@ -0,0 +1,102 @@
+package com.sincere.wechatbusiness.model;
+
+public class WxPay {
+      private  Integer  productId ;
+      private  String subject;
+      private  String body;
+      private  String paymoney;
+      private  String totalFee;
+      private  String coupon;
+      private  String outTradeNo;
+      private  String notify_url;
+      private  String attach;
+      private  Integer payType;
+      private  Integer payWay;
+      private  String quit_url;
+      private  String map;
+      private  String openid;
+
+      private  String  address;
+      private  Integer expert_id;
+      private  String coupon_num;
+
+      public  Integer  getProductId()  {return  productId;}
+
+      public  void  setProductId(Integer productId)  {this.productId=productId;}
+
+    public  String  getSubject()  {return  subject;}
+
+    public  void  setSubject(String subject)  {this.subject=subject;}
+
+    public  String  getBody()  {return  body;}
+
+    public  void  setBody(String body)  {this.body=body;}
+
+    public  String  getPaymoney()  {return  paymoney;}
+
+    public  void  setPaymoney(String paymoney)  {this.paymoney=paymoney;}
+
+    public  String  getCoupon()  {return  coupon;}
+
+    public  void  setCoupon(String coupon)  {this.coupon=coupon;}
+
+    public  String  getTotalFee()  {return  totalFee;}
+
+    public  void  setTotalFee(String totalFee)  {this.totalFee=totalFee;}
+
+    public  String  getOutTradeNo()  {return  outTradeNo;}
+
+    public  void  setOutTradeNo(String outTradeNo)  {this.outTradeNo=outTradeNo;}
+
+    public  String  getNotify_url()  {return  notify_url;}
+
+    public  void  setNotify_url(String notify_url)  {this.notify_url=notify_url;}
+
+    public  String  getAttach()  {return  attach;}
+
+    public  void  setAttach(String attach)  {this.attach=attach;}
+
+    public  Integer  getPayType()  {return  payType;}
+
+    public  void  setPayType(Integer payType)  {this.payType=payType;}
+
+    public  Integer  getPayWay()  {return  payWay;}
+
+    public  void  setPayWay(Integer payWay)  {this.payWay=payWay;}
+
+    public  String  getQuit_url()  {return  quit_url;}
+
+    public  void  setQuit_url(String quit_url)  {this.quit_url=quit_url;}
+
+    public  String  getMap()  {return  map;}
+
+    public  void  setMap(String map)  {this.map=map;}
+
+    public  String  getOpenid()  {return  openid;}
+
+    public  void  setOpenid(String openid)  {this.openid=openid;}
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getExpert_id() {
+        return expert_id;
+    }
+
+    public void setExpert_id(Integer expert_id) {
+        this.expert_id = expert_id;
+    }
+
+    public String getCoupon_num() {
+        return coupon_num;
+    }
+
+    public void setCoupon_num(String coupon_num) {
+        this.coupon_num = coupon_num;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/model/WxResult.java b/src/main/java/com/sincere/wechatbusiness/model/WxResult.java
new file mode 100644
index 0000000..84354e1
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/WxResult.java
@@ -0,0 +1,83 @@
+package com.sincere.wechatbusiness.model;
+
+public class WxResult {
+    private String prepay_id;
+
+    private String appId;
+
+    private String timeStamp;
+
+    private String nonceStr;
+
+    private String paySign;
+
+    private String orderNo;
+
+    private String totalFee;
+
+    private String signType;
+
+    public String getPrepay_id() {
+        return prepay_id;
+    }
+
+    public void setPrepay_id(String prepay_id) {
+        this.prepay_id = prepay_id;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(String timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getNonceStr() {
+        return nonceStr;
+    }
+
+    public void setNonceStr(String nonceStr) {
+        this.nonceStr = nonceStr;
+    }
+
+    public String getPaySign() {
+        return paySign;
+    }
+
+    public void setPaySign(String paySign) {
+        this.paySign = paySign;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getTotalFee() {
+        return totalFee;
+    }
+
+    public void setTotalFee(String totalFee) {
+        this.totalFee = totalFee;
+    }
+
+    public String getSignType() {
+        return signType;
+    }
+
+    public void setSignType(String signType) {
+        this.signType = signType;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/model/WxSign.java b/src/main/java/com/sincere/wechatbusiness/model/WxSign.java
new file mode 100644
index 0000000..cd2b9a0
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/WxSign.java
@@ -0,0 +1,68 @@
+package com.sincere.wechatbusiness.model;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class WxSign {
+    @ApiModelProperty(value = "时间戳")
+    private String timestamp;
+
+    @ApiModelProperty(value = "随机码")
+    private String noncestr;
+
+    @ApiModelProperty(value = "签名")
+    private String signature;
+
+    private String jsapi_ticket;
+
+    private String sign_before;
+
+    private String basictoken;
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getNoncestr() {
+        return noncestr;
+    }
+
+    public void setNoncestr(String noncestr) {
+        this.noncestr = noncestr;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public String getJsapi_ticket() {
+        return jsapi_ticket;
+    }
+
+    public void setJsapi_ticket(String jsapi_ticket) {
+        this.jsapi_ticket = jsapi_ticket;
+    }
+
+    public String getSign_before() {
+        return sign_before;
+    }
+
+    public void setSign_before(String sign_before) {
+        this.sign_before = sign_before;
+    }
+
+    public String getBasictoken() {
+        return basictoken;
+    }
+
+    public void setBasictoken(String basictoken) {
+        this.basictoken = basictoken;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/service/AgentService.java b/src/main/java/com/sincere/wechatbusiness/service/AgentService.java
new file mode 100644
index 0000000..b626776
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/service/AgentService.java
@@ -0,0 +1,15 @@
+package com.sincere.wechatbusiness.service;
+
+import com.sincere.wechatbusiness.model.Agent;
+
+import java.util.List;
+
+public interface AgentService {
+    List<Agent> getList(int id);
+
+    int insert(Agent agent);
+
+    int update(Agent agent);
+
+    int deleteAgent(int id);
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/service/CatalogContentService.java b/src/main/java/com/sincere/wechatbusiness/service/CatalogContentService.java
index 464eadc..27d5cab 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/CatalogContentService.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/CatalogContentService.java
@@ -1,6 +1,7 @@
 package com.sincere.wechatbusiness.service;
 
 import com.sincere.wechatbusiness.model.CatalogContent;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,4 +13,6 @@ public interface CatalogContentService {
     int update(CatalogContent catalogContent);
 
     int deleteCatalogContent(int id);
+
+    List<CatalogContent> getListByDate(int catalogId,String date);
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/service/CatalogService.java b/src/main/java/com/sincere/wechatbusiness/service/CatalogService.java
index 5788d7c..ac66bd7 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/CatalogService.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/CatalogService.java
@@ -2,10 +2,14 @@ package com.sincere.wechatbusiness.service;
 
 import com.sincere.wechatbusiness.model.Catalog;
 
+import java.util.List;
+
 public interface CatalogService {
     Catalog getDetail(Catalog catalog);
 
     int insert(Catalog catalog);
 
     int update(Catalog catalog);
+
+    List<Catalog> getList(int id);
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/service/ChannelProductService.java b/src/main/java/com/sincere/wechatbusiness/service/ChannelProductService.java
index c89bbfb..2a81b61 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/ChannelProductService.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/ChannelProductService.java
@@ -12,4 +12,6 @@ public interface ChannelProductService {
     int update(ChannelProduct channelProduct);
 
     int deleteChannelProduct(int id);
+
+    ChannelProduct getDetail(int id);
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java b/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java
index 6345512..60e4cba 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java
@@ -1,8 +1,6 @@
 package com.sincere.wechatbusiness.service;
 
-import com.sincere.wechatbusiness.model.Area;
-import com.sincere.wechatbusiness.model.Channel;
-import com.sincere.wechatbusiness.model.Template;
+import com.sincere.wechatbusiness.model.*;
 import com.sincere.wechatbusiness.utils.Page;
 
 import java.util.List;
@@ -21,4 +19,8 @@ public interface ChannelService {
     List<Area> getAreaList();
 
     List<Template> getTemplateList();
+
+    Manager getManagerDetail(String mobile);
+
+    int insertLog(Log log);
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/service/impl/AgentServiceImpl.java b/src/main/java/com/sincere/wechatbusiness/service/impl/AgentServiceImpl.java
new file mode 100644
index 0000000..638bf70
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/service/impl/AgentServiceImpl.java
@@ -0,0 +1,28 @@
+package com.sincere.wechatbusiness.service.impl;
+
+import com.sincere.wechatbusiness.mapper.AgentMapper;
+import com.sincere.wechatbusiness.model.Agent;
+import com.sincere.wechatbusiness.service.AgentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.rmi.activation.ActivationGroup;
+import java.util.List;
+
+@Service
+public class AgentServiceImpl implements AgentService {
+    @Autowired
+    AgentMapper agentMapper;
+
+    @Override
+    public List<Agent> getList(int id){return agentMapper.getList(id);}
+
+    @Override
+    public int insert(Agent agent){return agentMapper.insert(agent);}
+
+    @Override
+    public int update(Agent agent){return agentMapper.update(agent);}
+
+    @Override
+    public int deleteAgent(int id){return agentMapper.deleteAgent(id);}
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/service/impl/CatalogContentServiceImpl.java b/src/main/java/com/sincere/wechatbusiness/service/impl/CatalogContentServiceImpl.java
index 6b75583..8939313 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/impl/CatalogContentServiceImpl.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/impl/CatalogContentServiceImpl.java
@@ -25,4 +25,7 @@ public class CatalogContentServiceImpl implements CatalogContentService {
 
     @Override
     public int deleteCatalogContent(int id){return catalogContentMapper.deleteCatalogContent(id);}
+
+    @Override
+    public List<CatalogContent> getListByDate(int catalogId,String date){return catalogContentMapper.getListByDate(catalogId,date,1);}
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/service/impl/CatalogServiceImpl.java b/src/main/java/com/sincere/wechatbusiness/service/impl/CatalogServiceImpl.java
index 2da4121..6e6ebe9 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/impl/CatalogServiceImpl.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/impl/CatalogServiceImpl.java
@@ -6,6 +6,8 @@ import com.sincere.wechatbusiness.service.CatalogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class CatalogServiceImpl implements CatalogService {
     @Autowired
@@ -19,4 +21,7 @@ public class CatalogServiceImpl implements CatalogService {
 
     @Override
     public int update(Catalog catalog){return catalogMapper.update(catalog);}
+
+    @Override
+    public List<Catalog> getList(int id){return catalogMapper.getList(id);}
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelProductServiceImpl.java b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelProductServiceImpl.java
index 33d5f33..dfcfb9e 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelProductServiceImpl.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelProductServiceImpl.java
@@ -24,4 +24,7 @@ public class ChannelProductServiceImpl implements ChannelProductService {
 
     @Override
     public int deleteChannelProduct(int id){return channelProductMapper.deleteChannelProduct(id);}
+
+    @Override
+    public ChannelProduct getDetail(int id){return channelProductMapper.getDetail(id);}
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java
index 0f40f99..7d1b5ac 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java
@@ -2,15 +2,12 @@ package com.sincere.wechatbusiness.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.sincere.wechatbusiness.mapper.ChannelMapper;
-import com.sincere.wechatbusiness.model.Area;
-import com.sincere.wechatbusiness.model.Channel;
-import com.sincere.wechatbusiness.model.Template;
+import com.sincere.wechatbusiness.model.*;
 import com.sincere.wechatbusiness.service.ChannelService;
 import com.sincere.wechatbusiness.utils.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -60,5 +57,11 @@ public class ChannelServiceImpl implements ChannelService {
 
     @Override
     public List<Template> getTemplateList(){return channelMapper.getTemplateList();}
+
+    @Override
+    public Manager getManagerDetail(String mobile){return channelMapper.getManagerDetail(mobile);}
+
+    @Override
+    public int insertLog(Log log){return channelMapper.insertLog(log);}
 }
 
diff --git a/src/main/java/com/sincere/wechatbusiness/utils/HttpClientUtils.java b/src/main/java/com/sincere/wechatbusiness/utils/HttpClientUtils.java
new file mode 100644
index 0000000..4f98889
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/utils/HttpClientUtils.java
@@ -0,0 +1,190 @@
+package com.sincere.wechatbusiness.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * HttpClient4.3工具类
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 10:17
+ */
+public class HttpClientUtils {
+
+    private static RequestConfig requestConfig = null;
+
+    static {
+        // 设置请求和传输超时时间
+        requestConfig = RequestConfig.custom().setSocketTimeout(5000).setConnectTimeout(5000).build();
+    }
+
+    public static void main(String[] args) throws Exception {
+
+    }
+
+    /**
+     * post请求传输json参数
+     * @param url  url地址
+     * @param jsonParam 参数
+     * @return
+     */
+    public static JSONObject httpPostJson(String url, String jsonParam) {
+        // post请求返回结果
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        JSONObject jsonResult = null;
+        HttpPost httpPost = new HttpPost(url);
+        // 设置请求和传输超时时间
+        httpPost.setConfig(requestConfig);
+        try {
+            if (null != jsonParam) {
+                // 解决中文乱码问题
+                StringEntity entity = new StringEntity(jsonParam, "utf-8");
+                entity.setContentEncoding("UTF-8");
+                entity.setContentType("application/json");
+                httpPost.setEntity(entity);
+            }
+            CloseableHttpResponse result = httpClient.execute(httpPost);
+            // 请求发送成功，并得到响应
+            if (result.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                String str = "";
+                // 读取服务器返回过来的json字符串数据
+                str = EntityUtils.toString(result.getEntity(), "utf-8");
+                // 把json字符串转换成json对象
+                jsonResult = JSONObject.parseObject(str);
+
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            httpPost.releaseConnection();
+        }
+        return jsonResult;
+    }
+
+    /**
+     * post请求传输String参数 例如：name=Jack&sex=1&type=2
+     * Content-type:application/x-www-form-urlencoded
+     * @param url            url地址
+     * @param strParam       参数
+     * @return
+     */
+    public static JSONObject httpPost(String url, String strParam) {
+        // post请求返回结果
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        JSONObject jsonResult = null;
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.setConfig(requestConfig);
+        try {
+            if (null != strParam) {
+                // 解决中文乱码问题
+                StringEntity entity = new StringEntity(strParam, "utf-8");
+                entity.setContentEncoding("UTF-8");
+                entity.setContentType("application/x-www-form-urlencoded");
+                httpPost.setEntity(entity);
+            }
+            CloseableHttpResponse result = httpClient.execute(httpPost);
+            // 请求发送成功，并得到响应
+            if (result.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                String str = "";
+                // 读取服务器返回过来的json字符串数据
+                str = EntityUtils.toString(result.getEntity(), "utf-8");
+                // 把json字符串转换成json对象
+                jsonResult = JSONObject.parseObject(str);
+            }
+        } catch (IOException e) {
+
+        } finally {
+            httpPost.releaseConnection();
+        }
+        return jsonResult;
+    }
+
+    /**
+     * 发送get请求
+     * @param url 路径
+     * @return
+     */
+    public static JSONObject httpGet(String url) {
+        // get请求返回结果
+        JSONObject jsonResult = null;
+        CloseableHttpClient client = HttpClients.createDefault();
+        // 发送get请求
+        HttpGet request = new HttpGet(url);
+        request.setConfig(requestConfig);
+        try {
+            CloseableHttpResponse response = client.execute(request);
+            // 请求发送成功，并得到响应
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                // 读取服务器返回过来的json字符串数据
+                HttpEntity entity = response.getEntity();
+                String strResult = EntityUtils.toString(entity, "utf-8");
+                // 把json字符串转换成json对象
+                jsonResult = JSONObject.parseObject(strResult);
+            }
+        } catch (IOException e) {
+
+        } finally {
+            request.releaseConnection();
+        }
+        return jsonResult;
+    }
+
+    public static String httpGet2(String url) {
+        // get请求返回结果
+        JSONObject jsonResult = null;
+        String result = "" ;
+        CloseableHttpClient client = HttpClients.createDefault();
+        // 发送get请求
+        HttpGet request = new HttpGet(url);
+        request.setConfig(requestConfig);
+        try {
+            CloseableHttpResponse response = client.execute(request);
+            // 请求发送成功，并得到响应
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                // 读取服务器返回过来的json字符串数据
+                HttpEntity entity = response.getEntity();
+                String strResult = EntityUtils.toString(entity, "utf-8");
+                // 把json字符串转换成json对象
+                //jsonResult = JSONObject.parseObject(strResult);
+                result = strResult;
+            }
+        } catch (IOException e) {
+
+        } finally {
+            request.releaseConnection();
+        }
+        return result;
+    }
+
+
+    public static InputStream GetFileInputStream(String fileUrl){
+        try{
+            URL url = new URL(fileUrl);
+            HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+            //设置超时间为3秒
+            conn.setConnectTimeout(8*1000);
+            //得到输入流
+            InputStream inputStream = conn.getInputStream();
+
+            return inputStream ;
+        }catch (Exception e){
+
+        }
+        return null ;
+    }
+
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/utils/ResultException.java b/src/main/java/com/sincere/wechatbusiness/utils/ResultException.java
new file mode 100644
index 0000000..201d828
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/utils/ResultException.java
@@ -0,0 +1,29 @@
+package com.sincere.wechatbusiness.utils;
+
+public class ResultException extends Exception {
+
+    private int code ;
+    private String message ;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public ResultException(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/utils/TokenUtils.java b/src/main/java/com/sincere/wechatbusiness/utils/TokenUtils.java
new file mode 100644
index 0000000..be7cfa7
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/utils/TokenUtils.java
@@ -0,0 +1,94 @@
+package com.sincere.wechatbusiness.utils;
+
+import com.nimbusds.jose.*;
+import com.nimbusds.jose.crypto.MACSigner;
+import com.nimbusds.jose.crypto.MACVerifier;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+
+import java.util.Date;
+import java.util.Objects;
+
+public class TokenUtils {
+
+    /**
+     * 创建秘钥
+     */
+    private static final byte[] SECRET = "6MNSobBRCHGIO0fS6MNSobBRCHGWO0fS".getBytes();
+
+    /**
+     * 过期时间5秒
+     */
+    private static final long EXPIRE_TIME = 1000 * 60 * 60 * 24 * 3;
+
+
+    /**
+     * 生成Token  入参userId
+     * @param account
+     * @return
+     */
+    public static String buildToken(String account) {
+        try {
+            /**
+             * 1.创建一个32-byte的密匙
+             */
+            MACSigner macSigner = new MACSigner(SECRET);
+            /**
+             * 2. 建立payload 载体
+             */
+            JWTClaimsSet claimsSet = new JWTClaimsSet.Builder()
+                    .expirationTime(new Date(System.currentTimeMillis() + EXPIRE_TIME))
+                    .claim("ACCOUNT",account)
+                    .build();
+
+            /**
+             * 3. 建立签名
+             */
+            SignedJWT signedJWT = new SignedJWT(new JWSHeader(JWSAlgorithm.HS256), claimsSet);
+            signedJWT.sign(macSigner);
+
+            /**
+             * 4. 生成token
+             */
+            String token = signedJWT.serialize();
+            return token;
+        } catch (KeyLengthException e) {
+            e.printStackTrace();
+        } catch (JOSEException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 校验token
+     * @param token
+     * @return
+     */
+    public static String validToken(String token) throws ResultException {
+        try {
+            SignedJWT jwt = SignedJWT.parse(token);
+            JWSVerifier verifier = new MACVerifier(SECRET);
+            //校验是否有效
+            if (!jwt.verify(verifier)) {
+                throw new ResultException(-1, "Token 无效");
+            }
+
+            //校验超时
+            Date expirationTime = jwt.getJWTClaimsSet().getExpirationTime();
+            if (new Date().after(expirationTime)) {
+                throw new ResultException(-2, "Token 已过期");
+            }
+
+            //获取载体中的数据
+            Object account = jwt.getJWTClaimsSet().getClaim("ACCOUNT");
+            //是否有openUid
+            if (Objects.isNull(account)){
+                throw new ResultException(-3, "账号为空");
+            }
+            return account.toString();
+        } catch (Exception e) {
+            throw new ResultException(-4, "系统繁忙");
+        }
+    }
+}
diff --git a/src/main/resources/mapper/AgentMapper.xml b/src/main/resources/mapper/AgentMapper.xml
new file mode 100644
index 0000000..776f027
--- /dev/null
+++ b/src/main/resources/mapper/AgentMapper.xml
@@ -0,0 +1,40 @@
+<?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.sincere.wechatbusiness.mapper.AgentMapper">
+    <resultMap id="AgentMap" type="com.sincere.wechatbusiness.model.Agent">
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="channelId" jdbcType="INTEGER" property="channelId" />
+        <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+        <result column="state" jdbcType="INTEGER" property="state"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    </resultMap>
+
+    <select id="getList" parameterType="java.lang.Integer" resultMap="AgentMap">
+        select * from agent where state=1 and channelId=#{id} order by create_time
+    </select>
+
+    <insert id="insert" parameterType="com.sincere.wechatbusiness.model.Agent">
+    insert into agent (channelId,name,mobile)
+    values (#{channelId,jdbcType=INTEGER},#{name,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}
+      )
+    </insert>
+
+    <update id="update" parameterType="com.sincere.wechatbusiness.model.Agent">
+        update agent
+        <trim prefix="set" suffixOverrides=",">
+            <if test="name!=null and name!=''">
+                name=#{name},
+            </if>
+            <if test="mobile!=null and mobile!=''">
+                mobile=#{mobile},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteAgent" parameterType="java.lang.Integer">
+        update agent set state=0 where id=#{id}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/CatalogContentMapper.xml b/src/main/resources/mapper/CatalogContentMapper.xml
index b33ab1c..613da13 100644
--- a/src/main/resources/mapper/CatalogContentMapper.xml
+++ b/src/main/resources/mapper/CatalogContentMapper.xml
@@ -12,12 +12,29 @@
         <result column="link_url" jdbcType="VARCHAR" property="linkUrl" />
         <result column="state" jdbcType="INTEGER" property="state"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="is_start" jdbcType="INTEGER" property="isStart"/>
     </resultMap>
 
     <select id="getList" parameterType="java.lang.Integer" resultMap="CatalogContentMap">
         select * from catalog_content where catalogId=#{id} and state=1 order by create_time
     </select>
 
+    <select id="getListByDate" resultMap="CatalogContentMap">
+        select *,(case when start_time <![CDATA[>]]> getdate() then 0 when end_time <![CDATA[<]]> getdate() then 2 else 1 end ) as is_start from catalog_content
+        <where>
+            <if test="state != 0">
+                and state=#{state}
+            </if>
+            <if test="catalogId != 0">
+                and catalogId=#{catalogId}
+            </if>
+            <if test="date != null and date!=''">
+                and start_time <![CDATA[<=]]>#{date} and end_time <![CDATA[>=]]>#{date}
+            </if>
+        </where>
+        order by create_time
+    </select>
+
     <insert id="insert" parameterType="com.sincere.wechatbusiness.model.CatalogContent">
     insert into catalog_content (catalogId, title,subtitle,start_time,end_time,img_url,link_url)
     values (#{catalogId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR},
diff --git a/src/main/resources/mapper/CatalogMapper.xml b/src/main/resources/mapper/CatalogMapper.xml
index 6af0b77..29df3a1 100644
--- a/src/main/resources/mapper/CatalogMapper.xml
+++ b/src/main/resources/mapper/CatalogMapper.xml
@@ -10,6 +10,10 @@
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     </resultMap>
 
+    <select id="getList" parameterType="java.lang.Integer" resultMap="CatalogMap">
+        select * from catalog where channelId=#{channelId} and state=1 and sort!=6 order by sort
+    </select>
+
     <select id="getDetail" parameterType="com.sincere.wechatbusiness.model.Catalog" resultMap="CatalogMap">
         select * from catalog where channelId=#{channelId} and sort=#{sort} and state=1
     </select>
diff --git a/src/main/resources/mapper/ChannelMapper.xml b/src/main/resources/mapper/ChannelMapper.xml
index 9742d90..50f9aa0 100644
--- a/src/main/resources/mapper/ChannelMapper.xml
+++ b/src/main/resources/mapper/ChannelMapper.xml
@@ -29,6 +29,20 @@
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     </resultMap>
 
+    <resultMap id="ManagerMap" type="com.sincere.wechatbusiness.model.Manager">
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+        <result column="state" jdbcType="INTEGER" property="state"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    </resultMap>
+
+    <resultMap id="LogMap" type="com.sincere.wechatbusiness.model.Log">
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+        <result column="operation" jdbcType="VARCHAR" property="operation"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    </resultMap>
+
     <select id="getList" parameterType="com.sincere.wechatbusiness.model.Channel" resultMap="ChannelMap">
         select *,(select count(0) from channel_product where channelId=c.id and state=1) as product_count,
          (select title from template where id=c.templateId) as template_name from channel c
@@ -108,4 +122,14 @@
     <select id="getTemplateList" resultMap="TemplateMap">
         select * from template where state=1 order by create_time
     </select>
+
+    <select id="getManagerDetail" parameterType="java.lang.String" resultMap="ManagerMap">
+        select * from manager where mobile=#{mobile} and state=1
+    </select>
+
+    <insert id="insertLog" parameterType="com.sincere.wechatbusiness.model.Log">
+    insert into log (mobile,operation)
+    values (#{mobile,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR}
+      )
+    </insert>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/ChannelProductMapper.xml b/src/main/resources/mapper/ChannelProductMapper.xml
index 2a92c8d..a1e4f17 100644
--- a/src/main/resources/mapper/ChannelProductMapper.xml
+++ b/src/main/resources/mapper/ChannelProductMapper.xml
@@ -4,8 +4,10 @@
     <resultMap id="ChannelProductMap" type="com.sincere.wechatbusiness.model.ChannelProduct">
         <id column="id" jdbcType="INTEGER" property="id" />
         <result column="channelId" jdbcType="INTEGER" property="channelId" />
+        <result column="productId" jdbcType="INTEGER" property="productId" />
         <result column="product_name" jdbcType="VARCHAR" property="productName" />
         <result column="price" jdbcType="VARCHAR" property="price" />
+        <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
         <result column="channel_price" jdbcType="VARCHAR" property="channelPrice" />
         <result column="caption" jdbcType="VARCHAR" property="caption" />
         <result column="state" jdbcType="INTEGER" property="state"/>
@@ -17,8 +19,8 @@
     </select>
 
     <insert id="insert" parameterType="com.sincere.wechatbusiness.model.ChannelProduct">
-    insert into channel_product (channelId, product_name,price)
-    values (#{channelId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, #{price,jdbcType=VARCHAR}
+    insert into channel_product (channelId,productId,product_name,price,img_url)
+    values (#{channelId,jdbcType=INTEGER},#{productId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, #{price,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR}
       )
     </insert>
 
@@ -38,4 +40,8 @@
     <update id="deleteChannelProduct" parameterType="java.lang.Integer">
         update channel_product set state=0 where channelId=#{id}
     </update>
+
+    <select id="getDetail" parameterType="java.lang.Integer" resultMap="ChannelProductMap">
+        select * from channel_product where id=#{id}
+    </select>
 </mapper>
\ No newline at end of file
--
libgit2 0.21.0