添加优惠券使用统计

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItem.java

@@ -31,7 +31,7 @@ public class CouponItem implements Serializable{
 	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
 	private Date couponReceiveDate;				//领取优惠券时间
 	
-	private Integer couponUseStatus;				//使用状态
+	private Integer couponUseStatus;				//使用状态		1:
 	private Integer oldCouponUseStatus;			//当前的使用状态
 	private Integer couponIsDonation;			//是否已转增
 	@DateTimeFormat(pattern="yyyy-MM-dd")  
@@ -42,6 +42,8 @@ public class CouponItem implements Serializable{
 
 	private Integer couponIsNewPeople;  //是否为新人券   1：是   2：否
 
+	private Integer[] couponIds;
+
 	public String getCouponItemId() {
 		return couponItemId;
 	}
@@ -129,4 +131,12 @@ public class CouponItem implements Serializable{
 	public void setCouponIsDonation(Integer couponIsDonation) {
 		this.couponIsDonation = couponIsDonation;
 	}
+
+	public Integer[] getCouponIds() {
+		return couponIds;
+	}
+
+	public void setCouponIds(Integer[] couponIds) {
+		this.couponIds = couponIds;
+	}
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/report/Report.java

@@ -0,0 +1,72 @@
+package com.iamberry.wechat.core.entity.report;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  优惠券领取使用，注册人数统计类
+ * @author Administrator
+ * @Date 2018-04-20
+ */
+public class Report  implements  Serializable{
+    private static final long serialVersionUID = -1242526547260462555L;
+    //统计id
+    private Integer reportId;
+    //领取优惠券人数
+    private Integer reportCouponNumber;
+    //优惠券使用人数
+    private Integer reportCouponUseNumber;
+    //注册人数
+    private Integer reportRegisteredNumber;
+    //创建时间
+    private Date reportCreateTime;
+    //修改时间'
+    private Date reportUpdateTime;
+
+    public Integer getReportId(){
+        return reportId;
+    }
+
+    public void setReportId(Integer  reportId){
+        this.reportId=reportId;
+    }
+
+    public Integer getReportCouponNumber(){
+        return reportCouponNumber;
+    }
+
+    public void setReportCouponNumber(Integer  reportCouponNumber){
+        this.reportCouponNumber=reportCouponNumber;
+    }
+
+    public Integer getReportCouponUseNumber(){
+        return reportCouponUseNumber;
+    }
+
+    public void setReportCouponUseNumber(Integer  reportCouponUseNumber){
+        this.reportCouponUseNumber=reportCouponUseNumber;
+    }
+
+    public Integer getReportRegisteredNumber(){
+        return reportRegisteredNumber;
+    }
+
+    public void setReportRegisteredNumber(Integer  reportRegisteredNumber){
+        this.reportRegisteredNumber=reportRegisteredNumber;
+    }
+
+    public Date getReportCreateTime(){
+        return reportCreateTime;
+    }
+
+    public void setReportCreateTime(Date  reportCreateTime){
+        this.reportCreateTime=reportCreateTime;
+    }
+
+    public Date getReportUpdateTime(){
+        return reportUpdateTime;
+    }
+
+    public void setReportUpdateTime(Date  reportUpdateTime){
+        this.reportUpdateTime=reportUpdateTime;
+    }
+}

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/CouponItemService.java

@@ -72,5 +72,12 @@ public interface CouponItemService {
 	 */
 	Integer isReceive(CouponItem couponItem);
 
+	/**
+	 * 获取所有领取优惠券的人
+	 * @param couponItem
+	 * @return
+	 */
+	Integer allCouponItemNumber(CouponItem couponItem);
+
 
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/member/MemberService.java

@@ -157,4 +157,10 @@ public interface MemberService{
 	 * @return
 	 */
 	public Integer updateUserStayIntegralByOpenId(Member member);
+
+	/**
+	 * 获取所有的注册人数
+	 * @return
+	 */
+	Integer getRegisteredNumber();
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/porduct/ProductColorService.java

@@ -24,6 +24,13 @@ public interface ProductColorService {
 	 * @return
 	 */
 	public List<ProductColor> getLeaseProductColor(Integer colorProductId);
+
+	/**
+	 * 查询产品对应颜色---获取免费领取充电器的颜色
+	 * @param colorProductId
+	 * @return
+	 */
+	public List<ProductColor> getChargReceiveColor(Integer colorProductId);
 	
 	/**
 	 * 分页获取产品颜色列表

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/report/ReportService.java

@@ -0,0 +1,50 @@
+package com.iamberry.wechat.face.report;
+
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.core.entity.receive.ChargerReceive;
+import com.iamberry.wechat.core.entity.report.Report;
+
+import java.util.List;
+
+/**
+ *  优惠券领取使用，注册人数统计接口
+ * @author Administrator
+ * @Date 2018-04-20
+ */
+public interface ReportService {
+
+    /*分页 -- 后台专用*/
+    PagedResult<Report> listAdminReport(PageRequest<Report> pageRequest);
+
+    /**
+     * 获取集合
+     * @param  report
+     * @return List
+     */
+    List<Report> getReportList(Report report);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  report
+     */
+    Report  getReportById(Integer  id);
+    /**
+     * 增加数据
+     * @param  report
+     * @return Integer
+     */
+    Integer  save(Report  report);
+    /**
+     * 修改数据
+     * @param  report
+     * @return Integer
+     */
+    Integer  update(Report  report);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/coupon/CouponItemServiceImpl.java

@@ -68,4 +68,9 @@ public class CouponItemServiceImpl implements CouponItemService {
 		return couponItemMapper.isReceive(couponItem);
 	}
 
+	@Override
+	public Integer allCouponItemNumber(CouponItem couponItem) {
+		return couponItemMapper.allCouponItemNumber(couponItem);
+	}
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/CouponItemMapper.java

@@ -76,4 +76,12 @@ public interface CouponItemMapper {
 	 */
 	Integer isReceive(CouponItem couponItem);
 
+	/**
+	 * 获取所有领取优惠券的人
+	 * @param couponItem
+	 * @return
+	 */
+	Integer allCouponItemNumber(CouponItem couponItem);
+
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/MemberMapper.java

@@ -151,4 +151,10 @@ public interface MemberMapper {
 	 * @return
 	 */
 	Integer updateMyMember(Member member);
+
+	/**
+	 * 获取所有的注册人数
+	 * @return
+	 */
+	Integer getRegisteredNumber();
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ProductColorMapper.java

@@ -32,8 +32,14 @@ public interface ProductColorMapper {
 	 * @return
 	 */
 	List<ProductColor> getLeaseProductColor(Integer colorProductId);
-	
-	
+
+	/**
+	 * 查询产品对应颜色---获取免费领取充电器的颜色
+	 * @param colorProductId
+	 * @return
+	 */
+	public List<ProductColor> getChargReceiveColor(Integer colorProductId);
+
 	/**
 	 * 分页获取产品颜色列表
 	 * 2017年2月5日

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ReportMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.report.Report;
+
+import java.util.List;
+
+/**
+ *  优惠券领取使用，注册人数统计接口
+ * @author Administrator
+ * @Date 2018-04-20
+ */
+public interface ReportMapper {
+    /**
+     * 获取集合
+     * @param  report
+     * @return List
+     */
+    List<Report> getReportList(Report report);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  report
+     */
+    Report  getReportById(Integer  id);
+    /**
+     * 增加数据
+     * @param  report
+     * @return Integer
+     */
+    Integer  save(Report  report);
+    /**
+     * 修改数据
+     * @param  report
+     * @return Integer
+     */
+    Integer  update(Report  report);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

@@ -212,4 +212,27 @@
 		AND CI.coupon_id =  #{couponId}
 	</select>
 
+
+	<!--获取所有领取优惠券的人-->
+	<select id="allCouponItemNumber" parameterType="CouponItem" resultType="Integer">
+		SELECT
+			COUNT(CI.coupon_item_id)
+		FROM
+			TB_IAMBERRY_COUPON_ITEM CI
+		<where>
+			<if test="couponId != null and couponId != ''">
+				CI.COUPON_ID=#{couponId}
+			</if>
+			<if test="couponIds!=null and couponIds!=''">
+				AND  CI.COUPON_ID IN
+				<foreach collection="couponIds" item="node" index="index" separator="," open="(" close=")">
+					#{node}
+				</foreach >
+			</if>
+			<if test="couponUseStatus != null and couponUseStatus != ''">
+				AND CI.coupon_use_status = #{couponUseStatus}
+			</if>
+		</where>
+	</select>
+
 </mapper>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/memberMapper.xml

@@ -373,4 +373,13 @@
         VALUES
          (#{userOpenId},#{configId},#{orderId},#{stayNumber},#{stayRecordedTime},#{stayStatus},#{stayRemark})
 	</insert>
-</mapper> 
+
+	<!-- 获取个人信息-->
+	<select id="getRegisteredNumber" resultType="Integer" >
+		SELECT
+			COUNT(user_id)
+		FROM
+			TB_IAMBERRY_USER_USERINFO
+		WHERE user_identity = 1;
+	</select>
+</mapper>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productColorMapper.xml

@@ -63,6 +63,16 @@
 			color_product_id = #{colorProductId}
 			AND  color_status = 1
 	</select>
+
+	<!-- 查询租赁产品颜色 -->
+	<select id="getChargReceiveColor" parameterType="java.lang.Integer"  resultType="ProductColor">
+		SELECT
+			<include refid="allField" />
+		FROM
+			tb_iamberry_product_color
+		WHERE
+			color_product_id = #{colorProductId}
+	</select>
 	
 	<!-- 分页获取产品颜色列表 -->
 	<select id="selectProductColorList" parameterType="ProductColor" resultType="ProductColor">

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/reportMapper.xml

@@ -0,0 +1,86 @@
+<?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.iamberry.wechat.service.mapper.ReportMapper">
+	<resultMap  id="BaseResultMap" type="Report" >
+		<result    column="report_id"    property="reportId" />
+		<result    column="report_coupon_number"    property="reportCouponNumber" />
+		<result    column="report_coupon_use_number"    property="reportCouponUseNumber" />
+		<result    column="report_registered_number"    property="reportRegisteredNumber" />
+		<result    column="report_create_time"    property="reportCreateTime" />
+		<result    column="report_update_time"    property="reportUpdateTime" />
+	</resultMap>
+	<sql  id="Base_List" >
+		t.report_id,
+		t.report_coupon_number,
+		t.report_coupon_use_number,
+		t.report_registered_number,
+		t.report_create_time,
+		t.report_update_time
+	</sql>
+	<select id="getReportList" resultMap="BaseResultMap" parameterType="Report" >
+		select
+		<include refid="Base_List" />
+		from tb_iamberry_report t
+		<where>
+			<if test="reportId != null ">
+				AND t.report_id = #{reportId}
+			</if >
+			<if test="reportCouponNumber != null ">
+				AND t.report_coupon_number = #{reportCouponNumber}
+			</if >
+			<if test="reportCouponUseNumber != null ">
+				AND t.report_coupon_use_number = #{reportCouponUseNumber}
+			</if >
+			<if test="reportRegisteredNumber != null ">
+				AND t.report_registered_number = #{reportRegisteredNumber}
+			</if >
+		</where>
+	</select>
+	<select id="getReportById" resultMap="BaseResultMap" parameterType="Integer" >
+		select
+		<include refid="Base_List" />
+		from tb_iamberry_report t
+		where t.report_id= #{reportId}
+	</select>
+	<insert id="save" parameterType="Report" >
+		insert into
+		tb_iamberry_report
+		(
+		report_id,
+		report_coupon_number,
+		report_coupon_use_number,
+		report_registered_number
+		)
+		values
+		(
+		#{reportId},
+		#{reportCouponNumber},
+		#{reportCouponUseNumber},
+		#{reportRegisteredNumber}
+		)
+	</insert>
+	<update id="update" parameterType="Report" >
+		update
+		tb_iamberry_report
+		<set >
+			<if test="reportId != null ">
+				report_id = #{reportId},
+			</if >
+			<if test="reportCouponNumber != null ">
+				report_coupon_number = #{reportCouponNumber},
+			</if >
+			<if test="reportCouponUseNumber != null ">
+				report_coupon_use_number = #{reportCouponUseNumber},
+			</if >
+			<if test="reportRegisteredNumber != null ">
+				report_registered_number = #{reportRegisteredNumber},
+			</if >
+		</set >
+		where report_id= #{reportId}
+	</update>
+	<delete id="delete" parameterType="Integer" >
+		delete FROM
+		tb_iamberry_report
+		where report_id=#{reportId}
+	</delete>
+</mapper>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/MemberServiceImpl.java

@@ -336,4 +336,9 @@ public class MemberServiceImpl implements MemberService {
 	public Integer updateUserStayIntegralByOpenId(Member member) {
 		return memberDao.updateUserStayIntegralByOpenId(member);
 	}
+
+	@Override
+	public Integer getRegisteredNumber() {
+		return memberDao.getRegisteredNumber();
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/MemberDao.java

@@ -135,4 +135,10 @@ public interface MemberDao {
 	 * @return
 	 */
 	public Integer updateUserStayIntegralByOpenId(Member member);
+
+	/**
+	 * 获取所有的注册人数
+	 * @return
+	 */
+	Integer getRegisteredNumber();
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/imp/MemberDaoImpl.java

@@ -151,4 +151,9 @@ public class MemberDaoImpl  implements MemberDao {
 	public Integer updateUserStayIntegralByOpenId(Member member) {
 		return memberMapper.updateUserStayIntegralByOpenId(member);
 	}
+
+	@Override
+	public Integer getRegisteredNumber() {
+		return memberMapper.getRegisteredNumber();
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/product/ProductColorServiceImpl.java

@@ -33,6 +33,11 @@ public class ProductColorServiceImpl implements ProductColorService {
 	}
 
 	@Override
+	public List<ProductColor> getChargReceiveColor(Integer colorProductId) {
+		return productColorMapper.getChargReceiveColor(colorProductId);
+	}
+
+	@Override
 	public List<ProductColor> selectProductColorList(ProductColor productColor) {
 	    if (productColor.getPage() != null) {
             productColor.getPage().initRecordBegin();

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/report/ReportServiceImpl.java

@@ -0,0 +1,78 @@
+package com.iamberry.wechat.service.report;
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.core.entity.receive.ChargerReceive;
+import com.iamberry.wechat.core.entity.report.Report;
+import com.iamberry.wechat.face.report.ReportService;
+import com.iamberry.wechat.service.mapper.ReportMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import util.PageUtil;
+
+import java.util.List;
+
+/**
+ *  优惠券领取使用，注册人数统计接口
+ * @author Administrator
+ * @Date 2018-04-20
+ */
+@Service
+public class ReportServiceImpl  implements ReportService {
+    @Autowired
+    private ReportMapper reportMapper;
+
+    @Override
+    public PagedResult<Report> listAdminReport(PageRequest<Report> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<Report> detedctList = reportMapper.getReportList(pageRequest.getData());
+        return PageUtil.getPage(detedctList);
+    }
+
+    /**
+     * 获取集合
+     * @param  report
+     * @return List
+     */
+    @Override
+    public List<Report> getReportList(Report  report){
+        return  reportMapper.getReportList(report);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  report
+     */
+    @Override
+    public  Report  getReportById(Integer  id){
+        return  reportMapper.getReportById(id);
+    }
+    /**
+     * 增加数据
+     * @param  report
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(Report  report){
+        return  reportMapper.save(report);
+    }
+    /**
+     * 修改数据
+     * @param  report
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(Report  report){
+        return  reportMapper.update(report);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  reportMapper.delete(id);
+    }
+}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminReportHandler.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.handles.admin;
+
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.core.entity.report.Report;
+import com.iamberry.wechat.face.report.ReportService;
+import com.iamberry.wechat.utils.StitchAttrUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 免费领取充电器
+ * Created by wxm on 2017/10/11.
+ */
+@Controller
+@RequestMapping("/admin/report")
+public class AdminReportHandler {
+
+	@Autowired
+	private ReportService reportService;
+
+	/**
+	 * 查询积分记录 并分页 (支持查询条件模糊搜索)
+	 * 2018年2月24日
+	 * @author mzx
+	 * @param pageNO	分页信息
+	 * @return
+	 */
+	@RequestMapping("/listReport")
+	public ModelAndView listIntegral(Report report,
+									 @RequestParam(value= "pageSize",defaultValue= "15" ,required=false) Integer pageSize,
+									 @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+									 @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum,
+									 HttpServletRequest request) throws Exception {
+		ModelAndView mv = new ModelAndView("admin/report/listReport");
+		// 封装请求数据
+		PageRequest<Report> pageRequest = new PageRequest<>(report, pageNO, pageSize, totalNum == 0);
+		// 查询订单列表
+		PagedResult<Report> result = reportService.listAdminReport(pageRequest);
+		if (totalNum != 0) {
+			result.setTotal(totalNum);
+		}
+		StitchAttrUtil.setModelAndView(report, mv, "/admin/report/listReport", result);
+		return mv;
+	}
+
+}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -8,11 +8,16 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
+import com.iamberry.wechat.core.entity.report.Report;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
+import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.integral.UseIntegralService;
+import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.order.AdminOrderService;
+import com.iamberry.wechat.face.report.ReportService;
 import com.iamberry.wechat.service.ImberryConfig;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
@@ -51,22 +56,16 @@ public class MQTask implements InitializingBean {
 
 	@Autowired
 	private MQServiceProxy mQSerivce;
-	
 	@Autowired
 	private RatFWLogger logger;
-	
 	@Autowired
 	private WechatTaskService wechatTaskService;
-	
 	@Autowired
 	private RebackServices rebackServices;
-	
 	@Autowired
 	private ProbationShopOrderService probationShopOrderService;
-	
 	@Autowired
 	private SendMessageUtil sendMessageUtil;
-	
 	@Autowired
 	private CodeService codeService;
 	@Autowired
@@ -77,6 +76,12 @@ public class MQTask implements InitializingBean {
 	private UseIntegralService useIntegralService;
 	@Autowired
 	private AdminOrderService adminOrderService;
+	@Autowired
+	private CouponItemService couponItemService;
+	@Autowired
+	private MemberService memberService;
+	@Autowired
+	private ReportService reportService;
 	
 	private Lock lock = new ReentrantLock();
 
@@ -451,4 +456,44 @@ public class MQTask implements InitializingBean {
 		}
 	}
 
+
+	/**
+	 * 每天0点统计上朵领取优惠券信息
+	 *
+	 * 领券人数：
+	 * 使用券人数：
+	 * 注册人数：
+	 */
+	@SuppressWarnings(value = {"unchecked", "rawtypes"})
+	//	@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
+	@Scheduled(cron = "0 0 0 * * ?")		//每天0点触发
+	public void report() {
+		logger.info("统计上朵领取优惠券信息");
+		Report report = new Report();
+		//获取需要查询的优惠券类型的id
+		String ids = systemService.selectOneShopRuleById(256).getRuleDesc();
+		String[] newIds = ids.split(",");
+		if(newIds == null){
+			return;
+		}
+		Integer[] couponIds = new Integer[newIds.length];
+		for (int i=0;i<newIds.length;i++) {
+			couponIds[i] = Integer.valueOf(newIds[i]);
+		}
+		CouponItem couponItem = new CouponItem();
+		couponItem.setCouponIds(couponIds);
+		Integer number = couponItemService.allCouponItemNumber(couponItem);
+		report.setReportCouponNumber(number);
+
+		couponItem.setCouponUseStatus(2);
+		number = couponItemService.allCouponItemNumber(couponItem);
+		report.setReportCouponUseNumber(number);
+
+		number = memberService.getRegisteredNumber();
+		report.setReportRegisteredNumber(number);
+
+		Integer flag = reportService.save(report);
+	}
+
+
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/receive/ChargReceiveHandler.java

@@ -301,7 +301,7 @@ public class ChargReceiveHandler {
 	public  ResultMsg selectColor(HttpServletRequest request,
 								  @RequestParam(value = "productId", defaultValue = "61") Integer productId) throws Exception {
 		ResultMsg remsg=new ResultMsg();
-		List<ProductColor> colorList = productColorService.getLeaseProductColor(productId);
+		List<ProductColor> colorList = productColorService.getChargReceiveColor(productId);
 		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 		remsg.setResultCode(ResultInfo.SUCCESSCODE);
 		remsg.setStatus(true);

tooth-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -134,6 +134,8 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WechatShare" alias="WechatShare"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.order.NumberBacklogDto" alias="NumberBacklogDto"/>
 
+		<typeAlias type="com.iamberry.wechat.core.entity.report.Report" alias="Report"/>
+
 
 		<typeAlias type="com.iamberry.wechat.core.entity.receive.ChargerReceive" alias="ChargerReceive"/>
 
@@ -312,6 +314,9 @@
 
 		<mapper resource="com/iamberry/wechat/service/mapper/chargerReceiveMapper.xml"/>
 
+		<!--统计-->
+		<mapper resource="com/iamberry/wechat/service/mapper/reportMapper.xml"/>
+
 		<!-- 试用订单流程mapper -->
 		<mapper resource="com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/adminProbationOrderMapper.xml"/>

tooth-wechat-web/src/main/resources/jdbc.properties

@@ -10,9 +10,9 @@ jdbc.password=Tooth123223
 #jdbc.password=root
 
 #���Կ�
-#jdbc.url=jdbc:mysql://watero2db.mysql.rds.aliyuncs.com/test_watero_pf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=test_watero
-#jdbc.password=waterO123
+#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=tooth
+#jdbc.password=Tooth123223
 
 #pool settings
 jdbc.pool.init=1

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/report/listReport.jsp

@@ -0,0 +1,100 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <LINK rel="Bookmark" href="/favicon.ico">
+    <LINK rel="Shortcut Icon" href="/favicon.ico" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+    <link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+
+    <!--[if IE 6]>
+    <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
+    <script>DD_belatedPNG.fix('*');</script>
+    <![endif]-->
+    <title>优惠券统计列表</title>
+</head>
+<body>
+<nav class="breadcrumb">
+    <i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span>
+    优惠券统计列表 <span class="c-gray en">&gt;</span> 优惠券统计列表 <a
+        class="btn btn-success radius r mr-20"
+        style="line-height: 1.6em; margin-top: 3px"
+        href="javascript:location.replace(location.href);" title="刷新"><i
+        class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="pd-20">
+    <form action="${pageContext.request.contextPath }/admin/report/listReport" method="post" style="text-align: center;margin-bottom: 10px;">
+
+      <%--  <input name="userNickname" id="userNickname" value="${userNickname }" placeholder="微信昵称" style="width: 150px" class="input-text" type="text">
+        <input name="receiveAddressTel" id="receiveAddressTel" value="${receiveAddressTel }" placeholder="手机号码" style="width: 150px" class="input-text" type="text">
+        <input name="receivePostNum" id="receivePostNum" value="${receivePostNum }" placeholder="物流编号" style="width: 150px" class="input-text" type="text">
+
+        <span class="select-box" style="width: 150px">
+            <select id="receiveStatus" name="receiveStatus" class="select">
+                <option value="" >订单状态</option>
+                <option value="1" ${receiveStatus==1?'selected':''}>待付款</option>
+                <option value="2" ${receiveStatus==2?'selected':''}>已付款(待发货)</option>
+                <option value="3" ${receiveStatus==3?'selected':''}>已发货</option>
+            </select>
+        </span>--%>
+
+      <%--  <button name="" id="submitBtn" class="btn btn-success" type="submit">
+            <i class="Hui-iconfont"></i> 搜索
+        </button>--%>
+    </form>
+    <form id="goodsform" >
+        <table class="table table-border table-bordered table-bg">
+            <thead>
+            <tr>
+                <th scope="col" colspan="13">充电器领取列表</th>
+            </tr>
+            <tr class="text-c">
+                <th width="150">优惠券领取人数</th>
+                <th width="100">优惠券使用人数</th>
+                <th width="80">注册用户数</th>
+                <th width="100">获取时间</th>
+            </tr>
+            </thead>
+            <tbody>
+            <c:if test="${! (empty page.dataList) }">
+                <c:forEach items="${page.dataList }" var="infolist">
+                <tr class="text-c">
+                    <td>${infolist.reportCouponNumber }</td>
+                    <td>${infolist.reportCouponUseNumber }</td>
+                    <td>${infolist.reportRegisteredNumber }</td>
+                    <td><fmt:formatDate value="${infolist.reportCreateTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+                 </c:forEach>
+             </c:if>
+                <c:if test="${empty page.dataList}">
+                    <tr align="center"><td colspan="13" style="text-align: center;">未查询到该类数据!</td></tr>
+                </c:if>
+            </tbody>
+        </table>
+        <div align="right" class="mt-10 mb-10 mr-10">
+            <%@include file="/common/other/paper/pager.jsp"%>
+        </div>
+    </form>
+</div>
+
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script>
+<script type="text/javascript">
+</script>
+</body>
+</html>