会员积分说明：

1：完善个人资料-注册，奖励100积分
2：会员中心，判断是否会员
3：0点5分生日赠送优惠券50元（满99元即可使用），9点推送模板消息提醒
4：结算10积分支付时抵现1元
5:a.消费10元获得1积分 b.(生日当天3倍积分)  c.活动期间双倍或者三倍
6:定时任务：待入转为入账积分
7：取消订单退回使用积分，定时取消也退回
8：积分记录列表

watero-common-core/pom.xml

@@ -31,6 +31,14 @@
 					<target>1.7</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12.4</version>
+				<configuration>
+					<skipTests>false</skipTests>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/agent/AgentMemberDto.java

@@ -1,6 +1,10 @@
 package com.iamberry.wechat.core.entity.agent;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 微代理会员中心 实体类
@@ -15,13 +19,25 @@ public class AgentMemberDto implements Serializable{
 	private String userOpenid;				//用户openid
 	private String userHead;				//用户头像
 	private String userNickname;			//用户昵称
-	
+
+	private String userName;				//姓名
+	private String userTel;					//用户电话
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+	private Date userBirthDate;				//生日
+	private Integer userSex;				//用户性别		default 1; 1:男   2:女   0:未知
+
 	private Integer userIncome;				//收入金额，单位为分
 	private int willIncome; 				//待返还金额，单位元
 	private Integer shareType;				//是否显示分享二维码	 	1:不显示	2：显示
 	private OrderStatusDto orderStatusDto;	//订单状态
 	private Integer userIsVip;	//是否为vip
 	private Integer user38Interests;		//是否有38女王节权益 ：1:有权益  2：无权益
+	private Integer userArrange;		//是否已完善信息   1：已完善  2：未完善
+	private Integer userSurplusIntegral;	//剩余积分
+
+	private Integer couponCount;	//券包
+	private Integer couponVipCount;	//会员专享
 
 	public Integer getUserId() {
 		return userId;
@@ -87,4 +103,68 @@ public class AgentMemberDto implements Serializable{
 	public void setUser38Interests(Integer user38Interests) {
 		this.user38Interests = user38Interests;
 	}
+
+	public Integer getUserArrange() {
+		return userArrange;
+	}
+
+	public void setUserArrange(Integer userArrange) {
+		this.userArrange = userArrange;
+	}
+
+	public Integer getUserSurplusIntegral() {
+		return userSurplusIntegral;
+	}
+
+	public void setUserSurplusIntegral(Integer userSurplusIntegral) {
+		this.userSurplusIntegral = userSurplusIntegral;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getUserTel() {
+		return userTel;
+	}
+
+	public void setUserTel(String userTel) {
+		this.userTel = userTel;
+	}
+
+	public Date getUserBirthDate() {
+		return userBirthDate;
+	}
+
+	public void setUserBirthDate(Date userBirthDate) {
+		this.userBirthDate = userBirthDate;
+	}
+
+	public Integer getUserSex() {
+		return userSex;
+	}
+
+	public void setUserSex(Integer userSex) {
+		this.userSex = userSex;
+	}
+
+	public Integer getCouponCount() {
+		return couponCount;
+	}
+
+	public void setCouponCount(Integer couponCount) {
+		this.couponCount = couponCount;
+	}
+
+	public Integer getCouponVipCount() {
+		return couponVipCount;
+	}
+
+	public void setCouponVipCount(Integer couponVipCount) {
+		this.couponVipCount = couponVipCount;
+	}
 }

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/OrderPayDto.java

@@ -26,7 +26,9 @@ public class OrderPayDto implements java.io.Serializable{
 	
 	private String errorInfo; // 错误信息
 	
-	private int meonyProportion; // 积分和人民币的比例 一个积分抵扣多少元人民币
+	private String meonyProportion; // 积分和人民币的比例 一个积分抵扣多少元人民币
+
+	private Integer userIntegral; // 积分
 	
 	private String cartId; // 购物车ID，点击去支付时，需要传回来
 	
@@ -58,11 +60,11 @@ public class OrderPayDto implements java.io.Serializable{
 		this.cartId = cartId;
 	}
 
-	public int getMeonyProportion() {
+	public String getMeonyProportion() {
 		return meonyProportion;
 	}
 
-	public void setMeonyProportion(int meonyProportion) {
+	public void setMeonyProportion(String meonyProportion) {
 		this.meonyProportion = meonyProportion;
 	}
 
@@ -137,4 +139,12 @@ public class OrderPayDto implements java.io.Serializable{
 	public void setUser38Interests(Integer user38Interests) {
 		this.user38Interests = user38Interests;
 	}
+
+	public Integer getUserIntegral() {
+		return userIntegral;
+	}
+
+	public void setUserIntegral(Integer userIntegral) {
+		this.userIntegral = userIntegral;
+	}
 }

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java

@@ -16,7 +16,7 @@ public class CouponItemDto implements java.io.Serializable{
 	private Integer couponId; 					//优惠券类型id
 	private String couponName;					//优惠券类型名称
 	private String useropenid;					//领取券的openid
-	private Integer couponUseStatus;			//使用状态
+	private Integer couponUseStatus;			//使用状态 1:未使用  2使用  7订单未结束
 	private Integer couponType;                 //优惠券类型
 	
 	private Integer couponReduce;				//减免额/减免率
@@ -38,6 +38,8 @@ public class CouponItemDto implements java.io.Serializable{
 
 	private Integer isCanUsed;	//前端判断是否能够使用  1：可用  2：不能用
 
+	private Integer couponVipExclusive;	//会员专享  1：普通用户  2：会员专享
+
 	private Exchange exchange;	//
 	
 	public String getCouponItemId() {
@@ -146,4 +148,14 @@ public class CouponItemDto implements java.io.Serializable{
 	public void setIsCanUsed(Integer isCanUsed) {
 		this.isCanUsed = isCanUsed;
 	}
+
+	public Integer getCouponVipExclusive() {
+		return couponVipExclusive;
+	}
+
+	public void setCouponVipExclusive(Integer couponVipExclusive) {
+		this.couponVipExclusive = couponVipExclusive;
+	}
+
+
 }

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/eo/Promotions.java

@@ -1,5 +1,7 @@
 package com.iamberry.wechat.core.entity.eo;
 
+import com.iamberry.wechat.core.entity.ism.IntegralConfig;
+
 import java.util.ArrayList;
 import  java.util.Date;
 import  java.io.Serializable;
@@ -20,6 +22,8 @@ public class Promotions  implements  Serializable{
     private Integer promotionsType;
     //状态 1.使用中 2.未使用
     private Integer promotionsStatus;
+    //排序
+    private Integer promotionsSort;
     //活动开始时间
     private Date promotionsBeginTime;
     //活动结束时间
@@ -32,6 +36,8 @@ public class Promotions  implements  Serializable{
     private List<SettlementGift> settlementGiftList = new ArrayList<>();
     //结算赠品
     private List<Spike> spikeList = new ArrayList<>();
+    //结算获取积分
+    private List<IntegralConfig> integralConfigList = new ArrayList<>();
 
     public Integer getPromotionsId(){
         return promotionsId;
@@ -112,4 +118,20 @@ public class Promotions  implements  Serializable{
     public void setSpikeList(List<Spike> spikeList) {
         this.spikeList = spikeList;
     }
+
+    public List<IntegralConfig> getIntegralConfigList() {
+        return integralConfigList;
+    }
+
+    public void setIntegralConfigList(List<IntegralConfig> integralConfigList) {
+        this.integralConfigList = integralConfigList;
+    }
+
+    public Integer getPromotionsSort() {
+        return promotionsSort;
+    }
+
+    public void setPromotionsSort(Integer promotionsSort) {
+        this.promotionsSort = promotionsSort;
+    }
 }

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/ism/IntegralConfig.java

@@ -0,0 +1,102 @@
+package com.iamberry.wechat.core.entity.ism;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *
+ * @author Administrator
+ * @Date 2019-11-07
+ */
+public class IntegralConfig  implements  Serializable{
+    private static final long serialVersionUID = -7970095774947972185L;
+    //积分配置id
+    private Integer inteConfId;
+    //活动id
+    private Integer promotionsId;
+    //积分配置名称
+    private String inteConfName;
+    //积分变动数量
+    private String inteConfCalculation;
+    //状态 1:使用中 2:未使用
+    private Integer inteConfStatus;
+    //排序
+    private Integer inteConfSort;
+    //
+    private String inteConfDesc;
+    //创建时间
+    private Date inteConfCreateTime;
+    //修改时间'
+    private Date inteConfUpdateTime;
+
+    public Integer getInteConfId(){
+        return inteConfId;
+    }
+
+    public void setInteConfId(Integer  inteConfId){
+        this.inteConfId=inteConfId;
+    }
+
+    public String getInteConfName(){
+        return inteConfName;
+    }
+
+    public void setInteConfName(String  inteConfName){
+        this.inteConfName=inteConfName;
+    }
+
+    public String getInteConfCalculation(){
+        return inteConfCalculation;
+    }
+
+    public void setInteConfCalculation(String  inteConfCalculation){
+        this.inteConfCalculation=inteConfCalculation;
+    }
+
+    public Integer getInteConfStatus(){
+        return inteConfStatus;
+    }
+
+    public void setInteConfStatus(Integer  inteConfStatus){
+        this.inteConfStatus=inteConfStatus;
+    }
+
+    public Date getInteConfCreateTime(){
+        return inteConfCreateTime;
+    }
+
+    public void setInteConfCreateTime(Date  inteConfCreateTime){
+        this.inteConfCreateTime=inteConfCreateTime;
+    }
+
+    public Date getInteConfUpdateTime(){
+        return inteConfUpdateTime;
+    }
+
+    public void setInteConfUpdateTime(Date  inteConfUpdateTime){
+        this.inteConfUpdateTime=inteConfUpdateTime;
+    }
+
+    public Integer getPromotionsId() {
+        return promotionsId;
+    }
+
+    public void setPromotionsId(Integer promotionsId) {
+        this.promotionsId = promotionsId;
+    }
+
+    public Integer getInteConfSort() {
+        return inteConfSort;
+    }
+
+    public void setInteConfSort(Integer inteConfSort) {
+        this.inteConfSort = inteConfSort;
+    }
+
+    public String getInteConfDesc() {
+        return inteConfDesc;
+    }
+
+    public void setInteConfDesc(String inteConfDesc) {
+        this.inteConfDesc = inteConfDesc;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/ism/IntegralLog.java

@@ -0,0 +1,172 @@
+package com.iamberry.wechat.core.entity.ism;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  积分记录表类
+ * @author Administrator
+ * @Date 2019-11-13
+ */
+public class IntegralLog  implements  Serializable{
+    private static final long serialVersionUID = 5363106723166262639L;
+    //积分记录id
+    private Integer inteLogId;
+    //用户openid
+    private String userOpenId;
+    //日志名称
+    private String inteLogName;
+    //积分配置id
+    private Integer inteConfId;
+    //积分类型 1:添加积分2:使用积分3:待入账积分
+    private Integer inteLogType;
+    //待入账积分转入时间 只有inte_log_type=3才有这个时间
+    private Date inteLogWaitingDate;
+    //待入账绑定订单
+    private String inteLogWaitingOrderId;
+    //使用积分，记录的订单号,只有inte_log_type=2才有这个时间
+    private String inteLogUseOrderId;
+    //待入账->入账会记录过去的待入账id
+    private Integer inteLogOldId;
+    //积分变动数量
+    private Integer inteLogChangeNum;
+    //积分变动前数量
+    private Integer inteLogBeforeNum;
+    //积分变动后数量
+    private Integer inteLogAfterNum;
+    //状态 1:使用中 2:删除
+    private Integer inteLogStatus;
+    //备注
+    private String inteLogDesc;
+    //创建时间'
+    private Date inteLogCreateTime;
+    //积分使用名称
+    private String inteConfName;
+
+    public Integer getInteLogId(){
+        return inteLogId;
+    }
+
+    public void setInteLogId(Integer  inteLogId){
+        this.inteLogId=inteLogId;
+    }
+
+    public String getUserOpenId(){
+        return userOpenId;
+    }
+
+    public void setUserOpenId(String  userOpenId){
+        this.userOpenId=userOpenId;
+    }
+
+    public Integer getInteConfId(){
+        return inteConfId;
+    }
+
+    public void setInteConfId(Integer  inteConfId){
+        this.inteConfId=inteConfId;
+    }
+
+    public Integer getInteLogType(){
+        return inteLogType;
+    }
+
+    public void setInteLogType(Integer  inteLogType){
+        this.inteLogType=inteLogType;
+    }
+
+    public Date getInteLogWaitingDate(){
+        return inteLogWaitingDate;
+    }
+
+    public void setInteLogWaitingDate(Date  inteLogWaitingDate){
+        this.inteLogWaitingDate=inteLogWaitingDate;
+    }
+
+    public String getInteLogWaitingOrderId(){
+        return inteLogWaitingOrderId;
+    }
+
+    public void setInteLogWaitingOrderId(String  inteLogWaitingOrderId){
+        this.inteLogWaitingOrderId=inteLogWaitingOrderId;
+    }
+
+    public Integer getInteLogChangeNum(){
+        return inteLogChangeNum;
+    }
+
+    public void setInteLogChangeNum(Integer  inteLogChangeNum){
+        this.inteLogChangeNum=inteLogChangeNum;
+    }
+
+    public Integer getInteLogBeforeNum(){
+        return inteLogBeforeNum;
+    }
+
+    public void setInteLogBeforeNum(Integer  inteLogBeforeNum){
+        this.inteLogBeforeNum=inteLogBeforeNum;
+    }
+
+    public Integer getInteLogAfterNum(){
+        return inteLogAfterNum;
+    }
+
+    public void setInteLogAfterNum(Integer  inteLogAfterNum){
+        this.inteLogAfterNum=inteLogAfterNum;
+    }
+
+    public Integer getInteLogStatus(){
+        return inteLogStatus;
+    }
+
+    public void setInteLogStatus(Integer  inteLogStatus){
+        this.inteLogStatus=inteLogStatus;
+    }
+
+    public String getInteLogDesc(){
+        return inteLogDesc;
+    }
+
+    public void setInteLogDesc(String  inteLogDesc){
+        this.inteLogDesc=inteLogDesc;
+    }
+
+    public Date getInteLogCreateTime(){
+        return inteLogCreateTime;
+    }
+
+    public void setInteLogCreateTime(Date  inteLogCreateTime){
+        this.inteLogCreateTime=inteLogCreateTime;
+    }
+
+    public String getInteLogUseOrderId() {
+        return inteLogUseOrderId;
+    }
+
+    public void setInteLogUseOrderId(String inteLogUseOrderId) {
+        this.inteLogUseOrderId = inteLogUseOrderId;
+    }
+
+    public Integer getInteLogOldId() {
+        return inteLogOldId;
+    }
+
+    public void setInteLogOldId(Integer inteLogOldId) {
+        this.inteLogOldId = inteLogOldId;
+    }
+
+    public String getInteLogName() {
+        return inteLogName;
+    }
+
+    public void setInteLogName(String inteLogName) {
+        this.inteLogName = inteLogName;
+    }
+
+    public String getInteConfName() {
+        return inteConfName;
+    }
+
+    public void setInteConfName(String inteConfName) {
+        this.inteConfName = inteConfName;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/Member.java

@@ -3,7 +3,9 @@ package com.iamberry.wechat.core.entity.member;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.iamberry.wechat.core.entity.Page;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * description: 会员信息实休类
@@ -26,6 +28,8 @@ public class Member implements Serializable{
 	
 	private Integer userSex;				//用户性别		default 1; 1:男   2:女   0:未知
 	private String userAccountNum;			//用户账号
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date userBirthDate;				//生日
 	private Date userCreateDate;			//创建时间
 	
@@ -39,20 +43,23 @@ public class Member implements Serializable{
 	private Integer userResType;			//来源       		1:默认  	 2:会员	3:商户
 	private Integer userStatus;				//用户状态		1:未关注，默认  2:已关注     0:已取消关注
 	private Date userSubDate;				//关注/取消时间	（每次扫二维码都会更新）
-	private Integer userSurplusIntegral;	//剩余积分
-	
-	private Integer userUseIntegral;		//已用积分
+
 	private Integer userIncome;				//收入金额，单位为分
 	private Integer templateId;				//返利模板id
 	private Integer userDealers;			//代理商层级id
 	private Integer userIsBought;			//用户是否已经购买过		1：未购买(默认)	2：已购买
 	private Page page;						//分页
 
-	private Integer userIntegral;			//jifen
+	private Integer userIntegral;			//用户积分
+	private Integer userSurplusIntegral;	//剩余积分
+	private Integer userUseIntegral;		//已用积分
+	private Integer userPendIntegral;		//待入积分
+
 	private Integer userCoupon;			//
 	private Integer userTemplateId;			//
 
 	private Integer userIsVip;		//是否为vip ：1:非vip  2：vip
+	private Integer userArrange;		//是否已完善信息   1：已完善  2：未完善
 
 	public Page getPage() {
 		return page;
@@ -260,6 +267,22 @@ public class Member implements Serializable{
 		this.userIsVip = userIsVip;
 	}
 
+	public Integer getUserArrange() {
+		return userArrange;
+	}
+
+	public void setUserArrange(Integer userArrange) {
+		this.userArrange = userArrange;
+	}
+
+	public Integer getUserPendIntegral() {
+		return userPendIntegral;
+	}
+
+	public void setUserPendIntegral(Integer userPendIntegral) {
+		this.userPendIntegral = userPendIntegral;
+	}
+
 	@Override
 	public String toString() {
 		return "Member [userId=" + userId + ", userOpenid=" + userOpenid

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/order/Order.java

@@ -30,8 +30,11 @@ public class Order implements java.io.Serializable{
 	private Integer salesRewardIntegralNum;		//奖励积分
 	private String salesPostNum;						//快递单号
 	private String salesPostFirm;						//快递公司
-	
-	private Integer salesStatus;							//状态  0：取消订单  1：待支付  2：已支付、待发货  3：退款申请中  4：已退款  5：已发货  6：申请退货中  7：退货中  8：订单退货，订单关闭  9：换货中  10：换货完成
+
+	//状态  0：取消订单  1：待支付  2：已支付、待发货  3：退款申请中  4：已退款  5：已发货
+	// 6：申请退货中  7：退货中  8：订单退货，订单关闭  9：换货中  10：换货完成 11：申请换货中 12：订单完成
+	// 15：正在拼单 （拼单订单支付成功后改为此状态）
+	private Integer salesStatus;
 	private Date salesSendDate;						//发货时间
 	private Date salesReturnDate;						//申请退货时间
 	private String salesAddressInfo;					//详细地址

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/page/PageRequest.java

@@ -0,0 +1,63 @@
+package com.iamberry.wechat.core.entity.page;
+
+import java.io.Serializable;
+
+/**
+ * 请求的分页数据
+ * @author 献
+ * @company 深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @tel 18271840547
+ * @date 2017/5/18
+ */
+public class PageRequest<T> implements Serializable {
+
+    private static final long serialVersionUID = -6003006551112186750L;
+
+    private T data;                   // 实例数据
+
+    private Integer pageNO;           // 请求的页数
+
+    private Integer pageSize;         // 每页的数据大小
+
+    private boolean isPageTotal;      // 是否需要总的页数
+
+    public PageRequest(T data, Integer pageNO, Integer pageSize, boolean isPageTotal) {
+        this.data = data;
+        this.pageNO = pageNO;
+        this.pageSize = pageSize;
+        this.isPageTotal = isPageTotal;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public void setPageNO(Integer pageNO) {
+        this.pageNO = pageNO;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public void setPageTotal(boolean pageTotal) {
+        isPageTotal = pageTotal;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public Integer getPageNO() {
+        return pageNO;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public boolean isPageTotal() {
+        return isPageTotal;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/page/PagedResult.java

@@ -0,0 +1,69 @@
+package com.iamberry.wechat.core.entity.page;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分页返回的数据
+ * @author 献
+ * @company 深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @tel 18271840547
+ * @date 2017/5/12
+ */
+public class PagedResult<T> implements Serializable {
+
+
+	private static final long serialVersionUID = 8272802698002051352L;
+
+	private List<T> dataList;		// 数据
+	
+	private long pageNO;			// 当前页
+	
+	private long pageSize;			// 每页数据
+	
+	private long total;				// 总条数
+	
+	private long pages;				// 总页面数目
+
+	public List<T> getDataList() {
+		return dataList;
+	}
+
+	public void setDataList(List<T> dataList) {
+		this.dataList = dataList;
+	}
+
+	public long getPageNO() {
+		return pageNO;
+	}
+
+	public void setPageNO(long pageNO) {
+		this.pageNO = pageNO;
+	}
+
+	public long getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(long pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public long getTotal() {
+		return total;
+	}
+
+	public void setTotal(long total) {
+		this.total = total;
+	}
+
+	public long getPages() {
+		return pages;
+	}
+
+	public void setPages(long pages) {
+		this.pages = pages;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/sendMsg/SendMessageUtil.java

@@ -68,6 +68,9 @@ public class SendMessageUtil {
 			case 12:  //12、拼单活动
 				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.probation_spell_success, date, url);
 				break;
+			case 13:  //13、会员激活-生日提醒
+				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.member_activation, date, url);
+				break;
 			default: 
 				break;
 			}
@@ -77,12 +80,14 @@ public class SendMessageUtil {
 		
 		public static void main(String[] args) {
 //			String date = "{'first':{'color':'#173177', 'value':'尊敬的客户您好~您的订单已发货~'}, 'order_id':{'color':'#173177','value':'1009145345B11792L'}, 'package_id':{'color':'#173177','value':'yuantong:34234234'}, 'remark':{'color':'#173177', 'value':'点击进入商城查看-->>'}}";
-			String date = "{'first':{'color':'#173177','value':'亲爱的用户，'}, 'Good':{'color':'#173177','value':'母亲节'}, 'contentType':{'color':'#173177', 'value':'优惠券'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+//			String date = "{'first':{'color':'#173177','value':'亲爱的用户，'}, 'Good':{'color':'#173177','value':'母亲节'}, 'contentType':{'color':'#173177', 'value':'优惠券'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
 			String openId = "o3G6nww8FoM08HSbwpJqrhGu8V6Q";
 			String appId = "wx27c9f825761a861b";// 应用ID
 			String appSecret = "97b2f2991e4ff0f2567fbc625f858377";// 应用密钥
 			
-			WeixinUtil.sendTemplateMessage(appId, appSecret, openId, "5hWq6wd6W9HbMZ0ICSRTDyCKh_r_MjpQtWzkQRSKLio", date, "xx");
+//			WeixinUtil.sendTemplateMessage(appId, appSecret, openId, "5hWq6wd6W9HbMZ0ICSRTDyCKh_r_MjpQtWzkQRSKLio", date, "xx");
+
+//			WeixinUtil.sendTemplateMessage(appId, appSecret, openId, "MuLXODrGIrHripVp1Ku4vkAS-QO-8aRUkEgR41Zqrlk", date, "xx");
 			System.out.println("发送成功");
 		}
 		
@@ -244,4 +249,23 @@ public class SendMessageUtil {
 				 .replaceFirst("remarkValue",remark);
 			sendTemplateMessageToOpenid(temp, openId, url,12);
 	 }
+
+
+	/**
+	 * 会员激活-生日提醒
+	 * @param first
+	 * @param keyword1
+	 * @param keyword2
+	 * @param remark
+	 * @param openId
+	 * @param url
+	 */
+	public void memberActivation(String first,String keyword1,String keyword2,String remark,String openId,String url){
+		String temp = ResultInfo.MEMBERACTIVATION;
+		temp = temp.replaceFirst("firstValueIamberry", first)
+				.replaceFirst("keyword1Value",keyword1)
+				.replaceFirst("keyword2Value",keyword2)
+				.replaceFirst("remarkValue",remark);
+		sendTemplateMessageToOpenid(temp, openId, url,13);
+	}
 }

watero-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -170,6 +170,10 @@ public class ResultInfo {
 	 */
 	public static String INDEX_URL = "https://s.iamberry.com/watero/wechat/20190618.html";
 	/**
+	 * 优惠券页面
+	 */
+	public static String COUPON_URL = "https://s.iamberry.com/watero/wechat/coupon_bag1.html?type=1";
+	/**
 	 * 团购活动首页
 	 */
 	public static String INDEX_BULK_URL = "https://s.iamberry.com/watero/wechat/20190807.html";
@@ -208,7 +212,15 @@ public class ResultInfo {
 	/**
 	 * 订单支付成功
 	 */
-	public static String probation_pay_success="";	//订单支付成功	 	模版id	TM00184
+	public static String probation_pay_success="";	//订单支付成功	 	模版id	TM00184.
+	/**
+	 * 会员激活
+	 */
+	public static String member_activation="";	//会员激活-生日提醒
+	/**
+	 * 会员激活
+	 */
+	public static String member_activation_desc="";	//会员激活-生日提醒
 	/**
 	 * 订单关闭通知	 	模版id	TM00984
 	 */
@@ -275,6 +287,9 @@ public class ResultInfo {
 	/** 	拼单成功推送 	*/
 	public static String PROBATIONSPELLSUCCESS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
 
+	/** 	拼单成功推送 	*/
+	public static String MEMBERACTIVATION = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
+
 
 
 
@@ -352,6 +367,8 @@ public class ResultInfo {
 
 	public static String COUPONITEMSTATUS_NORMAL = "normal";
 	public static String COUPONITEMSTATUS_PASSED = "passed";
+
+	public static String ORDER_NO_INTEGRAL="积分不足";
 	
 	//分享语
 	public static String shareOne="这个产品，作为新手爸爸，还是很喜欢的，真心觉得很方便，就这几天的使用给点建议，如果APP数据报表再直观点，这个产品就完美了，希望官方能改进，这么牛的产品还是值得推荐和分享的。";

watero-common-tool/src/main/java/com/iamberry/wechat/tools/loadResultUtil.java

@@ -88,7 +88,8 @@ public class loadResultUtil {
 			ResultInfo.chineseLottery = prop.getProperty("chineseLottery");			//七夕回复url
 			ResultInfo.chineseLotteryFailure = prop.getProperty("chineseLotteryFailure");			//七夕回复失败
 
-
+			ResultInfo.member_activation = prop.getProperty("member_activation");		//会员激活-生日提醒
+			ResultInfo.member_activation_desc = prop.getProperty("member_activation_desc");		//会员激活-生日提醒
 
 		} catch (IOException e) {
 			new RuntimeException(e.getMessage());

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/ism/IntegralConfigService.java

@@ -0,0 +1,31 @@
+package com.iamberry.wechat.face.ism;
+
+import com.iamberry.wechat.core.entity.ism.IntegralConfig;
+
+import java.util.List;
+
+/**
+ *  积分配置表接口
+ * @author Administrator
+ * @Date 2019-11-10
+ */
+public interface IntegralConfigService {
+    /**
+     * 获取集合
+     * @param  integralConfig
+     * @return List
+     */
+    List<IntegralConfig> getIntegralConfigList(IntegralConfig  integralConfig);
+    /**
+     * 获取集合
+     * @param  str
+     * @return List
+     */
+    List<IntegralConfig> getSpikeListAllByPromo(int[] str);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  integralConfig
+     */
+    IntegralConfig  getIntegralConfigById(Integer  id);
+}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/ism/IntegralLogService.java

@@ -0,0 +1,102 @@
+package com.iamberry.wechat.face.ism;
+
+import com.iamberry.wechat.core.entity.ism.IntegralLog;
+import com.iamberry.wechat.core.entity.order.Order;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+
+import java.util.List;
+
+/**
+ *  积分记录表接口
+ * @author Administrator
+ * @Date 2019-11-10
+ */
+public interface IntegralLogService {
+    /**
+     * 获取集合
+     * @param  integralLog
+     * @return List
+     */
+    List<IntegralLog> getIntegralLogList(IntegralLog  integralLog);
+    /**
+     * 获取集合 - 前端页面，获取增加积分和消费积分记录
+     * @param  integralLog
+     * @return List
+     */
+    List<IntegralLog> getIntegralLogListByAccoUser(IntegralLog  integralLog);
+
+    /*分页 -- 前台专用*/
+    PagedResult<IntegralLog> listIntegralLog(PageRequest<IntegralLog> pageRequest);
+
+    /**
+     * 获取集合-定时器，获取所有待入账记录
+     * @param
+     * @return List
+     */
+    List<IntegralLog> getIntegralLogListByWaitUser();
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  integralLog
+     */
+    IntegralLog  getIntegralLogById(Integer  id);
+    /**
+     * 增加数据
+     * @param  integralLog
+     * @return Integer
+     */
+    Integer  save(IntegralLog  integralLog);
+    /**
+     * 修改数据
+     * @param  integralLog
+     * @return Integer
+     */
+    Integer  update(IntegralLog  integralLog);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+
+    /**
+     * 订单结算获得积分
+     * @return Integer
+     */
+    Integer addOrderChangIntegra(String orderId,Integer integraConfigId);
+
+    /**
+     * 订单结算使用积分
+     * @return Integer
+     */
+    Integer muOrderChangIntegra(Order order);
+
+    /**
+     * 直接加减积分
+     * @param  openId
+     * @return Integer
+     */
+    Integer  updateIntegral(String openId,Integer inteConfId,Integer inteLogType);
+
+    /**
+     * 取消订单待入账积分
+     * @param  orderId
+     * @return Integer
+     */
+    Integer cancelSurplusIntegral(String orderId);
+
+    /**
+     * 积分操作
+     * @param  openId
+     * @return Integer
+     */
+    Integer  changeIntegral(String openId, Integer inteConfId,Integer integralNum, Integer inteLogType,String waitingOrderId,String useOrderId,String remake);
+
+    /**
+     * 定时器-处理待入账-》已入账
+     * @param  integralLog
+     * @return Integer
+     */
+    Integer  waitUser(IntegralLog  integralLog);
+}

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

@@ -49,6 +49,19 @@ public interface MemberService{
 	 * @return
 	 */
 	public Integer updateMemberByUserId(Member member);
+
+	/**
+	 * 成为会员
+	 * @return
+	 */
+	public Integer becomeVipByOpenId(Member member);
+
+	/**
+	 * 修改
+	 * @param member
+	 * @return
+	 */
+	Integer nowUpdateUserByOpenId(Member member);
 	
 	/**
 	 * 修改用户已用积分
@@ -141,4 +154,10 @@ public interface MemberService{
 	 * @return
 	 */
 	public FullReduction getFullReduction(String openId);
+
+	/**
+	 * 获取今天生日的用户
+	 * @return
+	 */
+	List<Member> getNowBirthDate();
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/PageUtil.java

@@ -0,0 +1,60 @@
+package com.iamberry.wechat.service;
+
+import com.github.pagehelper.Page;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+
+import java.util.List;
+
+/**
+ * 分页工具类
+ * @author 献
+ * @company 深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @tel 18271840547
+ * @date 2017/5/18
+ */
+public class PageUtil {
+
+    /**
+     * 根据 List 获取分页数据
+     * @param datas
+     * @param <T>
+     * @return
+     */
+    public static <T> PagedResult<T> getPage(List<T> datas) {
+        PagedResult<T> result = new PagedResult<T>();
+        if (datas instanceof Page) {
+            Page page = (Page) datas;
+            result.setPageNO(page.getPageNum());
+            result.setPageSize(page.getPageSize());
+            result.setDataList(page.getResult());
+            result.setTotal(page.getTotal());
+            result.setPages(page.getPages());
+        }
+        else {
+            result.setPageNO(1);
+            result.setPageSize(datas.size());
+            result.setDataList(datas);
+            result.setTotal(datas.size());
+        }
+        return result;
+    }
+
+    /**
+     * 根据Page 对象分页
+     * @param page
+     * @param <T>
+     * @return
+     */
+    public static <T> PagedResult<T> getPage(Page page) {
+        PagedResult<T> result = new PagedResult<T>();
+        result.setPageNO(page.getPageNum());
+        result.setPageSize(page.getPageSize());
+        result.setDataList(page.getResult());
+        result.setTotal(page.getTotal());
+        result.setPages(page.getPages());
+
+        return result;
+    }
+
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -6,6 +6,7 @@ import com.iamberry.wechat.core.entity.eo.GiftPool;
 import com.iamberry.wechat.core.entity.eo.ItemGift;
 import com.iamberry.wechat.face.eo.GiftPoolService;
 import com.iamberry.wechat.face.eo.ItemGiftService;
+import com.iamberry.wechat.face.ism.IntegralLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,6 +53,8 @@ public class CartServiceImpl implements CartService {
 	ItemGiftService itemGiftService;
 	@Autowired
 	GiftPoolService giftPoolService;
+	@Autowired
+	private IntegralLogService integralLogService;
 
 
 	@Override
@@ -139,6 +142,7 @@ public class CartServiceImpl implements CartService {
 		if (count < 1) {
 			throw new RuntimeException("添加订单失败");
 		}
+
 		for (OrderItem oi: items) {
 			count = cartDao.save(oi);
 			if (count < 1) {
@@ -164,6 +168,12 @@ public class CartServiceImpl implements CartService {
 				}
 			}
 		}
+
+		//订单结算使用积分
+		if(order.getSalesIntegralNum() > 0){
+			integralLogService.muOrderChangIntegra(order);
+		}
+
 		// 删除购物车项目
 		cartDao.deleteBatchCartListById(cartIds);
 		return true;
@@ -230,12 +240,8 @@ public class CartServiceImpl implements CartService {
 	public Boolean supdateStateByOrderId(MQMessage QMessage){
 		Order order=new Order();
 		order.setSalesOrderid(QMessage.getServiceToMessage());
-//System.out.println("order is for search============");
 		order=cartDao.selectOrderInfoById(order);
-		/*order.setSalesTransactionId(QMessage.getServiceOtherMessage());
-		updateOrderByOrderId(order);*/
 		int i=0;
-		
 		/*//修改优惠券状态
 		String couponId=order.getCouponId();
 		if(couponId!=null && !couponId.endsWith("")){
@@ -264,10 +270,11 @@ public class CartServiceImpl implements CartService {
 			log.setCashLogsCreateDate(nowDate);
 			i=cashLogService.addCashLog(log);
 		}*/
+		//批量修改产品销售量
 		productInfoService.updateProductNumList(QMessage.getServiceToMessage());
 		//添加到返利表
-		i=rebackServices.loadSingleOrderReward(order);
-		return i>0;
+		//i=rebackServices.loadSingleOrderReward(order);
+		return true;
 	}
 
 	@Override

watero-wechat-service/src/main/java/com/iamberry/wechat/service/eo/PromotionsServiceImpl.java

@@ -2,9 +2,11 @@ package com.iamberry.wechat.service.eo;
 import com.iamberry.wechat.core.entity.eo.Promotions;
 import com.iamberry.wechat.core.entity.eo.SettlementGift;
 import com.iamberry.wechat.core.entity.eo.Spike;
+import com.iamberry.wechat.core.entity.ism.IntegralConfig;
 import com.iamberry.wechat.face.eo.PromotionsService;
 import com.iamberry.wechat.face.eo.SettlementGiftService;
 import com.iamberry.wechat.face.eo.SpikeService;
+import com.iamberry.wechat.face.ism.IntegralConfigService;
 import com.iamberry.wechat.service.mapper.PromotionsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +27,8 @@ public class PromotionsServiceImpl  implements PromotionsService {
     private SettlementGiftService settlementGiftService;
     @Autowired
     private SpikeService spikeService;
+    @Autowired
+    private IntegralConfigService integralConfigService;
     /**
      * 获取集合
      * @param  promotions
@@ -55,6 +59,10 @@ public class PromotionsServiceImpl  implements PromotionsService {
         List<Spike> spikeList = spikeService.getSpikeListAll(str);
         promotions.setSpikeList(spikeList);
 
+        //获取当前活动所有秒杀
+        List<IntegralConfig> integralConfigList = integralConfigService.getSpikeListAllByPromo(str);
+        promotions.setIntegralConfigList(integralConfigList);
+
         //获取当前活动所有满减
         return promotions;
     }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/ism/IntegralConfigServiceImpl.java

@@ -0,0 +1,44 @@
+package com.iamberry.wechat.service.ism;
+
+import com.iamberry.wechat.core.entity.ism.IntegralConfig;
+import com.iamberry.wechat.face.ism.IntegralConfigService;
+import com.iamberry.wechat.service.mapper.IntegralConfigMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  积分配置表接口
+ * @author Administrator
+ * @Date 2019-11-10
+ */
+@Service
+public class IntegralConfigServiceImpl  implements IntegralConfigService {
+    @Autowired
+    private IntegralConfigMapper integralConfigMapper;
+    /**
+     * 获取集合
+     * @param  integralConfig
+     * @return List
+     */
+    @Override
+    public List<IntegralConfig> getIntegralConfigList(IntegralConfig  integralConfig){
+        return  integralConfigMapper.getIntegralConfigList(integralConfig);
+    }
+
+    @Override
+    public List<IntegralConfig> getSpikeListAllByPromo(int[] str) {
+        return  integralConfigMapper.getSpikeListAllByPromo(str);
+    }
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  integralConfig
+     */
+    @Override
+    public  IntegralConfig  getIntegralConfigById(Integer  id){
+        return  integralConfigMapper.getIntegralConfigById(id);
+    }
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/ism/IntegralLogServiceImpl.java

@@ -0,0 +1,407 @@
+package com.iamberry.wechat.service.ism;
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.ism.IntegralConfig;
+import com.iamberry.wechat.core.entity.ism.IntegralLog;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.Order;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.face.cart.CartService;
+import com.iamberry.wechat.face.ism.IntegralLogService;
+import com.iamberry.wechat.face.order.AdminOrderService;
+import com.iamberry.wechat.service.PageUtil;
+import com.iamberry.wechat.service.mapper.IntegralConfigMapper;
+import com.iamberry.wechat.service.mapper.IntegralLogMapper;
+import com.iamberry.wechat.service.mapper.MemberMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  积分记录表接口
+ * @author Administrator
+ * @Date 2019-11-10
+ */
+@Service
+public class IntegralLogServiceImpl  implements IntegralLogService {
+    Logger logger = LoggerFactory.getLogger(IntegralLogServiceImpl.class);
+    @Autowired
+    private IntegralLogMapper integralLogMapper;
+    @Autowired
+    private IntegralConfigMapper integralConfigMapper;
+    @Autowired
+    private MemberMapper memberMapper;
+    @Autowired
+    private IntegralLogService integralLogService;
+    @Autowired
+    private AdminOrderService adminOrderService;
+    @Autowired
+    private CartService cartService;
+    /**
+     * 获取集合
+     * @param  integralLog
+     * @return List
+     */
+    @Override
+    public List<IntegralLog> getIntegralLogList(IntegralLog  integralLog){
+        return  integralLogMapper.getIntegralLogList(integralLog);
+    }
+
+    @Override
+    public List<IntegralLog> getIntegralLogListByAccoUser(IntegralLog integralLog) {
+        return  integralLogMapper.getIntegralLogListByAccoUser(integralLog);
+    }
+
+    @Override
+    public PagedResult<IntegralLog> listIntegralLog(PageRequest<IntegralLog> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<IntegralLog> detedctList = integralLogMapper.getIntegralLogListByAccoUser(pageRequest.getData());
+        return PageUtil.getPage(detedctList);
+    }
+
+    @Override
+    public List<IntegralLog> getIntegralLogListByWaitUser() {
+        return  integralLogMapper.getIntegralLogListByWaitUser();
+    }
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  integralLog
+     */
+    @Override
+    public  IntegralLog  getIntegralLogById(Integer  id){
+        return  integralLogMapper.getIntegralLogById(id);
+    }
+    /**
+     * 增加数据
+     * @param  integralLog
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(IntegralLog  integralLog){
+        return  integralLogMapper.save(integralLog);
+    }
+    /**
+     * 修改数据
+     * @param  integralLog
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(IntegralLog  integralLog){
+        return  integralLogMapper.update(integralLog);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  integralLogMapper.delete(id);
+    }
+
+    /**
+     * 订单结算只能获得待入账积分
+     * @param orderId
+     * @return
+     */
+    @Override
+    @Transactional
+    public Integer addOrderChangIntegra(String orderId,Integer integraConfigId) {
+        Integer flag = 0;
+        Order order = new Order();
+        order.setSalesOrderid(orderId);
+        order = cartService.selectOrderInfoById(order);
+
+        Format f = new SimpleDateFormat("MM-dd");
+        Member member = memberMapper.getMemberByUserOpenId(order.getSalesOpenid());
+        String date1 = f.format(member.getUserBirthDate());
+        String date2 = f.format(new Date());
+
+        IntegralConfig integralConfig = null;
+        if(date1.equals(date2)){
+            //生日当天订单结算获取积分X*0.3
+            integralConfig = integralConfigMapper.getIntegralConfigById(3);
+        }else{
+            //订单结算获取积分 按照传入的值计算
+            integralConfig = integralConfigMapper.getIntegralConfigById(integraConfigId);
+        }
+        if(integralConfig == null || integralConfig.getInteConfCalculation()==null || "".equals(integralConfig.getInteConfCalculation())){
+            return flag;
+        }
+        Double num = Double.valueOf(integralConfig.getInteConfCalculation());
+        num = num*(order.getSalesYetAmount()/100);
+        return integralLogService.changeIntegral(order.getSalesOpenid(),integralConfig.getInteConfId(),num.intValue(),
+                3,orderId,"",integralConfig.getInteConfDesc());
+    }
+
+    /**
+     * 订单结算使用积分
+     * @param order
+     * @return
+     */
+    @Override
+    public Integer muOrderChangIntegra(Order order) {
+        IntegralConfig integralConfig = integralConfigMapper.getIntegralConfigById(4);
+        Integer num = order.getSalesIntegralNum();   //setSalesIntegralNum
+        return integralLogService.changeIntegral(order.getSalesOpenid(),integralConfig.getInteConfId(),num.intValue(),2,
+                "",order.getSalesOrderid(),integralConfig.getInteConfDesc());
+    }
+
+    /**
+     * 添加&&使用积分 - 简洁版
+     * @param  openId
+     * @param inteConfId 积分配置id
+     * @param inteLogType  积分类型 1:添加积分2:使用积分3:待入账积分
+     * @return
+     */
+    @Override
+    @Transactional
+    public Integer updateIntegral(String openId,Integer inteConfId,Integer inteLogType){
+        Integer flag = 0;
+        IntegralConfig integralConfig = integralConfigMapper.getIntegralConfigById(inteConfId);
+        if(integralConfig == null || integralConfig.getInteConfCalculation()==null || "".equals(integralConfig.getInteConfCalculation())){
+            return flag;
+        }
+        Integer num = Integer.valueOf(integralConfig.getInteConfCalculation());
+        return integralLogService.changeIntegral(openId,inteConfId,num,inteLogType,"","",integralConfig.getInteConfDesc());
+    }
+
+    /**
+     * 取消订单-减去积分
+     * @param  orderId
+     * @return
+     */
+    @Override
+    @Transactional
+    public Integer cancelSurplusIntegral(String orderId){
+        Integer flag = 0;
+
+        Order order = new Order();
+        order.setSalesOrderid(orderId);
+        order = cartService.selectOrderInfoById(order);
+
+        if(order.getSalesStatus() != 0 ){   //取消订单
+            throw  new RuntimeException("该订单未取消");
+        }
+
+        //退回使用积分
+        IntegralLog usedintegralLog = new IntegralLog();
+        usedintegralLog.setInteLogUseOrderId(orderId);
+        List<IntegralLog> usedintegralLogList = integralLogService.getIntegralLogList(usedintegralLog);
+        if(usedintegralLogList!=null && usedintegralLogList.size() > 0){
+            usedintegralLog = usedintegralLogList.get(0);
+            IntegralLog newusedintegralLog = new IntegralLog();
+            newusedintegralLog.setInteLogId(usedintegralLog.getInteLogId());
+            newusedintegralLog.setInteLogStatus(2);
+            newusedintegralLog.setInteLogDesc(usedintegralLog.getInteLogDesc()+"===订单取消");
+            flag = integralLogService.update(newusedintegralLog);
+            if(flag < 1){
+                throw  new RuntimeException("取消订单退回积分-使用积分取消");
+            }
+
+            Member member = memberMapper.getMemberByUserOpenId(usedintegralLog.getUserOpenId());
+            Member newMember = new Member();
+            newMember.setUserOpenid(member.getUserOpenid());
+            newMember.setUserSurplusIntegral(member.getUserSurplusIntegral() + usedintegralLog.getInteLogChangeNum());
+            newMember.setUserUseIntegral(member.getUserUseIntegral() - usedintegralLog.getInteLogChangeNum());
+            flag = memberMapper.nowUpdateUserByOpenId(newMember);
+            if(flag < 1){
+                throw  new RuntimeException("取消订单待入账更改失败-变更用户积分失败");
+            }
+            return flag;
+        }
+        return 1;
+    }
+
+    /**
+     * 积分操作 - 核心入口
+     * @param  openId 必填 *
+     * @param inteConfId 必填 * 积分配置id
+     * @param inteLogType  必填 * 积分类型 1:添加积分2:使用积分3:待入账积分
+     * @param waitingOrderId 订单支付获得积分，待入账需要订单编号
+     * @param useOrderId 订单支付使用积分/积分商城下单使用积分都需要订单编号
+     * @param remake 备注
+     * @return
+     */
+    @Override
+    @Transactional
+    public Integer changeIntegral(String openId, Integer inteConfId,Integer integralNum, Integer inteLogType,
+                                  String waitingOrderId,String useOrderId,String remake) {
+        Integer flag = 0;
+
+        IntegralConfig integralConfig = integralConfigMapper.getIntegralConfigById(inteConfId);
+
+        if(integralNum <= 0){
+            throw  new RuntimeException("需要添加/减少的积分为0");
+        }
+        Member member = memberMapper.getMemberByUserOpenId(openId);
+
+        Member newMember = new Member();
+        newMember.setUserOpenid(member.getUserOpenid());
+        IntegralLog integralLog = new IntegralLog();
+        integralLog.setUserOpenId(openId);
+        integralLog.setInteConfId(inteConfId);
+        integralLog.setInteLogType(inteLogType);
+        integralLog.setInteLogStatus(1);
+        if(inteLogType == 1 || inteLogType == 2){
+            integralLog.setInteLogChangeNum(integralNum);
+            integralLog.setInteLogBeforeNum(member.getUserIntegral());
+
+            if(inteLogType == 1){
+                integralLog.setInteLogAfterNum(member.getUserIntegral()+integralNum);
+                integralLog.setInteLogDesc(remake+"--积分新增："+integralNum);
+                newMember.setUserIntegral(member.getUserIntegral()+integralNum);
+                newMember.setUserSurplusIntegral(member.getUserSurplusIntegral()+integralNum);
+            }else{
+                Integer num = member.getUserIntegral()-integralNum;
+                if(num < 0){
+                    throw  new RuntimeException("积分不足");
+                }
+                integralLog.setInteLogAfterNum(num);
+                integralLog.setInteLogDesc(remake+"--积分使用："+integralNum);
+                if(useOrderId != null && !"".equals(useOrderId)){
+                    integralLog.setInteLogUseOrderId(useOrderId);
+                }
+                newMember.setUserSurplusIntegral(member.getUserSurplusIntegral()-integralNum);
+                newMember.setUserUseIntegral(member.getUserUseIntegral()+integralNum);
+            }
+        }else if(inteLogType == 3){
+            if(member.getUserPendIntegral() == null){
+                member.setUserPendIntegral(0);
+            }
+            integralLog.setInteLogChangeNum(integralNum);
+            integralLog.setInteLogBeforeNum(member.getUserPendIntegral());
+            integralLog.setInteLogAfterNum(member.getUserPendIntegral()+integralNum);
+
+            ShopSystemRule shopSystemRule = adminOrderService.getReluByRid(102);
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DATE, shopSystemRule.getRuleNum().intValue());  //待入账
+            integralLog.setInteLogWaitingDate(calendar.getTime()); //inteLogWaitingDate //待入账时间
+
+            if(waitingOrderId == null || "".equals(waitingOrderId)){
+                throw  new RuntimeException("待入账没有订单编号");
+            }
+            integralLog.setInteLogWaitingOrderId(waitingOrderId);
+            integralLog.setInteLogDesc(remake+"--待入账："+integralNum+"，关联订单ID："+waitingOrderId);
+            newMember.setUserPendIntegral(member.getUserPendIntegral()+integralNum);
+        }else{
+            throw  new RuntimeException("inteLogType积分类型不正确");
+        }
+
+        logger.info("积分调整-类型："+integralLog.getInteLogType()+";数量："+integralLog.getInteLogChangeNum()+";userOpenId:"+integralLog.getUserOpenId());
+
+        integralLog.setInteLogName(integralConfig.getInteConfName());
+        flag = integralLogMapper.save(integralLog);
+        if(flag < 1){
+            throw  new RuntimeException("添加积分记录失败");
+        }
+
+        flag = memberMapper.nowUpdateUserByOpenId(newMember);
+        if(flag < 1){
+            throw  new RuntimeException("变更用户积分失败");
+        }
+        return flag;
+    }
+
+    /**
+     * 待入账转入-积分从待入账转为已入账
+     * @param  integralLog
+     * @return
+     */
+    @Override
+    @Transactional
+    public Integer waitUser(IntegralLog integralLog) {
+        //0：校验订单状态
+        //1.给用户减去待入账积分
+        //2.添加一条新纪录，添加剩余积分和总积分
+        //3.将该积分记录置位删除标志
+        Integer flag = 0;
+
+        Order order = new Order();
+        order.setSalesOrderid(integralLog.getInteLogWaitingOrderId());
+        order = cartService.selectOrderInfoById(order);
+        if(order.getSalesStatus() == 0 ){
+            //状态  0：取消订单
+            //cancelSurplusIntegral(order.getSalesOrderid());  理论不存在
+        }else if(order.getSalesStatus() == 1 || order.getSalesStatus() == 2){
+            //状态 1：待支付 2：已支付、待发货
+            throw  new RuntimeException("订单异常-订单状态未支付，或代发货-待入账转为已入账任务");
+        }else if(order.getSalesStatus() == 4 || order.getSalesStatus() == 8){
+             //8：订单退货，订单关闭  4：已退款  -- 退款退货，直接结束这个待入账积分
+            //将该积分记录置位删除标志-并且减去待入账 - 订单退货/退款
+            IntegralLog newIntegralLog = new IntegralLog();
+            newIntegralLog.setInteLogId(integralLog.getInteLogId());
+            newIntegralLog.setInteLogStatus(2);
+            newIntegralLog.setInteLogDesc(integralLog.getInteLogDesc()+"===订单退货/退款");
+            flag = integralLogService.update(newIntegralLog);
+            if(flag < 1){
+                throw  new RuntimeException("删除以前的待入账积分失败-待入账转为已入账任务");
+            }
+            Member member = memberMapper.getMemberByUserOpenId(integralLog.getUserOpenId());
+            if((member.getUserPendIntegral()-integralLog.getInteLogChangeNum())<0){
+                throw  new RuntimeException("删除以前的待入账积分不足-请核查用户信息-待入账转为已入账任务");
+            }
+            Member newMember = new Member();
+            newMember.setUserOpenid(member.getUserOpenid());
+            newMember.setUserPendIntegral(member.getUserPendIntegral()-integralLog.getInteLogChangeNum());
+            flag = memberMapper.nowUpdateUserByOpenId(newMember);
+            if(flag < 1){
+                throw  new RuntimeException("删除以前的待入账积分失败-变更用户积分失败");
+            }
+        }else if(order.getSalesStatus() == 3 || order.getSalesStatus() == 6 || order.getSalesStatus() == 7
+                || order.getSalesStatus() == 9  || order.getSalesStatus() == 11){
+            //3：退款申请中   6：申请退货中  7：退货中  9：换货中  11：申请换货中
+            throw  new RuntimeException("订单处于退款/退货/换货处理中，请快速处理-待入账转为已入账任务");
+        }else if(order.getSalesStatus() == 5 || order.getSalesStatus() == 12 || order.getSalesStatus() == 10){
+            //   5：已发货   12：订单完成  10：换货完成
+
+            //1.给用户减去待入账积分
+            Member member = memberMapper.getMemberByUserOpenId(integralLog.getUserOpenId());
+            if((member.getUserPendIntegral()-integralLog.getInteLogChangeNum())<0){
+                throw  new RuntimeException("待入账积分不足-请核查用户信息-待入账转为已入账任务");
+            }
+            Member newMember = new Member();
+            newMember.setUserOpenid(member.getUserOpenid());
+            newMember.setUserPendIntegral(member.getUserPendIntegral()-integralLog.getInteLogChangeNum());
+            flag = memberMapper.nowUpdateUserByOpenId(newMember);
+            if(flag < 1){
+                throw  new RuntimeException("变更用户待入账积分失败-待入账转为已入账任务");
+            }
+
+            //2.添加一条新纪录，添加剩余积分和总积分
+            String remake = integralLog.getInteLogDesc()+"原待入账LogId为："+ integralLog.getInteLogId();
+            flag = integralLogService.changeIntegral(integralLog.getUserOpenId(),6,integralLog.getInteLogChangeNum(),1,
+                    "","",remake);
+            if(flag < 1){
+                throw  new RuntimeException("添加入账积分记录失败-待入账转为已入账任务");
+            }
+
+            //3.将该积分记录置位删除标志
+            IntegralLog newIntegralLog = new IntegralLog();
+            newIntegralLog.setInteLogId(integralLog.getInteLogId());
+            newIntegralLog.setInteLogStatus(2);
+            newIntegralLog.setInteLogDesc(integralLog.getInteLogDesc()+"===已将待入账转为已入账，故删除");
+            flag = integralLogService.update(newIntegralLog);
+            if(flag < 1){
+                throw  new RuntimeException("删除以前的待入账-待入账转为已入账任务");
+            }
+
+        }else{
+            throw  new RuntimeException("订单异常状态异常-请核查订单详情-待入账转为已入账任务");
+        }
+        return flag;
+    }
+
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/IntegralConfigMapper.java

@@ -0,0 +1,31 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.ism.IntegralConfig;
+
+import java.util.List;
+
+/**
+ *  积分配置表接口
+ * @author Administrator
+ * @Date 2019-11-10
+ */
+public interface IntegralConfigMapper {
+    /**
+     * 获取集合
+     * @param  integralConfig
+     * @return List
+     */
+    List<IntegralConfig> getIntegralConfigList(IntegralConfig  integralConfig);
+    /**
+     * 获取集合
+     * @param  str
+     * @return List
+     */
+    List<IntegralConfig> getSpikeListAllByPromo(int[] str);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  integralConfig
+     */
+    IntegralConfig  getIntegralConfigById(Integer  id);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/IntegralLogMapper.java

@@ -0,0 +1,57 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.ism.IntegralLog;
+
+import java.util.List;
+
+/**
+ *  积分记录表接口
+ * @author Administrator
+ * @Date 2019-11-10
+ */
+public interface IntegralLogMapper {
+    /**
+     * 获取集合
+     * @param  integralLog
+     * @return List
+     */
+    List<IntegralLog> getIntegralLogList(IntegralLog  integralLog);
+
+    /**
+     * 获取集合 - 前端页面，获取增加积分和消费积分记录
+     * @param  integralLog
+     * @return List
+     */
+    List<IntegralLog> getIntegralLogListByAccoUser(IntegralLog  integralLog);
+
+    /**
+     * 获取集合-定时器，获取所有待入账记录
+     * @return List
+     */
+    List<IntegralLog> getIntegralLogListByWaitUser();
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  integralLog
+     */
+    IntegralLog  getIntegralLogById(Integer  id);
+    /**
+     * 增加数据
+     * @param  integralLog
+     * @return Integer
+     */
+    Integer  save(IntegralLog  integralLog);
+    /**
+     * 修改数据
+     * @param  integralLog
+     * @return Integer
+     */
+    Integer  update(IntegralLog  integralLog);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/IntegralLogMapper.xml

@@ -0,0 +1,193 @@
+<?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.IntegralLogMapper">
+    <resultMap  id="BaseResultMap" type="IntegralLog" >
+        <result    column="inte_log_id"    property="inteLogId" />
+        <result    column="user_open_id"    property="userOpenId" />
+        <result    column="inte_log_name"    property="inteLogName" />
+        <result    column="inte_conf_id"    property="inteConfId" />
+        <result    column="inte_log_type"    property="inteLogType" />
+        <result    column="inte_log_waiting_date"    property="inteLogWaitingDate" />
+        <result    column="inte_log_waiting_order_id"    property="inteLogWaitingOrderId" />
+        <result    column="inte_log_use_order_id"    property="inteLogUseOrderId" />
+        <result    column="inte_log_old_id"    property="inteLogOldId" />
+        <result    column="inte_log_change_num"    property="inteLogChangeNum" />
+        <result    column="inte_log_before_num"    property="inteLogBeforeNum" />
+        <result    column="inte_log_after_num"    property="inteLogAfterNum" />
+        <result    column="inte_log_status"    property="inteLogStatus" />
+        <result    column="inte_log_desc"    property="inteLogDesc" />
+        <result    column="inte_log_create_time"    property="inteLogCreateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.inte_log_id,
+        t.inte_log_name,
+        t.user_open_id,
+        t.inte_conf_id,
+        t.inte_log_type,
+        t.inte_log_waiting_date,
+        t.inte_log_waiting_order_id,
+        t.inte_log_use_order_id,
+        t.inte_log_old_id,
+        t.inte_log_change_num,
+        t.inte_log_before_num,
+        t.inte_log_after_num,
+        t.inte_log_status,
+        t.inte_log_desc,
+        t.inte_log_create_time
+    </sql>
+    <select id="getIntegralLogList" resultMap="BaseResultMap" parameterType="IntegralLog" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_ism_integral_log t
+        <where>
+            <if test="inteLogId != null ">
+                AND t.inte_log_id = #{inteLogId}
+            </if >
+            <if test="userOpenId != null and userOpenId != ''">
+                AND t.user_open_id  like  CONCAT ('%',#{userOpenId},'%')
+            </if >
+            <if test="inteConfId != null ">
+                AND t.inte_conf_id = #{inteConfId}
+            </if >
+            <if test="inteLogType != null ">
+                AND t.inte_log_type = #{inteLogType}
+            </if >
+            <if test="inteLogWaitingOrderId != null and inteLogWaitingOrderId != ''">
+                AND t.inte_log_waiting_order_id = #{inteLogWaitingOrderId}
+            </if >
+            <if test="inteLogUseOrderId != null and inteLogUseOrderId != ''">
+                AND t.inte_log_use_order_id = #{inteLogUseOrderId}
+            </if >
+            <if test="inteLogOldId != null ">
+                AND t.inte_log_old_id = #{inteLogOldId}
+            </if >
+            <if test="inteLogChangeNum != null ">
+                AND t.inte_log_change_num = #{inteLogChangeNum}
+            </if >
+            <if test="inteLogBeforeNum != null ">
+                AND t.inte_log_before_num = #{inteLogBeforeNum}
+            </if >
+            <if test="inteLogAfterNum != null ">
+                AND t.inte_log_after_num = #{inteLogAfterNum}
+            </if >
+            <if test="inteLogStatus != null ">
+                AND t.inte_log_status = #{inteLogStatus}
+            </if >
+            <if test="inteLogDesc != null and inteLogDesc != ''">
+                AND t.inte_log_desc  like  CONCAT ('%',#{inteLogDesc},'%')
+            </if >
+        </where>
+    </select>
+    <select id="getIntegralLogListByAccoUser" resultMap="BaseResultMap" parameterType="IntegralLog" >
+        select
+        <include refid="Base_List" />,
+        iio.inte_conf_name
+        from tb_iamberry_ism_integral_log t
+        LEFT JOIN tb_iamberry_ism_integral_config iio on t.inte_conf_id = iio.inte_conf_id
+        <where>
+                t.inte_log_type in (1,2)
+            AND t.inte_log_status = 1
+            AND t.user_open_id  = #{userOpenId}
+        </where>
+        ORDER BY  t.inte_log_id DESC
+    </select>
+    <select id="getIntegralLogListByWaitUser" resultMap="BaseResultMap"  >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_ism_integral_log t
+        <where>
+                t.inte_log_type = 3
+            AND t.inte_log_status = 1
+            AND t.inte_log_waiting_date  &lt; now()
+        </where>
+    </select>
+    <select id="getIntegralLogById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_ism_integral_log t
+        where t.inte_log_id= #{inteLogId}
+    </select>
+    <insert id="save" parameterType="IntegralLog" >
+        insert into
+        tb_iamberry_ism_integral_log
+        (
+        user_open_id,
+        inte_log_name,
+        inte_conf_id,
+        inte_log_type,
+        inte_log_waiting_date,
+        inte_log_waiting_order_id,
+        inte_log_use_order_id,
+        inte_log_old_id,
+        inte_log_change_num,
+        inte_log_before_num,
+        inte_log_after_num,
+        inte_log_status,
+        inte_log_desc
+        )
+        values
+        (
+        #{userOpenId},
+        #{inteLogName},
+        #{inteConfId},
+        #{inteLogType},
+        #{inteLogWaitingDate},
+        #{inteLogWaitingOrderId},
+        #{inteLogUseOrderId},
+        #{inteLogOldId},
+        #{inteLogChangeNum},
+        #{inteLogBeforeNum},
+        #{inteLogAfterNum},
+        #{inteLogStatus},
+        #{inteLogDesc}
+        )
+    </insert>
+    <update id="update" parameterType="IntegralLog" >
+        update
+          tb_iamberry_ism_integral_log
+        <set >
+            <if test="userOpenId != null and userOpenId != ''">
+                user_open_id = #{userOpenId},
+            </if >
+            <if test="inteConfId != null ">
+                inte_conf_id = #{inteConfId},
+            </if >
+            <if test="inteLogType != null ">
+                inte_log_type = #{inteLogType},
+            </if >
+            <if test="inteLogWaitingDate != null and inteLogWaitingDate != ''">
+                inte_log_waiting_date = #{inteLogWaitingDate},
+            </if >
+            <if test="inteLogWaitingOrderId != null and inteLogWaitingOrderId != ''">
+                inte_log_waiting_order_id = #{inteLogWaitingOrderId},
+            </if >
+            <if test="inteLogUseOrderId != null and inteLogUseOrderId != ''">
+                inte_log_use_order_id = #{inteLogUseOrderId}
+            </if >
+            <if test="inteLogOldId != null ">
+                inte_log_old_id = #{inteLogOldId},
+            </if >
+            <if test="inteLogChangeNum != null ">
+                inte_log_change_num = #{inteLogChangeNum},
+            </if >
+            <if test="inteLogBeforeNum != null ">
+                inte_log_before_num = #{inteLogBeforeNum},
+            </if >
+            <if test="inteLogAfterNum != null ">
+                inte_log_after_num = #{inteLogAfterNum},
+            </if >
+            <if test="inteLogStatus != null ">
+                inte_log_status = #{inteLogStatus},
+            </if >
+            <if test="inteLogDesc != null and inteLogDesc != ''">
+                inte_log_desc = #{inteLogDesc},
+            </if >
+        </set >
+        where inte_log_id= #{inteLogId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete FROM
+            tb_iamberry_ism_integral_log
+        where inte_log_id=#{inteLogId}
+    </delete>
+</mapper>

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

@@ -53,6 +53,12 @@ public interface MemberMapper {
 	 * @return
 	 */
 	public Integer updateMemberByUserId(Member member);
+
+	/**
+	 * 成为会员
+	 * @return
+	 */
+	public Integer nowUpdateUserByOpenId(Member member);
 	
 	/**
 	 * 修改用户已用积分
@@ -128,4 +134,10 @@ public interface MemberMapper {
 	 * @return
 	 */
 	public FullReduction getFullReduction(String openId);
+
+	/**
+	 * 获取今天生日的用户
+	 * @return
+	 */
+	List<Member> getNowBirthDate();
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/cartMapper.xml

@@ -125,7 +125,7 @@ PUBLIC
 			O.SALES_ADDRESS_INFO, O.SALES_ADDRESS_NAME, 
 			O.SALES_USER_REMARK, O.SALES_POST_NUM, O.SALES_POST_FIRM, 
 			O.SALES_SEND_DATE, O.SALES_ADDRESS_POSTNUM, 
-			O.SALES_ADDRESS_TEL ,  45*60-TIMESTAMPDIFF(SECOND,O.SALES_CREATE_DATE,NOW())   SALES_ADMIN_REMARK,
+			O.SALES_ADDRESS_TEL ,  45*60-TIMESTAMPDIFF(SECOND,O.SALES_CREATE_DATE,NOW())   SALES_ADMIN_REMARK, O.sales_yet_amount,
 			O.sales_is_spell_order salesIsSpellOrder,O.sales_spell_order_id salesSpellOrderId
 		FROM 
 			 TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_SHOP_ORDER_ITEM I 
@@ -163,6 +163,7 @@ PUBLIC
 		<result column="SALES_ADMIN_REMARK" property="salesAdminRemark"/>
 		<result column="SALES_ADDRESS_POSTNUM" property="salesAddressPostnum"/>
 		<result column="SALES_ADDRESS_TEL" property="salesAddressTel"/>
+		<result column="sales_yet_amount" property="salesYetAmount"/>
 		<result column="sales_is_spell_order" property="salesIsSpellOrder"/>
 		<result column="sales_spell_order_id" property="salesSpellOrderId"/>
 		<collection property="orderItemList" column="SALES_ORDERID" ofType="OrderItem" select="getOrderItemByOrderId"/>

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

@@ -25,7 +25,7 @@
  			<include refid="allField"></include>,
  		CT.COUPON_TYPE couponType	
  		FROM TB_IAMBERRY_COUPON_ITEM CI
- 		JOIN TB_IAMBERRY_COUPON_TYPE CT ON CI.COUPON_ID=CT.COUPON_ID
+ 		LEFT JOIN TB_IAMBERRY_COUPON_TYPE CT ON CI.COUPON_ID=CT.COUPON_ID
 		<where>
 			<if test="couponId != null and couponId != ''">
 				AND CI.COUPON_ID=#{couponId}
@@ -39,9 +39,8 @@
 			<if test="couponType != null and couponType != '' and couponType=='11' ">
 				AND  CT.coupon_type=3
 			</if>
-			<!-- couponReduce 是将状态是7的优惠券  属于已使用的优惠券-->
 			<if test="couponUseStatus != null and couponUseStatus != ''">
-				AND CI.COUPON_USE_STATUS IN (#{couponUseStatus},#{couponReduce})
+				AND CI.COUPON_USE_STATUS = #{couponUseStatus}
 			</if>
 			<if test="beginDate != null and beginDate != ''">
 				AND CI.COUPON_USE_END_DATE<![CDATA[>]]>#{beginDate}
@@ -53,6 +52,9 @@
 			<if test="couponItemRemark != null and couponItemRemark != ''">
 				AND CI.COUPON_USE_STATUS != 2
 			</if>
+			<if test="couponVipExclusive != null">
+				AND CT.COUPON_VIP_EXCLUSIVE=#{couponVipExclusive}
+			</if>
 		</where>
 		ORDER BY CI.coupon_id,CI.COUPON_RECEIVE_DATE DESC
 		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
@@ -66,6 +68,7 @@
  	<!-- 查询优惠券详情总数 -->
  	<select id="getCouponItemCount" resultType="Integer" parameterType="CouponItemDto">
  		SELECT COUNT(COUPON_ITEM_ID) FROM TB_IAMBERRY_COUPON_ITEM
+		LEFT JOIN  tb_iamberry_coupon_type ct ON  TB_IAMBERRY_COUPON_ITEM.coupon_id = ct.coupon_id
  		<where>
 			<if test="couponId != null and couponId != ''">
 				COUPON_ID=#{couponId}
@@ -82,6 +85,9 @@
 			<if test="endDate != null and endDate != ''">
 				AND COUPON_USE_END_DATE<![CDATA[<]]>#{endDate}
 			</if>
+			<if test="couponVipExclusive != null">
+				AND ct.COUPON_VIP_EXCLUSIVE=#{couponVipExclusive}
+			</if>
 		</where>
  	</select>
  	
@@ -168,7 +174,7 @@
  		</foreach>
  	</update>
 
-	<!-- 查询优惠券详情列表 分页 -->
+	<!-- 定时任务 -->
 	<select id="expiredAndNoTake" resultType="CouponItemDto" parameterType="CouponItemDto">
 		SELECT
 			<include refid="allField"></include>,
@@ -176,6 +182,7 @@
 		FROM TB_IAMBERRY_COUPON_ITEM CI
 		JOIN TB_IAMBERRY_COUPON_TYPE CT ON CI.COUPON_ID=CT.COUPON_ID
 		<where>
+			CI.COUPON_ID != 40000
 			<if test="couponId != null and couponId != ''">
 				AND CI.COUPON_ID=#{couponId}
 			</if>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/integralConfigMapper.xml

@@ -0,0 +1,68 @@
+<?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.IntegralConfigMapper">
+    <resultMap  id="BaseResultMap" type="IntegralConfig" >
+        <result    column="inte_conf_id"    property="inteConfId" />
+        <result    column="promotions_id"    property="promotionsId" />
+        <result    column="inte_conf_name"    property="inteConfName" />
+        <result    column="inte_conf_calculation"    property="inteConfCalculation" />
+        <result    column="inte_conf_status"    property="inteConfStatus" />
+        <result    column="inte_conf_desc"    property="inteConfDesc" />
+        <result    column="inte_conf_create_time"    property="inteConfCreateTime" />
+        <result    column="inte_conf_update_time"    property="inteConfUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.inte_conf_id,
+        t.promotions_id,
+        t.inte_conf_name,
+        t.inte_conf_calculation,
+        t.inte_conf_status,
+        t.inte_conf_desc,
+        t.inte_conf_create_time,
+        t.inte_conf_update_time
+    </sql>
+    <select id="getIntegralConfigList" resultMap="BaseResultMap" parameterType="IntegralConfig" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_ism_integral_config t
+        <where>
+            <if test="inteConfId != null ">
+                AND t.inte_conf_id = #{inteConfId}
+            </if >
+            <if test="promotionsId != null ">
+                AND t.promotions_id = #{promotionsId}
+            </if >
+            <if test="inteConfName != null and inteConfName != ''">
+                AND t.inte_conf_name  like  CONCAT ('%',#{inteConfName},'%')
+            </if >
+            <if test="inteConfCalculation != null and inteConfCalculation != ''">
+                AND t.inte_conf_calculation  like  CONCAT ('%',#{inteConfCalculation},'%')
+            </if >
+            <if test="inteConfStatus != null ">
+                AND t.inte_conf_status = #{inteConfStatus}
+            </if >
+        </where>
+    </select>
+
+    <select id="getSpikeListAllByPromo" resultMap="BaseResultMap" parameterType="IntegralConfig" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_ism_integral_config t
+        <where>
+            t.inte_conf_status  = 1
+            AND t.promotions_id IN (
+            <foreach collection="array" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
+        </where>
+        ORDER BY t.inte_conf_sort
+    </select>
+
+    <select id="getIntegralConfigById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_ism_integral_config t
+        where t.inte_conf_id= #{inteConfId}
+    </select>
+</mapper>

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

@@ -12,7 +12,6 @@
 		user_addr userAddr,
 		
 		user_sex userSex,
-		user_integral userIntegral,
 		user_account_num userAccountNum,
 		user_create_date userCreateDate,
 		user_birth_date userBirthDate,
@@ -26,15 +25,19 @@
 		user_qrcode userQrcode,
 		user_res_type userResType,
 		user_status userStatus,
-		user_surplus_integral userSurplusIntegral,
 		user_sub_date userSubDate,
-		
+
+		user_integral userIntegral,
+		user_surplus_integral userSurplusIntegral,
 		user_use_integral userUseIntegral,
+		user_pend_integral userPendIntegral,
+
 		user_income userIncome,
 		user_template_id templateId,
 		user_dealers userDealers,
 		user_is_bought userIsBought,
-		user_is_vip userIsVip
+		user_is_vip userIsVip,
+		user_arrange userArrange
 	</sql>
 	<!-- 匹配查询会员信息 -->
 	<select id="getMemberByFuzzy" parameterType="Member" resultType="Member">
@@ -172,6 +175,93 @@
 		where user_id = #{userId}
 	</update>
 
+	<!-- 修改 -->
+	<update id="nowUpdateUserByOpenId" parameterType="Member" >
+		update
+			tb_iamberry_user_userinfo
+		<set >
+			<if test="userHead != null and userHead != ''">
+				user_head = #{userHead},
+			</if >
+			<if test="userNickname != null and userNickname != ''">
+				user_nickname = #{userNickname},
+			</if >
+			<if test="userAddr != null and userAddr != ''">
+				user_addr = #{userAddr},
+			</if >
+			<if test="userSex != null ">
+				user_sex = #{userSex},
+			</if >
+			<if test="userAccountNum != null and userAccountNum != ''">
+				user_account_num = #{userAccountNum},
+			</if >
+			<if test="userPwd != null and userPwd != ''">
+				user_pwd = #{userPwd},
+			</if >
+			<if test="userTel != null and userTel != ''">
+				user_tel = #{userTel},
+			</if >
+			<if test="userName != null and userName != ''">
+				user_name = #{userName},
+			</if >
+			<if test="userBirthDate != null and userBirthDate != ''">
+				user_birth_date = #{userBirthDate},
+			</if >
+			<if test="userIntegral != null ">
+				user_integral = #{userIntegral},
+			</if >
+			<if test="userSurplusIntegral != null ">
+				user_surplus_integral = #{userSurplusIntegral},
+			</if >
+			<if test="userUseIntegral != null ">
+				user_use_integral = #{userUseIntegral},
+			</if >
+			<if test="userPendIntegral != null ">
+				user_pend_integral = #{userPendIntegral},
+			</if >
+			<if test="userResType != null ">
+				user_res_type = #{userResType},
+			</if >
+			<if test="userStatus != null ">
+				user_status = #{userStatus},
+			</if >
+			<if test="userSubDate != null and userSubDate != ''">
+				user_sub_date = #{userSubDate},
+			</if >
+			<if test="userIdentity != null ">
+				user_identity = #{userIdentity},
+			</if >
+			<if test="userQrcode != null and userQrcode != ''">
+				user_qrcode = #{userQrcode},
+			</if >
+			<if test="userIsFlag != null ">
+				user_is_flag = #{userIsFlag},
+			</if >
+			<if test="userIncome != null ">
+				user_income = #{userIncome},
+			</if >
+			<if test="userCoupon != null ">
+				user_coupon = #{userCoupon},
+			</if >
+			<if test="userTemplateId != null ">
+				user_template_id = #{userTemplateId},
+			</if >
+			<if test="userDealers != null ">
+				user_dealers = #{userDealers},
+			</if >
+			<if test="userIsBought != null ">
+				user_is_bought = #{userIsBought},
+			</if >
+			<if test="userIsVip != null ">
+				user_is_vip = #{userIsVip},
+			</if >
+			<if test="userArrange != null ">
+				user_arrange = #{userArrange}
+			</if >
+		</set >
+		where user_openid = #{userOpenid}
+	</update>
+
 	<!-- 修改用户已用积分 -->
 	<update id="updateUserUseIntegral" parameterType="Member">
 		UPDATE
@@ -301,4 +391,12 @@
 		SELECT * from TB_IAMBERRY_FULL_REDUCTION where open_id = #{openId}
 	</select>
 
+	<!-- 查询今日生日的用户 -->
+	<select id="getNowBirthDate" resultType="Member">
+		SELECT
+			<include refid="allField"/>
+		FROM tb_iamberry_user_userinfo
+		WHERE date_format(user_birth_date,'%m-%d') = date_format(now(),'%m-%d')
+	</select>
+
 </mapper> 

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

@@ -1,12 +1,15 @@
 package com.iamberry.wechat.service.member;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 
 import com.iamberry.wechat.core.entity.admin.FullReduction;
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
+import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
+import com.iamberry.wechat.core.entity.coupon.CouponType;
+import com.iamberry.wechat.service.mapper.CouponItemMapper;
+import com.iamberry.wechat.service.mapper.CouponTypeMapper;
+import com.iamberry.wechat.tools.StrUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +47,10 @@ public class MemberServiceImpl implements MemberService {
 	private WdRelationDao wdRelationDao;
 	@Autowired
 	private RatFWLogger logger;
+	@Autowired
+	private CouponItemMapper couponItemMapper;
+	@Autowired
+	private CouponTypeMapper couponTypeMapper;
 	/**
 	 * 根据userid得到会员信息
 	 * @param userId
@@ -83,6 +90,49 @@ public class MemberServiceImpl implements MemberService {
 	public Integer updateMemberByUserId(Member member){
 		return memberDao.updateMemberByUserId(member);
 	}
+
+	@Override
+	public Integer becomeVipByOpenId(Member member) {
+		Integer flag = memberDao.becomeVipByOpenId(member);
+		if(flag < 1){
+			throw new RuntimeException("成为会员失败");
+		}
+
+		Integer couponId = 10000;
+		CouponType couponType = couponTypeMapper.getCouponTypeById(couponId);
+		Calendar calendar = Calendar.getInstance();
+		calendar.add(Calendar.DATE, 90);  //有效期三个月
+
+		CouponItemDto couponItemDto = new CouponItemDto();
+		couponItemDto.setUseropenid(member.getUserOpenid());
+		couponItemDto.setCouponId(couponId);
+		List<CouponItemDto> couponItemDtoList = couponItemMapper.getCouponItemDtoList(couponItemDto);
+		if(couponItemDtoList != null && couponItemDtoList.size() >= couponType.getCouponGetLimit()){
+			return 1;
+		}
+
+		//创建优惠券
+		CouponItem couponItem = new CouponItem();
+		String uuidStr = StrUtils.getUUID();
+		couponItem.setCouponItemId(uuidStr);
+		couponItem.setCouponItemUseropenid(member.getUserOpenid());
+		couponItem.setCouponId(couponType.getCouponId());
+		couponItem.setCouponReceiveDate(new Date());
+		couponItem.setCouponUseEndDate(calendar.getTime());
+		couponItem.setCouponUseStatus(1);
+		couponItem.setCouponItemRemark(couponType.getCouponRemark());
+		flag = couponItemMapper.insertCouponItem(couponItem);
+		if(flag < 1){
+			throw new RuntimeException("赠送兑换优惠券失败");
+		}
+		return flag;
+	}
+
+	@Override
+	public Integer nowUpdateUserByOpenId(Member member) {
+		return memberDao.nowUpdateUserByOpenId(member);
+	}
+
 	@Override
 	public Integer updateUserUseIntegral(Member member) {
 		// TODO Auto-generated method stub
@@ -316,4 +366,9 @@ public class MemberServiceImpl implements MemberService {
 	public FullReduction getFullReduction(String openId) {
 		return memberDao.getFullReduction(openId);
 	}
+
+	@Override
+	public List<Member> getNowBirthDate() {
+		return memberDao.getNowBirthDate();
+	}
 }

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

@@ -44,6 +44,19 @@ public interface MemberDao {
 	public Integer updateMemberByUserId(Member member);
 
 	/**
+	 * 成为会员
+	 * @return
+	 */
+	public Integer becomeVipByOpenId(Member member);
+
+	/**
+	 * 修改
+	 * @param member
+	 * @return
+	 */
+	Integer nowUpdateUserByOpenId(Member member);
+
+	/**
 	 * 修改用户已用积分
 	 * @param member
 	 * @return
@@ -116,4 +129,10 @@ public interface MemberDao {
 	 * @return
 	 */
 	public FullReduction getFullReduction(String openId);
+
+	/**
+	 * 获取今天生日的用户
+	 * @return
+	 */
+	List<Member> getNowBirthDate();
 }

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.iamberry.wechat.core.entity.admin.FullReduction;
 import com.iamberry.wechat.core.entity.coupon.CouponItem;
+import com.iamberry.wechat.face.ism.IntegralLogService;
 import com.iamberry.wechat.service.mapper.CouponItemMapper;
 import com.iamberry.wechat.service.mapper.CouponTypeMapper;
 import com.iamberry.wechat.tools.StrUtils;
@@ -16,6 +17,7 @@ import com.iamberry.wechat.core.entity.Page;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.service.mapper.MemberMapper;
 import com.iamberry.wechat.service.member.dao.MemberDao;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 会员信息 DAO 实现
@@ -31,6 +33,10 @@ public class MemberDaoImpl  implements MemberDao {
 	private CouponItemMapper couponItemMapper;
 	@Autowired
 	private CouponTypeMapper couponTypeMapper;
+	@Autowired
+	private IntegralLogService integralLogService;
+
+
 
 	/**
 	 * 根据userid得到会员信息
@@ -68,18 +74,39 @@ public class MemberDaoImpl  implements MemberDao {
 	 * 根据 userid 修改会员信息
 	 * 2016年4月21日
 	 * @author 穆再兴
-	 * @param userId
 	 * @return
 	 */
 	@Override
 	public Integer updateMemberByUserId(Member member){
 		return memberMapper.updateMemberByUserId(member);
 	}
+
+	@Override
+	@Transactional
+	public Integer becomeVipByOpenId(Member member) {
+		Integer flag = memberMapper.nowUpdateUserByOpenId(member);
+		if(flag < 1){
+			throw  new RuntimeException("成为VIP失败");
+		}
+
+		flag = integralLogService.updateIntegral(member.getUserOpenid(),1,1);
+		if(flag < 1){
+			throw  new RuntimeException("添加积分失败");
+		}
+		return flag;
+	}
+
 	@Override
 	public Integer updateUserUseIntegral(Member member) {
 		// TODO Auto-generated method stub
 		return memberMapper.updateUserUseIntegral(member);
 	}
+
+	@Override
+	public Integer nowUpdateUserByOpenId(Member member){
+		return memberMapper.nowUpdateUserByOpenId(member);
+	}
+
 	@Override
 	public List<Member> selectUserIntegralByWechatProxyId(Page page) {
 		// TODO Auto-generated method stub
@@ -166,4 +193,9 @@ public class MemberDaoImpl  implements MemberDao {
 	public FullReduction getFullReduction(String openId) {
 		return memberMapper.getFullReduction(openId);
 	}
+
+	@Override
+	public List<Member> getNowBirthDate() {
+		return memberMapper.getNowBirthDate();
+	}
 }

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/agent/AgentHandler.java

@@ -1,12 +1,24 @@
 package com.iamberry.wechat.handles.agent;
 
+import java.text.MessageFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 import com.iamberry.wechat.core.entity.activity.ActivityDate;
+import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
+import com.iamberry.wechat.face.coupon.CouponItemService;
+import com.iamberry.wechat.face.order.CodeService;
+import com.iamberry.wechat.handles.thanksgiving.ThanksGivingHandler;
 import com.iamberry.wechat.service.ActivityUtil;
+import com.iamberry.wechat.service.ImberryConfig;
+import com.iamberry.wechat.tools.payUtil.RandomUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,7 +48,8 @@ import com.iamberry.wechat.tools.ResultInfo;
 @Controller
 @RequestMapping("/wechat/agent")
 public class AgentHandler {
-	
+
+	private Logger logger = LoggerFactory.getLogger(AgentHandler.class);
 	@Autowired
 	private AgentOrderService agentOrderService;	//微代理订单service
 	@Autowired
@@ -49,6 +62,10 @@ public class AgentHandler {
 	private MQServiceProxy mQservice;
 	@Autowired
 	private ActivityUtil activityUtil;
+	@Autowired
+	private CodeService codeService;
+	@Autowired
+	private CouponItemService couponItemService;
 	
 	/**
 	 * 获取当前用户<微代理> 的订单记录
@@ -104,42 +121,231 @@ public class AgentHandler {
 		member = memberService.getMemberByUserOpenId(member.getUserOpenid());
 		AgentMemberDto agentMember = agentMemberService.getMemberInfo(member);
 		agentMember.setUserIsVip(member.getUserIsVip());
+		agentMember.setUserArrange(member.getUserArrange());
 		agentMember.setUser38Interests(2);
+		agentMember.setUserSurplusIntegral(member.getUserSurplusIntegral());	//userSurplusIntegral
+		agentMember.setUserTel(member.getUserTel());
+		agentMember.setUserSex(member.getUserSex());
+		agentMember.setUserBirthDate(member.getUserBirthDate());
+		agentMember.setUserName(member.getUserName());
+
+		CouponItemDto couponItemDto = new CouponItemDto();
+		couponItemDto.setCouponVipExclusive(1);
+		couponItemDto.setUseropenid(member.getUserOpenid());
+		couponItemDto.setBeginDate(new Date());
+		couponItemDto.setCouponUseStatus(1);
+		Integer couponCount = couponItemService.getCouponItemCount(couponItemDto);
+
+		CouponItemDto vipCouponItemDto = new CouponItemDto();
+		vipCouponItemDto.setCouponVipExclusive(2);
+		vipCouponItemDto.setUseropenid(member.getUserOpenid());
+		vipCouponItemDto.setBeginDate(new Date());
+		vipCouponItemDto.setCouponUseStatus(1);
+		Integer couponVipCount = couponItemService.getCouponItemCount(vipCouponItemDto);
+
+		agentMember.setCouponCount(couponCount);
+		agentMember.setCouponVipCount(couponVipCount);
 
-		// TODO:此处不算会员中心业务，需要优化
-		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
-		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
-		List<ShopSalesOrderDto> orderList = cartService.getOrderList(shopSalesOrderDto);
-		if (null != orderList && orderList.size() > 0) {
-			for (ShopSalesOrderDto orderDto : orderList) {
-				MQMessage message = new MQMessage();
-				if ("2".equals(orderDto.getSalesStatus())) {
-					message.setServiceToMessage(orderDto.getSalesOrderid());
-					message.setServiceOtherMessage("efast.trade.detail.get");
-					message.setServiceIsSend(2);			// 没有推送的信息
-					message.setServiceStatus(1); 			// 推送成功
-					message.setServiceType(1); 				// 添加订单信息
-					message.setServiceHandlerObjectName("efastOrderServiceImpl");
-					message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
-					mQservice.insertMQMessage(message);
-				} else if ("8".equals(orderDto.getSalesStatus())) {
-					message.setServiceToMessage(orderDto.getSalesOrderid());
-					message.setServiceOtherMessage("efast.order.return.info.fetch");
-					message.setServiceIsSend(2);			// 没有推送的信息
-					message.setServiceStatus(1); 			// 推送成功
-					message.setServiceType(1); 				// 添加订单信息
-					message.setServiceHandlerObjectName("efastOrderServiceImpl");
-					message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
-					mQservice.insertMQMessage(message);
-				}
-			}
-		}
-		
 		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 		rm.setStatus(true);
 		rm.setData(agentMember);
 		return rm;
 	}
+
+	/**
+	 * 完善用户信息
+	 * @return
+	 */
+	@RequestMapping("/updateMemberInfo")
+	@ResponseBody
+	public ResultMsg updateMemberInfo(HttpServletRequest request,Member member,String code){
+		ResultMsg rm = new ResultMsg();
+		Member m = WechatUtils.getUserBySession(request);
+
+		m = memberService.getMemberByUserOpenId(m.getUserOpenid());
+		if(m.getUserIsVip() == 2 && m.getUserArrange() == 1){
+			return new ResultMsg(false, ResultMsg.ERROR, "您已经是会员了!",null);
+		}
+
+		if(m.getUserOpenid()== null || "".equals(m.getUserOpenid())){
+			return new ResultMsg(false,  ResultMsg.ERROR, "完善信息失败-用户OpenId为空",null);
+		}
+		if(member == null){
+			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，用户信息为空，请联系公众号客服!",null);
+		}
+
+		//姓名
+		if(member.getUserName() == null){
+			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，姓名不能为空!",null);
+		}
+		//性别
+		if(member.getUserSex() == null){
+			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，性别不能为空!",null);
+		}
+		//生日	userBirthDate
+		if(member.getUserBirthDate() == null){
+			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，生日不能为空!",null);
+		}
+		//手机号码
+		if(member.getUserTel() == null){
+			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，手机号码为空!",null);
+		}
+		//验证码
+		if(code == null || "".equals(code)){
+			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，验证码为空!",null);
+		}
+
+		//使用request对象的getSession()获取session，如果session不存在则创建一个
+		HttpSession session = request.getSession();
+		String verificationTel = (String) session.getAttribute("verification_tel");
+		String verificationCode = (String) session.getAttribute("verification_code");
+		Date verificationDate = (Date) session.getAttribute("verification_date");
+		if(verificationTel == null || verificationCode == null || verificationDate == null){
+			logger.info("openid="+member.getUserOpenid()+"phone："+member.getUserTel()+"=完善信息失败，请重新获取验证码");
+			return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，请重新获取验证码!",null);
+		}
+		if(member.getUserTel().length() != 11 && member.getUserTel().equals(verificationTel)){
+			rm.setMessage(ResultMsg.ERROR);
+			rm.setMessage("电话号码错误!");
+			return rm;
+		}
+		if(code == null || "".equals(code)){
+			return new ResultMsg(false, ResultMsg.ERROR, "验证码为空!",null);
+		}
+		Calendar nowTime = Calendar.getInstance();
+		nowTime.setTime(verificationDate);
+		nowTime.add(Calendar.MINUTE, 5);
+		Date verData = nowTime.getTime();
+		if(!verificationCode.equals(code)){
+			logger.info("openid="+member.getUserOpenid()+"phone："+member.getUserTel()+"=验证码不正确，请重新输入");
+			return new ResultMsg(false,  ResultMsg.ERROR, "验证码不正确，请重新输入!",null);
+		}
+		if((verData.getTime() < System.currentTimeMillis())){
+			return new ResultMsg(false,  ResultMsg.ERROR, "验证码已失效，请重新获取!",null);
+		}
+
+		ResultMsg msg = new ResultMsg();
+		member.setUserOpenid(m.getUserOpenid());
+		member.setUserIsVip(2);	//是否为vip ：1:非vip  2：vip
+		member.setUserArrange(1);	////1：已整理  2：未整理
+		Integer  flag = memberService.becomeVipByOpenId(member);
+		if (flag > 0 ) {
+			msg.setResultCode(ResultInfo.SUCCESSCODE);
+			msg.setStatus(true);
+			return msg;
+		} else {
+			msg.setResultCode(ResultInfo.ERRORCODE);
+			msg.setStatus(false);
+			msg.setMessage("成为会员失败");
+			return msg;
+		}
+	}
+
+
+	/**
+	 * 修改手机号码
+	 * @return
+	 */
+	@RequestMapping("/updateMemberPhone")
+	@ResponseBody
+	public ResultMsg updateMemberPhone(HttpServletRequest request,Member member,String code){
+		ResultMsg rm = new ResultMsg();
+		Member m = WechatUtils.getUserBySession(request);
+
+		//手机号码
+		if(member.getUserTel() == null){
+			return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败，手机号码为空!",null);
+		}
+		//验证码
+		if(code == null || "".equals(code)){
+			return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败，验证码为空!",null);
+		}
+
+		//使用request对象的getSession()获取session，如果session不存在则创建一个
+		HttpSession session = request.getSession();
+		String verificationTel = (String) session.getAttribute("verification_tel");
+		String verificationCode = (String) session.getAttribute("verification_code");
+		Date verificationDate = (Date) session.getAttribute("verification_date");
+		if(verificationTel == null || verificationCode == null || verificationDate == null){
+			logger.info("openid="+member.getUserOpenid()+"phone："+member.getUserTel()+"=修改手机号码失败，请重新获取验证码");
+			return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败，请重新获取验证码!",null);
+		}
+		if(member.getUserTel().length() != 11 && member.getUserTel().equals(verificationTel)){
+			rm.setMessage(ResultMsg.ERROR);
+			rm.setMessage("修改手机号码失败-手机号码错误!");
+			return rm;
+		}
+		if(code == null || "".equals(code)){
+			return new ResultMsg(false, ResultMsg.ERROR, "验证码不能为空!",null);
+		}
+		Calendar nowTime = Calendar.getInstance();
+		nowTime.setTime(verificationDate);
+		nowTime.add(Calendar.MINUTE, 5);
+		Date verData = nowTime.getTime();
+		if(!verificationCode.equals(code)){
+			logger.info("openid="+member.getUserOpenid()+"phone："+member.getUserTel()+"=验证码不正确，请重新输入");
+			return new ResultMsg(false,  ResultMsg.ERROR, "验证码不正确，请重新输入!",null);
+		}
+		if((verData.getTime() < System.currentTimeMillis())){
+			return new ResultMsg(false,  ResultMsg.ERROR, "验证码已失效，请重新获取!",null);
+		}
+
+		ResultMsg msg = new ResultMsg();
+		member.setUserOpenid(m.getUserOpenid());
+		Integer  flag = memberService.nowUpdateUserByOpenId(member);
+		if (flag > 0 ) {
+			msg.setResultCode(ResultInfo.SUCCESSCODE);
+			msg.setStatus(true);
+			return msg;
+		} else {
+			msg.setResultCode(ResultInfo.ERRORCODE);
+			msg.setStatus(false);
+			msg.setMessage("修改电话号码失败");
+			return msg;
+		}
+	}
+
+	/**
+	 * 发送短信
+	 * @param request
+	 * @return
+	 * @throws Exception
+	 */
+	@ResponseBody
+	@RequestMapping("/send_phone")
+	public ResultMsg sendPhone(HttpServletRequest request,String phone) throws Exception {
+		ResultMsg msg = new ResultMsg();
+
+		if(phone.trim().length() != 11){
+			msg.setMessage("电话号码错误!");
+			return msg;
+		}
+
+		//获取验证码
+		String num = RandomUtil.getRandom();
+		//使用request对象的getSession()获取session，如果session不存在则创建一个
+		HttpSession session = request.getSession();
+		String text = MessageFormat.format(ImberryConfig.PROBATION_VERIFICATION_CODE, num);
+		String result = codeService.sendOtherCMS(phone, text);
+
+		//将数据存储到session中
+		session.setAttribute("verification_code",num );
+		session.setAttribute("verification_tel",phone );
+		session.setAttribute("verification_date",new Date());
+
+		if ("SUCCESS".equals(result)) {
+			logger.info("短信发送成功，验证码为：" + num);
+			msg.setResultCode(ResultInfo.SUCCESSCODE);
+			msg.setStatus(true);
+			return msg;
+		} else {
+			logger.info("短信发送失败：" + result);
+			msg.setResultCode(ResultInfo.ERRORCODE);
+			msg.setStatus(false);
+			msg.setMessage("短信发送失败");
+			return msg;
+		}
+	}
 	
 	/**
 	 * 前台根据openid获取用户信息

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -13,9 +13,12 @@ import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.coupon.ExchangeService;
 import com.iamberry.wechat.face.eo.GiftPoolService;
 import com.iamberry.wechat.face.eo.ItemGiftService;
+import com.iamberry.wechat.face.ism.IntegralLogService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
 import com.iamberry.wechat.service.ActivityUtil;
 import com.iamberry.wechat.service.eo.ItemGiftServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -55,6 +58,7 @@ import com.iamberry.wechat.tools.StaticInfo;
 @Controller
 @RequestMapping("/wechat/cart")
 public class CartHandlers {
+	Logger logger = LoggerFactory.getLogger(CartHandlers.class);
 	
 	@Autowired
 	private CartService cartService;
@@ -89,6 +93,8 @@ public class CartHandlers {
 	ItemGiftService itemGiftService;
 	@Autowired
 	private ActivityUtil activityUtil;
+	@Autowired
+	private IntegralLogService integralLogService;
 	
 	/**
 	 * 进入购物车页面
@@ -681,6 +687,14 @@ public class CartHandlers {
 				}
 			}
 
+			//恢复积分
+			try {
+				Integer flag = integralLogService.cancelSurplusIntegral(orderId);
+			}catch (Exception e){
+				e.printStackTrace();
+				logger.info("取消订单，积分退回失败，订单id："+ orderId);
+			}
+
 			remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 			remsg.setResultCode(ResultInfo.SUCCESSCODE);
 			remsg.setStatus(true);

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -292,9 +292,6 @@ public class CouponTypeHandler {
 		Member member = WechatUtils.getUserBySession(req);
 		openid = member.getUserOpenid();
 
-		System.out.println("============查看优惠券页面："+openid+"参数："+useStatus);
-		logger.info("============查看优惠券页面："+openid+"参数："+useStatus);
-
 		CouponItemDto cDto = new CouponItemDto();
 		cDto.setUseropenid(openid);
 //		if ("1".equals(useStatus)) { // 未使用的优惠券
@@ -307,29 +304,32 @@ public class CouponTypeHandler {
 //			cDto.setEndDate(new Date());
 //			cDto.setCouponItemRemark("4"); // 需去掉已经使用的优惠券
 //		}
-		if ("10".equals(useStatus)) {
-			//优惠券
-			cDto.setCouponUseStatus(0);
-			cDto.setCouponType(10);
-			cDto.setBeginDate(new Date());
-		}else if("11".equals(useStatus)){
-			//兑换券
-			cDto.setCouponUseStatus(0);
-			cDto.setCouponType(11);
-			cDto.setBeginDate(new Date());
-		}
+//		if ("10".equals(useStatus)) {
+//			//优惠券
+//			cDto.setCouponUseStatus(0);
+//			cDto.setCouponType(10);
+//			cDto.setBeginDate(new Date());
+//		}else if("11".equals(useStatus)){
+//			//兑换券
+//			cDto.setCouponUseStatus(0);
+//			cDto.setCouponType(11);
+//			cDto.setBeginDate(new Date());
+//		}
+		cDto.setCouponUseStatus(1);
+		cDto.setCouponVipExclusive(Integer.valueOf(useStatus));
+		cDto.setBeginDate(new Date());
 		cDto.setPage(new PageBean());
 		cDto.getPage().setPageSize(pageSize);
 		cDto.getPage().setPageNumber(pageNO);
 		list = couponItemService.getCouponItemDtoList(cDto);
 
 		Date now = new Date();
-		for (CouponItemDto itemDto : list) { // 为了在全部优惠券页面区分已过期的优惠券，使之不能使用
-			itemDto.setCouponItemRemark(ResultInfo.COUPONITEMSTATUS_NORMAL);
-			if (itemDto.getCouponUseEndDate() != null
-					&& itemDto.getCouponUseEndDate().before(now)) {
-				itemDto.setCouponItemRemark(ResultInfo.COUPONITEMSTATUS_PASSED);
-			}
+		for (CouponItemDto itemDto : list) { 	// 为了在全部优惠券页面区分已过期的优惠券，使之不能使用
+//			itemDto.setCouponItemRemark(ResultInfo.COUPONITEMSTATUS_NORMAL);
+//			if (itemDto.getCouponUseEndDate() != null
+//					&& itemDto.getCouponUseEndDate().before(now)) {
+//				itemDto.setCouponItemRemark(ResultInfo.COUPONITEMSTATUS_PASSED);
+//			}
 			if(itemDto.getCouponType().equals(3)){
 				Exchange exchange = new Exchange();
 				exchange.setCouponId(itemDto.getCouponId());

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/home/HomeHandler.java

@@ -15,6 +15,7 @@ import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.WeixinUtil;
+import com.iamberry.wechat.tools.payUtil.RandomUtil;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -27,8 +28,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -99,27 +102,6 @@ public class HomeHandler {
 
 		Member m = WechatUtils.getUserBySession(request);
 		m = memberService.getMemberByUserOpenId(m.getUserOpenid());
-		try{
-			if(m.getUserHead() == null || "".equals(m.getUserHead())){
-				JSONObject jsonObject = WeixinUtil.getUserInfo(m.getUserOpenid());
-				String nickname = jsonObject.getString("nickname");
-				String headimgurl = jsonObject.getString("headimgurl");
-				try {
-					nickname = URLEncoder.encode(jsonObject.getString("nickname"), "UTF-8");
-				} catch (UnsupportedEncodingException e) {
-					nickname = "";
-				}
-				m.setUserHead(headimgurl);
-				m.setUserNickname(nickname);
-				if(nickname != null && !"".equals(nickname)){
-					m.setUserStatus(2);
-				}
-				homeService.updateWechatMemberInfoByByOpenid(m);
-			}
-		}catch (Exception e){
-			logger.info("获取个人信息失败；openid："+m.getUserOpenid());
-			e.printStackTrace();
-		}
 
 		Member member =  WechatUtils.getUserBySession(request);
 		// 准备数据
@@ -152,6 +134,42 @@ public class HomeHandler {
 
 		return msg;
 	}
+	/**
+	 * 刷新用户信息
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/getUserInfo", method = RequestMethod.POST)
+	public ResultMsg getUserInfo(HttpServletRequest request) throws Exception {
+		ResultMsg msg = new ResultMsg();
+
+		Member m = WechatUtils.getUserBySession(request);
+		m = memberService.getMemberByUserOpenId(m.getUserOpenid());
+		try{
+				JSONObject jsonObject = WeixinUtil.getUserInfo(m.getUserOpenid());
+				String nickname = jsonObject.getString("nickname");
+				String headimgurl = jsonObject.getString("headimgurl");
+				try {
+					nickname = URLEncoder.encode(jsonObject.getString("nickname"), "UTF-8");
+				} catch (UnsupportedEncodingException e) {
+					nickname = "";
+				}
+				m.setUserHead(headimgurl);
+				m.setUserNickname(nickname);
+				if(nickname != null && !"".equals(nickname)){
+					m.setUserStatus(2);
+				}
+				homeService.updateWechatMemberInfoByByOpenid(m);
+			logger.info("获取个人信息成功；openid："+m.getUserOpenid());
+		}catch (Exception e){
+			logger.info("获取个人信息失败；openid："+m.getUserOpenid());
+			e.printStackTrace();
+		}
+
+		msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		msg.setResultCode(ResultInfo.SUCCESSCODE);
+		msg.setStatus(true);
+		return msg;
+	}
 
 	/**
 	 * 首页获取产品信息

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/ism/IntegralLogHandler.java

@@ -0,0 +1,82 @@
+package com.iamberry.wechat.handles.ism;
+
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.cart.SendPayDto;
+import com.iamberry.wechat.core.entity.ism.IntegralLog;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.face.ism.IntegralLogService;
+import com.iamberry.wechat.face.member.MemberService;
+import com.iamberry.wechat.service.ism.IntegralLogServiceImpl;
+import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
+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.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 积分
+ */
+@Controller
+@RequestMapping("/wechat/integralLog")
+public class IntegralLogHandler {
+    @Autowired
+    private MemberService memberService;
+    @Autowired
+    private IntegralLogService integralLogService;
+
+    /**
+     * 获取积分记录
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getIntegral", method = RequestMethod.POST)
+    public ResultMsg payBefore(HttpServletRequest request,
+           @RequestParam(value= "pageSize",defaultValue= "3" ,required=false) Integer pageSize,
+           @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+           @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum
+    ) {
+        ResultMsg msg = new ResultMsg();
+        msg.setResultCode(ResultInfo.ERRORCODE);
+
+        Member member = WechatUtils.getUserBySession(request); // 当前用户
+        member = memberService.getMemberByUserOpenId(member.getUserOpenid());
+
+        IntegralLog integralLog = new IntegralLog();
+        integralLog.setUserOpenId(member.getUserOpenid());
+        integralLog.setInteLogStatus(1);
+//        List<IntegralLog> integralLogList = integralLogService.getIntegralLogListByAccoUser(integralLog);
+
+        // 封装请求数据
+        PageRequest<IntegralLog> pageRequest = new PageRequest<>(integralLog, pageNO, pageSize, totalNum == 0);
+        // 查询订单列表
+        PagedResult<IntegralLog> result = integralLogService.listIntegralLog(pageRequest);
+        if (totalNum != 0) {
+            result.setTotal(totalNum);
+        }
+        StitchAttrUtil.setPage(result);
+
+        Map<String,Object> map = new HashMap<String, Object>();
+        map.put("list",result.getDataList());
+
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        msg.setData(map);
+        msg.setStatus(true);
+        return msg;
+    }
+
+}

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

@@ -7,11 +7,19 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
+import com.iamberry.wechat.core.entity.coupon.CouponType;
+import com.iamberry.wechat.core.entity.ism.IntegralLog;
+import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.face.coupon.CouponItemService;
-import com.iamberry.wechat.tools.HttpClient431Util;
-import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.face.coupon.CouponTypeService;
+import com.iamberry.wechat.face.ism.IntegralLogService;
+import com.iamberry.wechat.face.member.MemberService;
+import com.iamberry.wechat.service.ism.IntegralLogServiceImpl;
+import com.iamberry.wechat.service.mapper.MemberMapper;
+import com.iamberry.wechat.tools.*;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -34,8 +42,6 @@ import com.iamberry.wechat.face.order.ProbationShopOrderService;
 import com.iamberry.wechat.face.reback.RebackServices;
 import com.iamberry.wechat.face.task.WechatTaskService;
 import com.iamberry.wechat.service.StaticCacheMemory;
-import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.sendMsg.SendMessageUtil;
 import com.iamberry.zk.SpringContextHolder;
 /**
@@ -49,27 +55,26 @@ 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
 	private CouponItemService couponItemService;
+	@Autowired
+	private MemberService memberService;
+	@Autowired
+	private CouponTypeService couponTypeService;
+	@Autowired
+	private IntegralLogService integralLogService;
 	
 	private Lock lock = new ReentrantLock();
 
@@ -459,5 +464,102 @@ public class MQTask implements InitializingBean {
 		logger.info("---------------- 过期优惠券提醒结束 ---------------");
 	}
 
+	/**
+	 * 生日提醒 - 赠送优惠券 - 需要在0点就赠送出去
+	 * @throws Exception
+	 */
+//	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+//	@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
+//	@Scheduled(cron = "0 0 9 * * ?")//每天早上9点触发
+	@Scheduled(cron = "0 5 0 * * ?")//每天早上0点过5分执行
+	public void birthDatePromptCoupon() throws Exception {
+		logger.info("---------------- 生日提醒-赠送优惠券-开始 ---------------");
+		List<Member> memberList = memberService.getNowBirthDate();
+		logger.info("---今日生日的用户数量："+memberList.size());
+		Integer couponId = 40000;
+		for (Member member:memberList) {
+			CouponType couponType = couponTypeService.getCouponTypeById(couponId);
+
+			Calendar calendar = Calendar.getInstance();
+			calendar.set(Calendar.HOUR_OF_DAY,23);
+			calendar.set(Calendar.MINUTE,59);
+			calendar.set(Calendar.SECOND,50);
+			//创建优惠券
+			CouponItem couponItem = new CouponItem();
+			String uuidStr = StrUtils.getUUID();
+			couponItem.setCouponItemId(uuidStr);
+			couponItem.setCouponItemUseropenid(member.getUserOpenid());
+			couponItem.setCouponId(couponType.getCouponId());
+			couponItem.setCouponReceiveDate(new Date());
+			couponItem.setCouponUseEndDate(calendar.getTime());
+			couponItem.setCouponUseStatus(1);
+			couponItem.setCouponItemRemark(couponType.getCouponRemark());
+			Integer flag = couponItemService.insertCouponItem(couponItem);
+			if(flag < 1){
+				logger.info("---生日优惠券领取失败，userOpenId："+member.getUserOpenid() + "");
+			}else{
+				logger.info("---生日优惠券领取成功，userOpenId："+member.getUserOpenid() + "");
+			}
+		}
+		logger.info("---------------- 生日提醒-赠送优惠券-结束 ---------------");
+	}
+
+	/**
+	 * 生日提醒-9点通知客户今天优惠券和积分三倍情况
+	 * @throws Exception
+	 */
+//	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+//	@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
+	@Scheduled(cron = "0 0 9 * * ?")//每天早上9点触发
+	public void birthDatePrompt() throws Exception {
+		logger.info("---------------- 生日提醒-提醒用户-开始 ---------------");
+		List<Member> memberList = memberService.getNowBirthDate();
+		logger.info("---今日生日的用户数量："+memberList.size());
+		for (Member member:memberList) {
+			//推送微信模板消息
+			try {
+				sendMessageUtil.memberActivation(
+						"尊敬的会员，祝您生日快乐，特送上一份生日礼包。",
+						member.getUserTel(),
+						String.valueOf(member.getUserSurplusIntegral()),
+						"1、免费领取50元代金券，满99元即可使用，在会员中心-券包即可查看使用。\\\\r\\\\n" +
+								"2、会员生日当天下单购买产品，即可享受3倍积分。" +
+								"生日福利仅限生日当天领取和使用，赶快享受你的专属生日礼包吧！",
+						member.getUserOpenid(),
+						ResultInfo.COUPON_URL);
+			}catch (Exception e){
+				logger.info("推送今日生日的用户消息失败，失败openId：" + member.getUserOpenid());
+				e.printStackTrace();
+			}
+		}
+		logger.info("---------------- 生日提醒-提醒用户-结束 ---------------");
+	}
+
+
+	/**
+	 * 将待入账转为已入账
+	 * @throws Exception
+	 */
+//	@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
+//	@Scheduled(cron = "0 0 9 * * ?")//每天早上9点触发
+//	@Scheduled(cron = "*/3 * * * * ?")
+	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+	public void accountEntry() throws Exception {
+		logger.info("---------------- 待入账转为已入账-开始 ---------------");
+		List<IntegralLog> integralLogList = integralLogService.getIntegralLogListByWaitUser();
+		if(integralLogList!=null && integralLogList.size()>0){
+			logger.info("---------------- 当前待入账的处理数量-"+ integralLogList.size() +" ---------------");
+			for (IntegralLog integralLog:integralLogList) {
+				try {
+					integralLogService.waitUser(integralLog);
+				}catch (Exception e){
+					logger.info("--待入账转为已入账失败；待入账积分记录id："+integralLog.getInteLogId()+"；" +
+							"订单编号："+ integralLog.getInteLogWaitingOrderId() +";失败原因："+e.getMessage());
+					e.printStackTrace();
+				}
+			}
+			logger.info("---------------- 待入账转为已入账-结束 ---------------");
+		}
+	}
 
 }

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -24,6 +24,7 @@ import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.coupon.CouponTypeService;
 import com.iamberry.wechat.face.coupon.ExchangeService;
 import com.iamberry.wechat.face.home.HomeService;
+import com.iamberry.wechat.face.ism.IntegralLogService;
 import com.iamberry.wechat.face.member.CashLogService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.pay.PayService;
@@ -256,9 +257,10 @@ public class OrderHandler {
 		dto.setPayTotal(total); // 支付金额,单位为分
 		dto.setCartItems(cartDtos); // 订单项
 		dto.setSuccess(true); // 请求成功
-		dto.setMeonyProportion(0);
+		dto.setMeonyProportion("0.1");
 		dto.setBalance(member.getUserIncome());
 		dto.setUser38Interests(2);	//活动过期
+		dto.setUserIntegral(member.getUserSurplusIntegral());	//积分
 
 		dto.setDisable(disable);
 		
@@ -364,8 +366,8 @@ public class OrderHandler {
 					cartDto.setCartNum(1);
 					cartDto.setProductName(productColor.getColorProductName());
 					cartDto.setProductType(productColor.getColorProductType());	//colorProductType
-					cartDto.setProductPrice(productColor.getColorDiscount());
-					cartDto.setProductDiscount(productColor.getColorPrice());
+					cartDto.setProductPrice(productColor.getColorPrice());
+					cartDto.setProductDiscount(productColor.getColorDiscount());
 					cartDto.setProductStatus(1);
 					cartDto.setTotal(productColor.getColorDiscount());
 					cartDto.setProductColor(productColor.getColorName());
@@ -531,6 +533,18 @@ public class OrderHandler {
 		// 套装减去100元
 		total -= priceReduction;
 
+		Integer integralNum = temp.getOrderIntegralNum();
+		//使用积分
+		if(integralNum != null && integralNum != 0){
+			if(member.getUserIsVip() == 2 && member.getUserSurplusIntegral() >= integralNum){// vip用户 && 用户积分大于等于使用的积分
+				//积分的使用需要除以10，但是支付金额的单位为分，所以需要乘以100  == 》 integralNum/10*100 ==》 integralNum*10
+				total -= integralNum*10;
+			}else{
+				msg.setMessage(ResultInfo.ORDER_NO_INTEGRAL); //积分不足
+				return msg;
+			}
+		}
+
 		if(total==0 || total<0){
 			total=0;
 			mustPay=0;
@@ -549,7 +563,7 @@ public class OrderHandler {
 		
 		order.setSalesYetAmount(total);
 		order.setSalesRateAmount(0);
-		order.setSalesIntegralNum(temp.getOrderIntegralNum()); // 订单使用积分
+		order.setSalesIntegralNum(integralNum); // 订单使用积分
 		order.setSalesCreateDate(new Date()); // 创建时间
 		order.setBalancePayAmount(temp.getBalancePayAmount()); //账户余额支付金额
 		order.setCouponId(couponId);   //优惠券id
@@ -566,7 +580,6 @@ public class OrderHandler {
 		boolean flag = false;
 		try {
 			flag = cartService.addOrderAndSaveOrderItem(order, list, cartIds);
-//System.out.println("====插入订单列表信息===="+flag);
 			//修改优惠券状态为临时状态
 			if(hasCoupon){
 				couponItem.setCouponUseStatus(7);
@@ -576,6 +589,7 @@ public class OrderHandler {
 			flag = false;
 			System.out.println("====插入订单列表信息失败====");
 			msg.setMessage(ResultInfo.paramFormatError);
+			e.printStackTrace();
 			return msg;
 		}
 		

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/order/orderListener/OrderCloseListener.java

@@ -12,6 +12,7 @@ import com.iamberry.wechat.core.entity.eo.ItemGift;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.face.eo.GiftPoolService;
 import com.iamberry.wechat.face.eo.ItemGiftService;
+import com.iamberry.wechat.face.ism.IntegralLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
@@ -36,6 +37,8 @@ public class OrderCloseListener {
 	GiftPoolService giftPoolService;
 	@Autowired
 	ItemGiftService itemGiftService;
+	@Autowired
+	private IntegralLogService integralLogService;
 
 	
 	//已经推送过的		key:orderid		velue：推送时间
@@ -114,6 +117,12 @@ public class OrderCloseListener {
 					giftPoolService.updateAddStock(gp);
 				}
 			}
+
+			try{
+				integralLogService.cancelSurplusIntegral(or.getSalesOrderid());
+			}catch (Exception e){
+				e.printStackTrace();
+			}
 		}
 
 	}

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -13,9 +13,13 @@ import javax.servlet.http.HttpServletResponse;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.eo.Promotions;
+import com.iamberry.wechat.core.entity.ism.IntegralConfig;
 import com.iamberry.wechat.core.entity.rent.ReserveOrder;
+import com.iamberry.wechat.face.ism.IntegralLogService;
 import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.face.reserve.ReserveService;
+import com.iamberry.wechat.service.ActivityUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -131,6 +135,10 @@ public class ResponseWechatPayHandler {
 	private EfastOrderService efastOrderService;
     @Autowired
     private AdminOrderService adminOrderService;
+	@Autowired
+	private IntegralLogService integralLogService;
+	@Autowired
+	private ActivityUtil activityUtil;
 	/**
 	 * 销售订单支付回调方法
 	 */
@@ -156,12 +164,11 @@ public class ResponseWechatPayHandler {
 				resXml = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
 				String orderIdMD5 = StaticInfo.orderIdMD5.decrypt(wpr.getAttach());
 
-				//2019-07-29 新增团购功能，查询订单信息，判断是否是团购订单
 				Order o = new Order();
 				o.setSalesOrderid(orderIdMD5);
 				o = cartService.selectOrderInfoById(o);
 
-//System.out.println("===========pay 117==============");
+//				Member member = memberService.getMemberByUserOpenId(o.getSalesOpenid());
 
 				if (orderIdMD5.equals(wpr.getOutTradeNo())) {
 					Date nowDate = new Date();
@@ -181,13 +188,9 @@ public class ResponseWechatPayHandler {
 					// 修改订单状态
 					int count = cartService.updateOrderStatus(order);
 					
-//System.out.println("===========pay 132 修改订单状态==============");
 					//修改优惠券状态
 					order=cartService.selectOrderInfoById(order);
-					
-//System.out.println("===========pay 136 修改订单状态=============="+order.getSalesOrderid());
 					String couponId=order.getCouponId();
-					
 					if(couponId!=null && !couponId.equals("")){
 						CouponItem couponItem=new CouponItem();
 						couponItem.setCouponItemId(couponId);
@@ -196,29 +199,29 @@ public class ResponseWechatPayHandler {
 						couponItemService.updateCouponItemById(couponItem);
 					}
 					//更新账户余额
-					int balancePayAmount=order.getBalancePayAmount();
-					if(balancePayAmount>0){
-						Member member=new Member();
-						member.setUserOpenid(order.getSalesOpenid());
-						member.setUserIncome(-balancePayAmount);
-						memberService.updateUserIncomeByOpenId(member);
-						
-						//现金使用记录
-						CashLog log=new CashLog();
-						log.setCashLogsIntroduction("订单支出");
-						log.setCashLogsNum(balancePayAmount);
-						log.setCashLogsOpenid(member.getUserOpenid());
-						log.setCashLogsType(2);
-						log.setCashLogsResType(3);
-						log.setCashLogsOrderid(order.getSalesOrderid());
-						log.setCashLogsCreateDate(nowDate);
-						count=cashLogService.addCashLog(log);
-					}
-					if (count < 1) {
-						resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-					}
+//					int balancePayAmount=order.getBalancePayAmount();
+//					if(balancePayAmount>0){
+//						Member member=new Member();
+//						member.setUserOpenid(order.getSalesOpenid());
+//						member.setUserIncome(-balancePayAmount);
+//						memberService.updateUserIncomeByOpenId(member);
+//
+//						//现金使用记录
+//						CashLog log=new CashLog();
+//						log.setCashLogsIntroduction("订单支出");
+//						log.setCashLogsNum(balancePayAmount);
+//						log.setCashLogsOpenid(member.getUserOpenid());
+//						log.setCashLogsType(2);
+//						log.setCashLogsResType(3);
+//						log.setCashLogsOrderid(order.getSalesOrderid());
+//						log.setCashLogsCreateDate(nowDate);
+//						count=cashLogService.addCashLog(log);
+//					}
+//					if (count < 1) {
+//						resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
+//					}
 
-					// 给订单的回调修改状态
+					// 批量修改产品销售量
 					try {
 						MQMessage message = new MQMessage();
 						message.setServiceToMessage(orderIdMD5);
@@ -230,9 +233,29 @@ public class ResponseWechatPayHandler {
 						message.setServiceType(1);
 						mQservice.insertMQMessage(message);
 					} catch (Exception e) {
-						// TODO: handle exception
+						e.printStackTrace();
 					}
-					System.out.println("被邀请人订单状态："+o.getSalesIsSpellOrder()+"------------------------");
+
+					//订单结算获取获取积分
+					try{
+						Integer configId = 2;		//日常 - 订单结算获取积分X*0.1
+						Promotions promotions = activityUtil.getAllPromotions();
+						if(promotions != null && promotions.getIntegralConfigList() !=null && promotions.getIntegralConfigList().size() > 0){
+							List<IntegralConfig> integralConfigList = promotions.getIntegralConfigList();
+							configId = integralConfigList.get(0).getInteConfId();
+						}
+
+						//获取积分
+						Integer flag = integralLogService.addOrderChangIntegra(o.getSalesOrderid(),configId);
+						if(flag < 1){
+							logger.info("订单获取积分失败，订单编号："+o.getSalesOrderid());
+						}
+					}catch (Exception e){
+						logger.info("error+订单获取积分失败，订单编号："+o.getSalesOrderid());
+						e.printStackTrace();
+					}
+
+					//RST推送订单
 					//拼单订单暂时不推送，拼单成功后推送
 					if(o.getSalesIsSpellOrder() == null || o.getSalesIsSpellOrder() == 2){
 						// 给rst推送订单
@@ -250,156 +273,151 @@ public class ResponseWechatPayHandler {
 							e.printStackTrace();
 						}
 					}
+
 					/*Member members = WechatUtils.getUserBySession(request); */// 当前用户
 					/**
 					 * 修改拼单信息并推送
 					 */
-					System.out.println("被邀请人订单编号："+o.getSalesSpellOrderId()+"------------------------");
-					if(o.getSalesSpellOrderId() != null && !o.getSalesSpellOrderId().equals("")){
-						//邀请人订单修改
-						Order or1 = new Order();
-						or1.setSalesOrderid(o.getSalesSpellOrderId());
-						or1.setSalesStatus(2);
-						or1.setSalesSpellOrderId(o.getSalesOrderid());
-						cartService.updateOrderSpellOrderId(or1);//修改状态为已支付，待发货，关联拼单订单id
-						//邀请人信息state
-						Order orderOne = new Order();
-						orderOne.setSalesOrderid(o.getSalesSpellOrderId());
-						orderOne = cartService.selectOrderInfoById(orderOne);
-						List<ShopOrderItemDto> orderItems1 = cartService.selectShopOrderItem(o.getSalesSpellOrderId());
-						//邀请人信息end
-						//被邀请人信息state
-						Order orderTwo = new Order();
-						orderTwo.setSalesOrderid(order.getSalesOrderid());
-						orderTwo = cartService.selectOrderInfoById(orderTwo);
-						List<ShopOrderItemDto> orderItems2 = cartService.selectShopOrderItem(o.getSalesOrderid());
-
-						Member	memberTwo = memberService.getMemberByUserOpenId(orderTwo.getSalesOpenid());
-						//被邀请人信息end
-						if(orderOne.getSalesOpenid() != null){
-							Member	memberOne = memberService.getMemberByUserOpenId(orderOne.getSalesOpenid());
-							String name = "我";
-							if(memberOne != null && !memberOne.getUserNickname().equals("")){
-
-								try {
-									name = URLDecoder.decode(memberOne.getUserNickname(),"UTF-8");
-								} catch (UnsupportedEncodingException e) {
-									e.printStackTrace();
-								}
-							}
-							String names  = name +","+(memberTwo.getUserNickname() == null? "微信好友": memberTwo.getUserNickname());
-							try {
-								names  = name +","+(memberTwo.getUserNickname() == null? "微信好友": URLDecoder.decode(memberTwo.getUserNickname(),"UTF-8"));
-							} catch (UnsupportedEncodingException e) {
-								e.printStackTrace();
-							}
-							//推送微信模板消息
-							try {
-								sendMessageUtil.spellPush(
-										"恭喜您与"+name+"拼单成功，点击逛逛更多好货吧。",
-										orderItems1.get(0).getItemProductName(),
-										names,
-										"点击查看拼单详情>>",
-										orderOne.getSalesOpenid(),
-										ResultInfo.ORDER_GUOQI+"?salesStatus=2");
-							}catch (Exception e){
-								logger.info("推送拼单成功消息失败，失败openId："+orderOne.getSalesOpenid());
-								e.printStackTrace();
-							}
-						}
-						// 给邀请人推送订单
-                        logger.info("微信账户支付推送拼单成功消息-------------------------------------------------3");
-						try {
-							MQMessage message = new MQMessage();
-							message.setServiceToMessage(o.getSalesSpellOrderId());
-							message.setServiceOtherMessage("efast.trade.new.add");
-							message.setServiceIsSend(2);			// 没有推送的信息
-							message.setServiceStatus(1); 			// 推送成功
-							message.setServiceType(1); 				// 添加订单信息
-							message.setServiceHandlerObjectName("efastOrderServiceImpl");
-							message.setServiceHandlerMethodName("addOrderInfoToEfast");
-							mQservice.insertMQMessage(message);
-						} catch (Exception e) {
-							e.printStackTrace();
-						}
-
-
-						//被邀请人（当前）订单修改
-						Order or2 = new Order();
-						or2.setSalesOrderid(order.getSalesOrderid());
-						or2.setSalesStatus(2);
-						or2.setSalesSpellOrderId(orderOne.getSalesOrderid());
-						cartService.updateOrderSpellOrderId(or2);
-
-						if(o.getSalesOpenid() != null){
-							Member	memberOne = memberService.getMemberByUserOpenId(orderOne.getSalesOpenid());
-							String name = "微信好友";
-							if(memberOne != null && !memberOne.getUserNickname().equals("")){
-								try {
-									name = URLDecoder.decode(memberOne.getUserNickname(),"UTF-8");
-								} catch (UnsupportedEncodingException e) {
-									e.printStackTrace();
-								}
-							}
-							String names  = memberTwo.getUserNickname() == null? "我": memberTwo.getUserNickname() +","+name;
-							try {
-								names  = memberTwo.getUserNickname() == null? "我": URLDecoder.decode(memberTwo.getUserNickname(),"UTF-8") +","+name;
-							} catch (UnsupportedEncodingException e) {
-								e.printStackTrace();
-							}
-							//推送微信模板消息
-                            logger.info("微信账户支付推送拼单成功消息-------------------------------------------------4");
-							try {
-								sendMessageUtil.spellPush(
-										"恭喜您与"+name+"拼单成功，点击逛逛更多好货吧。",
-										orderItems2.get(0).getItemProductName(),
-										names,
-										"点击查看拼单详情>>",
-										o.getSalesOpenid(),
-										ResultInfo.ORDER_GUOQI+"?salesStatus=2");
-							}catch (Exception e){
-								logger.info("推送拼单成功消息失败，失败openId："+o.getSalesOpenid());
-								e.printStackTrace();
-							}
-						}
-
-						// 给被邀请人推送订单
-						try {
-							MQMessage message = new MQMessage();
-							message.setServiceToMessage(order.getSalesOrderid());
-							message.setServiceOtherMessage("efast.trade.new.add");
-							message.setServiceIsSend(2);			// 没有推送的信息
-							message.setServiceStatus(1); 			// 推送成功
-							message.setServiceType(1); 				// 添加订单信息
-							message.setServiceHandlerObjectName("efastOrderServiceImpl");
-							message.setServiceHandlerMethodName("addOrderInfoToEfast");
-							mQservice.insertMQMessage(message);
-						} catch (Exception e) {
-							e.printStackTrace();
-						}
-					}
-
-
+//					System.out.println("被邀请人订单编号："+o.getSalesSpellOrderId()+"------------------------");
+//					if(o.getSalesSpellOrderId() != null && !o.getSalesSpellOrderId().equals("")){
+//						//邀请人订单修改
+//						Order or1 = new Order();
+//						or1.setSalesOrderid(o.getSalesSpellOrderId());
+//						or1.setSalesStatus(2);
+//						or1.setSalesSpellOrderId(o.getSalesOrderid());
+//						cartService.updateOrderSpellOrderId(or1);//修改状态为已支付，待发货，关联拼单订单id
+//						//邀请人信息state
+//						Order orderOne = new Order();
+//						orderOne.setSalesOrderid(o.getSalesSpellOrderId());
+//						orderOne = cartService.selectOrderInfoById(orderOne);
+//						List<ShopOrderItemDto> orderItems1 = cartService.selectShopOrderItem(o.getSalesSpellOrderId());
+//						//邀请人信息end
+//						//被邀请人信息state
+//						Order orderTwo = new Order();
+//						orderTwo.setSalesOrderid(order.getSalesOrderid());
+//						orderTwo = cartService.selectOrderInfoById(orderTwo);
+//						List<ShopOrderItemDto> orderItems2 = cartService.selectShopOrderItem(o.getSalesOrderid());
+//
+//						Member	memberTwo = memberService.getMemberByUserOpenId(orderTwo.getSalesOpenid());
+//						//被邀请人信息end
+//						if(orderOne.getSalesOpenid() != null){
+//							Member	memberOne = memberService.getMemberByUserOpenId(orderOne.getSalesOpenid());
+//							String name = "我";
+//							if(memberOne != null && !memberOne.getUserNickname().equals("")){
+//
+//								try {
+//									name = URLDecoder.decode(memberOne.getUserNickname(),"UTF-8");
+//								} catch (UnsupportedEncodingException e) {
+//									e.printStackTrace();
+//								}
+//							}
+//							String names  = name +","+(memberTwo.getUserNickname() == null? "微信好友": memberTwo.getUserNickname());
+//							try {
+//								names  = name +","+(memberTwo.getUserNickname() == null? "微信好友": URLDecoder.decode(memberTwo.getUserNickname(),"UTF-8"));
+//							} catch (UnsupportedEncodingException e) {
+//								e.printStackTrace();
+//							}
+//							//推送微信模板消息
+//							try {
+//								sendMessageUtil.spellPush(
+//										"恭喜您与"+name+"拼单成功，点击逛逛更多好货吧。",
+//										orderItems1.get(0).getItemProductName(),
+//										names,
+//										"点击查看拼单详情>>",
+//										orderOne.getSalesOpenid(),
+//										ResultInfo.ORDER_GUOQI+"?salesStatus=2");
+//							}catch (Exception e){
+//								logger.info("推送拼单成功消息失败，失败openId："+orderOne.getSalesOpenid());
+//								e.printStackTrace();
+//							}
+//						}
+//						// 给邀请人推送订单
+//                        logger.info("微信账户支付推送拼单成功消息-------------------------------------------------3");
+//						try {
+//							MQMessage message = new MQMessage();
+//							message.setServiceToMessage(o.getSalesSpellOrderId());
+//							message.setServiceOtherMessage("efast.trade.new.add");
+//							message.setServiceIsSend(2);			// 没有推送的信息
+//							message.setServiceStatus(1); 			// 推送成功
+//							message.setServiceType(1); 				// 添加订单信息
+//							message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//							message.setServiceHandlerMethodName("addOrderInfoToEfast");
+//							mQservice.insertMQMessage(message);
+//						} catch (Exception e) {
+//							e.printStackTrace();
+//						}
+//
+//
+//						//被邀请人（当前）订单修改
+//						Order or2 = new Order();
+//						or2.setSalesOrderid(order.getSalesOrderid());
+//						or2.setSalesStatus(2);
+//						or2.setSalesSpellOrderId(orderOne.getSalesOrderid());
+//						cartService.updateOrderSpellOrderId(or2);
+//
+//						if(o.getSalesOpenid() != null){
+//							Member	memberOne = memberService.getMemberByUserOpenId(orderOne.getSalesOpenid());
+//							String name = "微信好友";
+//							if(memberOne != null && !memberOne.getUserNickname().equals("")){
+//								try {
+//									name = URLDecoder.decode(memberOne.getUserNickname(),"UTF-8");
+//								} catch (UnsupportedEncodingException e) {
+//									e.printStackTrace();
+//								}
+//							}
+//							String names  = memberTwo.getUserNickname() == null? "我": memberTwo.getUserNickname() +","+name;
+//							try {
+//								names  = memberTwo.getUserNickname() == null? "我": URLDecoder.decode(memberTwo.getUserNickname(),"UTF-8") +","+name;
+//							} catch (UnsupportedEncodingException e) {
+//								e.printStackTrace();
+//							}
+//							//推送微信模板消息
+//                            logger.info("微信账户支付推送拼单成功消息-------------------------------------------------4");
+//							try {
+//								sendMessageUtil.spellPush(
+//										"恭喜您与"+name+"拼单成功，点击逛逛更多好货吧。",
+//										orderItems2.get(0).getItemProductName(),
+//										names,
+//										"点击查看拼单详情>>",
+//										o.getSalesOpenid(),
+//										ResultInfo.ORDER_GUOQI+"?salesStatus=2");
+//							}catch (Exception e){
+//								logger.info("推送拼单成功消息失败，失败openId："+o.getSalesOpenid());
+//								e.printStackTrace();
+//							}
+//						}
+//
+//						// 给被邀请人推送订单
+//						try {
+//							MQMessage message = new MQMessage();
+//							message.setServiceToMessage(order.getSalesOrderid());
+//							message.setServiceOtherMessage("efast.trade.new.add");
+//							message.setServiceIsSend(2);			// 没有推送的信息
+//							message.setServiceStatus(1); 			// 推送成功
+//							message.setServiceType(1); 				// 添加订单信息
+//							message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//							message.setServiceHandlerMethodName("addOrderInfoToEfast");
+//							mQservice.insertMQMessage(message);
+//						} catch (Exception e) {
+//							e.printStackTrace();
+//						}
+//					}
 
 					try {	//修改用户购买记录为已购买
 						memberService.updateIsBaughtByOpenid(wpr.getOpenid(), 2);
 						//更新用户绑定状态
-						Member member = memberService.getMemberByUserOpenId(order.getSalesOpenid());
-						if (member.getUserIsFlag()!= null && member.getUserIsFlag() == 1) {
-							member.setUserIsFlag(2);//终身绑定
-							homeService.updateMemberIsFlagByOpenid(member);
-						}
-						QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(order.getSalesOpenid());//为用户生成二维码
-						logger.info("为用户-->" + order.getSalesOpenid() + ",生成二维码:" + qr.getQroceUrl());
+//						Member member = memberService.getMemberByUserOpenId(order.getSalesOpenid());
+//						if (member.getUserIsFlag()!= null && member.getUserIsFlag() == 1) {
+//							member.setUserIsFlag(2);//终身绑定
+//							homeService.updateMemberIsFlagByOpenid(member);
+//						}
+//						QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(order.getSalesOpenid());//为用户生成二维码
+//						logger.info("为用户-->" + order.getSalesOpenid() + ",生成二维码:" + qr.getQroceUrl());
 					} catch (Exception e) {
 						System.out.println("修改已购买状态和终身绑定失败!");
 						e.printStackTrace();
 					}
 
-
-
-
-
 				} else {
 					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
 					logger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
@@ -1093,29 +1111,113 @@ public class ResponseWechatPayHandler {
 	 * @param orderId
 	 * @return
 	 */
-//	@ResponseBody
-//	@RequestMapping(value = "/test_order")
-//	public ResultMsg checkOrderPaySuccess(
-//			@RequestParam(value = "orderId") String orderId) {
-//		ResultMsg msg = new ResultMsg();
-//
-//		// 给rst推送订单
+	@ResponseBody
+	@RequestMapping(value = "/test_order")
+	public ResultMsg checkOrderPaySuccess(
+			@RequestParam(value = "orderId") String orderId) {
+		ResultMsg msg = new ResultMsg();
+
+		String orderIdMD5 = orderId;
+
+		Order o = new Order();
+		o.setSalesOrderid(orderIdMD5);
+		o = cartService.selectOrderInfoById(o);
+
+		Date nowDate = new Date();
+		// 组装数据
+		Order order = new Order();
+		order.setSalesOrderid(orderIdMD5);
+		if(o.getSalesIsSpellOrder() != null && o.getSalesIsSpellOrder() == 1){
+			order.setSalesStatus(15); // 正在拼单
+		}else{
+			order.setSalesStatus(2); // 已支付
+		}
+
+		order.setSalesTransactionId("xxxxxxxxxxxxxxxxxx"); // 微信支付ID
+		order.setSalesTransactionDate(new Date()); // 微信支付时间
+		order.setSalesOpenid(o.getSalesOpenid());
+
+		// 修改订单状态
+		int count = cartService.updateOrderStatus(order);
+
+		//修改优惠券状态
+		order=cartService.selectOrderInfoById(order);
+		String couponId=order.getCouponId();
+		if(couponId!=null && !couponId.equals("")){
+			CouponItem couponItem=new CouponItem();
+			couponItem.setCouponItemId(couponId);
+			couponItem.setCouponUseStatus(2);
+			couponItem.setCouponUseDate(new Date());
+			couponItemService.updateCouponItemById(couponItem);
+		}
+		// 批量修改产品销售量
 //		try {
 //			MQMessage message = new MQMessage();
-//			message.setServiceToMessage(orderId);
-//			message.setServiceOtherMessage("efast.trade.new.add");
+//			message.setServiceToMessage(orderIdMD5);
+//			message.setServiceOtherMessage("xxxxxxxxxxxxxxxx");
 //			message.setServiceIsSend(2);			// 没有推送的信息
 //			message.setServiceStatus(1); 			// 推送成功
-//			message.setServiceType(1); 				// 添加订单信息
-//			message.setServiceHandlerObjectName("efastOrderServiceImpl");
-//			message.setServiceHandlerMethodName("addOrderInfoToEfast");
+//			message.setServiceHandlerObjectName("cartServiceImpl");
+//			message.setServiceHandlerMethodName("supdateStateByOrderId");
+//			message.setServiceType(1);
 //			mQservice.insertMQMessage(message);
 //		} catch (Exception e) {
 //			e.printStackTrace();
 //		}
-//
-//
-//		return msg;
-//	}
+
+		//订单结算获取获取积分
+		try{
+			Integer configId = 2;		//日常 - 订单结算获取积分X*0.1
+			Promotions promotions = activityUtil.getAllPromotions();
+			if(promotions != null && promotions.getIntegralConfigList() !=null && promotions.getIntegralConfigList().size() > 0){
+				List<IntegralConfig> integralConfigList = promotions.getIntegralConfigList();
+				configId = integralConfigList.get(0).getInteConfId();
+			}
+
+			//获取积分
+			Integer flag = integralLogService.addOrderChangIntegra(o.getSalesOrderid(),configId);
+			if(flag < 1){
+				logger.info("订单获取积分失败，订单编号："+o.getSalesOrderid());
+			}
+		}catch (Exception e){
+			logger.info("error+订单获取积分失败，订单编号："+o.getSalesOrderid());
+			e.printStackTrace();
+		}
+
+		//RST推送订单
+		//拼单订单暂时不推送，拼单成功后推送
+//		if(o.getSalesIsSpellOrder() == null || o.getSalesIsSpellOrder() == 2){
+//			// 给rst推送订单
+//			try {
+//				MQMessage message = new MQMessage();
+//				message.setServiceToMessage(orderIdMD5);
+//				message.setServiceOtherMessage("efast.trade.new.add");
+//				message.setServiceIsSend(2);			// 没有推送的信息
+//				message.setServiceStatus(1); 			// 推送成功
+//				message.setServiceType(1); 				// 添加订单信息
+//				message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//				message.setServiceHandlerMethodName("addOrderInfoToEfast");
+//				mQservice.insertMQMessage(message);
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//			}
+//		}
+
+		try {	//修改用户购买记录为已购买
+			memberService.updateIsBaughtByOpenid(o.getSalesOpenid(), 2);
+			//更新用户绑定状态
+//			Member member = memberService.getMemberByUserOpenId(order.getSalesOpenid());
+//			if (member.getUserIsFlag()!= null && member.getUserIsFlag() == 1) {
+//				member.setUserIsFlag(2);//终身绑定
+//				homeService.updateMemberIsFlagByOpenid(member);
+//			}
+//			QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(order.getSalesOpenid());//为用户生成二维码
+//			logger.info("为用户-->" + order.getSalesOpenid() + ",生成二维码:" + qr.getQroceUrl());
+		} catch (Exception e) {
+			System.out.println("修改已购买状态和终身绑定失败!");
+			e.printStackTrace();
+		}
+		return msg;
+	}
 
 }

watero-wechat-web/src/main/java/com/iamberry/wechat/utils/StitchAttrUtil.java

@@ -0,0 +1,179 @@
+package com.iamberry.wechat.utils;
+
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 解决rst列表参数拼接问题
+ */
+public class StitchAttrUtil {
+
+    public static StitchAttrUtil getSa(){
+        return new StitchAttrUtil();
+    }
+
+    private StitchAttrUtil(){
+        propertySet = new HashSet<String>(Arrays.asList(noProperty));
+    };
+
+    /**
+     * 组装参数时，会过滤以下参数
+     * 推荐使用：addDatePro()，添加过滤
+     */
+    // TODO: 2018/8/28  time 的转换调整，支持一个类中有有多种time的格式，因此注释掉初始化的time的Set，只能使用addDatePro()
+//    private final  String timeDate[] = {};
+
+    /**
+     * 控制时间参数格式
+     * 推荐使用：addDatePro()，添加过滤
+     */
+    private final String noProperty[] = {
+            "serialVersionUID",
+            "page"
+    };
+
+
+    private Set<String> propertySet;
+    private Map<String,SimpleDateFormat> timeMap = new HashMap<String,SimpleDateFormat>();
+
+    /**
+     * 组装ModelAndView
+     * @param object
+     * @param modelAndView
+     * @param url
+     * @param pagedResult
+     * @throws IllegalAccessException
+     */
+    public void setModelAndView(Object object, ModelAndView modelAndView, String url, PagedResult<?> pagedResult) {
+        StringBuilder sb = new StringBuilder(url);
+
+        if(pagedResult.getTotal() != 0) {
+            pagedResult.setPages((int) Math.ceil((double)pagedResult.getTotal()/pagedResult.getPageSize()));
+        }
+
+        sb.append("?pageSize=" + pagedResult.getPageSize());
+        sb.append("&totalNum=" + pagedResult.getTotal() );
+        this.setUrlByObj(sb,object);
+        sb.append("&&pageNO=");
+
+        Map<String, Object> map = this.getObjToMap(object);
+        modelAndView.addAllObjects(map);
+
+        modelAndView.addObject("page", pagedResult);
+        modelAndView.addObject("url", sb.toString());
+
+        modelAndView.addObject("pageNO", pagedResult.getPageNO());
+        modelAndView.addObject("pageSize", pagedResult.getPages());
+        return;
+    }
+
+    /**
+     * 将obj 转为map，
+     * 属性值为null的不会 put 到 Map 中
+     * 属性名称在  noProperty 数组中的属性不会 put 到 Map 中
+     * @param object
+     * @return
+     * @throws IllegalAccessException
+     */
+    public Map<String, Object> getObjToMap(Object object) {
+        Map<String, Object> map = new HashMap<>();
+        Class<?> clazz = object.getClass();
+        for (Field field : clazz.getDeclaredFields()) {
+            field.setAccessible(true);
+            String fieldName = field.getName();
+            Object value = null;
+            try {
+                value = field.get(object);
+            }catch (IllegalAccessException e){
+            }
+            if (value != null && !propertySet.contains(fieldName)) {
+                map.put(fieldName, value);
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 拼接url
+     * @param sb
+     * @param object
+     * @throws IllegalAccessException
+     */
+    public void setUrlByObj(StringBuilder sb,Object object){
+        Class<?> clazz = object.getClass();
+        for (Field field : clazz.getDeclaredFields()) {
+            field.setAccessible(true);
+            String fieldName = field.getName();
+            Object value = null;
+            try {
+                value = field.get(object);
+            }catch (IllegalAccessException e){
+            }
+            if (value != null && !propertySet.contains(fieldName)) {
+                /* 遍历map,将时间格式进行转换 */
+                for (Map.Entry<String, SimpleDateFormat> entry : timeMap.entrySet()) {
+                    if(entry.getKey().equals(fieldName)){
+                        value = entry.getValue().format(value);
+                    }
+                }
+                sb.append("&"+fieldName+ "=" + value.toString());
+            }
+        }
+    }
+
+    /**
+     * 判断是否还有下一页
+     * @param pagedResult
+     * @return
+     */
+    public boolean getLastPage( PagedResult<?> pagedResult){
+        /* 当前页 >= 总页面数目 */
+        if(pagedResult.getPageNO() >=  pagedResult.getPages()){
+            return false;
+        }else{
+            return true;
+        }
+    }
+
+    /**
+     * 添加组装时被过滤的属性名称
+     * @param pros
+     */
+    public StitchAttrUtil addNoPro(String...pros){
+        for(String pro : pros){
+            if(pro != null && !"".equals(pro))
+                propertySet.add(pro);
+        }
+        return this;
+    }
+
+    /**
+     * 添加时间参数格式
+     * @param fom   //"yyyy-MM-dd HH:mm:ss"
+     * @param pros
+     */
+    public StitchAttrUtil addDatePro(String fom, String...pros){
+        SimpleDateFormat sdf = new SimpleDateFormat(fom);
+        for(String pro : pros){
+            if(pro != null && !"".equals(pro)){
+                timeMap.put(pro,sdf);
+            }
+        }
+        return this;
+    }
+
+    /**
+     * 给page赋值
+     * @param pagedResult
+     */
+    public static void setPage(PagedResult<?> pagedResult){
+        if(pagedResult.getTotal() != 0) {
+            pagedResult.setPages((int) Math.ceil((double)pagedResult.getTotal()/pagedResult.getPageSize()));
+        }
+    }
+
+}

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

@@ -248,8 +248,19 @@
 		<!--团购-->
 		<!--<typeAlias type="com.iamberry.wechat.core.entity.order.ShopSpellInfo" alias="ShopSpellInfo"/>-->
 
+		<!--积分-->
+		<typeAlias type="com.iamberry.wechat.core.entity.ism.IntegralConfig" alias="IntegralConfig"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.ism.IntegralLog" alias="IntegralLog"/>
+
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
+	<!-- PageHelper -->
+	<plugins>
+		<plugin interceptor="com.github.pagehelper.PageInterceptor">
+			<property name="reasonable" value="true"/>
+			<property name="pageSizeZero" value="true"/>
+		</plugin>
+	</plugins>
 	<mappers>
 		<mapper resource="com/iamberry/wechat/service/mapper/adminBannerMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/adminChildPermissionsMapper.xml"/>
@@ -355,5 +366,8 @@
 		<mapper resource="com/iamberry/wechat/service/mapper/giftConditionMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/itemGiftMapper.xml"/>
 
+		<!--赠品-->
+		<mapper resource="com/iamberry/wechat/service/mapper/integralConfigMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/IntegralLogMapper.xml"/>
 	</mappers>
 </configuration>

watero-wechat-web/src/main/resources/iamberry-wechat-web-ioc.xml

@@ -51,7 +51,7 @@
 	<bean id="loadResultInfo" class="com.iamberry.wechat.tools.loadResultUtil" lazy-init="false"></bean>
 
 	<!-- 开启注解启动定时器 -->
-    <!--<task:annotation-driven/>-->
+    <task:annotation-driven/>
     <!-- 将30天后奖励积分的定时任务的xml引入 -->
 	<!--<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>-->