牙刷优惠券修改

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

@@ -0,0 +1,60 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+import  java.io.Serializable;
+/**
+ *  优惠券对应颜色类
+ * @author xm
+ * @Date 2019-05-15
+ */
+public class CouponColor  implements  Serializable{
+    //id
+    private Integer coupColId;
+    //优惠券类型ID
+    private Integer couponId;
+    //颜色id
+    private Integer colorId;
+    //是否直接全额抵扣 1：是 2：否
+    private Integer coupColIsDeduction;
+    //备注'
+    private String couponColorRemark;
+
+    public Integer getCoupColId(){
+        return coupColId;
+    }
+
+    public void setCoupColId(Integer  coupColId){
+        this.coupColId=coupColId;
+    }
+
+    public Integer getCouponId(){
+        return couponId;
+    }
+
+    public void setCouponId(Integer  couponId){
+        this.couponId=couponId;
+    }
+
+    public Integer getColorId(){
+        return colorId;
+    }
+
+    public void setColorId(Integer  colorId){
+        this.colorId=colorId;
+    }
+
+    public Integer getCoupColIsDeduction(){
+        return coupColIsDeduction;
+    }
+
+    public void setCoupColIsDeduction(Integer  coupColIsDeduction){
+        this.coupColIsDeduction=coupColIsDeduction;
+    }
+
+    public String getCouponColorRemark(){
+        return couponColorRemark;
+    }
+
+    public void setCouponColorRemark(String  couponColorRemark){
+        this.couponColorRemark=couponColorRemark;
+    }
+}

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

@@ -40,12 +40,12 @@ public class CouponItemDto implements java.io.Serializable{
 	private String couponItemRemark;			//优惠券详情备注
 	private PageBean page;						//分页
 
-	private Integer couponIsNewPeople;			//是否为新人优惠券 1:是  2：否
-
 	private Integer couponIsUse;			//判断是否可用  1：可以使用    2：不可用
 	private String couponNoUseReason;			//不可用说明
-
-	private Integer couponIsPurchase;			//是否必须购买 1：是  2：否    soosd  控制只有必须购买牙刷
+	private Integer couponIsPurchase;			//是否必须购买 1：是  2：否    soosd  控制只有必须购买牙刷	//使用"couponIsUniversal"部分使用功能
+	private Integer couponIsNewPeople;			//是否为新人优惠券 1:是  2：否
+	private Integer couponIsUniversal;  //是否为全场通用   1:全场通用  2：部分能使用
+	private Integer couponIsVip;  //是否需要vip才能购买  1：需要   2：不需要
 
 	public Integer getCouponIsNewPeople() {
 		return couponIsNewPeople;
@@ -185,4 +185,20 @@ public class CouponItemDto implements java.io.Serializable{
 	public void setCouponToothbrushEnough(Integer couponToothbrushEnough) {
 		this.couponToothbrushEnough = couponToothbrushEnough;
 	}
+
+	public Integer getCouponIsUniversal() {
+		return couponIsUniversal;
+	}
+
+	public void setCouponIsUniversal(Integer couponIsUniversal) {
+		this.couponIsUniversal = couponIsUniversal;
+	}
+
+	public Integer getCouponIsVip() {
+		return couponIsVip;
+	}
+
+	public void setCouponIsVip(Integer couponIsVip) {
+		this.couponIsVip = couponIsVip;
+	}
 }

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

@@ -57,6 +57,8 @@ public class CouponType implements Serializable{
 	private Integer couponIsExchange;  //是否可用积分兑换  1：允许； 2：不允许；
 	private String couponExchangeNum;	//所需积分数
 	private Integer couponIsNewPeople;  //是否为新人优惠券  1：是  2：否
+	private Integer couponIsUniversal;  //是否为全场通用   1:全场通用  2：部分能使用
+	private Integer couponIsVip;  //是否需要vip才能购买  1：需要   2：不需要
 
 	public Integer getCouponIsSource() {
 		return couponIsSource;
@@ -226,6 +228,22 @@ public class CouponType implements Serializable{
 		this.couponToothbrushEnough = couponToothbrushEnough;
 	}
 
+	public Integer getCouponIsUniversal() {
+		return couponIsUniversal;
+	}
+
+	public void setCouponIsUniversal(Integer couponIsUniversal) {
+		this.couponIsUniversal = couponIsUniversal;
+	}
+
+	public Integer getCouponIsVip() {
+		return couponIsVip;
+	}
+
+	public void setCouponIsVip(Integer couponIsVip) {
+		this.couponIsVip = couponIsVip;
+	}
+
 	@Override
 	public String toString() {
 		return "CouponType [couponId=" + couponId + ", couponName="

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

@@ -0,0 +1,49 @@
+package com.iamberry.wechat.face.coupon;
+
+import com.iamberry.wechat.core.entity.coupon.CouponColor;
+
+import java.util.List;
+
+/**
+ *  优惠券对应颜色接口
+ * @author xm
+ * @Date 2019-05-15
+ */
+public interface CouponColorService {
+    /**
+     * 获取集合
+     * @param  couponColor
+     * @return List
+     */
+    List<CouponColor> getCouponColorList(CouponColor  couponColor);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  couponColor
+     */
+    CouponColor  getCouponColorById(Integer  id);
+    /**
+     * 增加数据
+     * @param  couponColor
+     * @return Integer
+     */
+    Integer  save(CouponColor  couponColor);
+    /**
+     * 修改数据
+     * @param  couponColor
+     * @return Integer
+     */
+    Integer  update(CouponColor  couponColor);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  couponColorList
+     * @return Integer
+     */
+    Integer  saveList(List<CouponColor>  couponColorList);
+}

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

@@ -2,6 +2,7 @@ package com.iamberry.wechat.face.coupon;
 
 import java.util.List;
 
+import com.iamberry.wechat.core.entity.cart.CartDto;
 import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
 /**
@@ -86,5 +87,12 @@ public interface CouponItemService {
 	 */
 	Integer allCouponItemNumber(CouponItem couponItem);
 
+	/**
+	 * 按照优惠券部分通用功能
+	 * 判断优惠券是否能使用
+	 * @return
+	 */
+	boolean isUniversal(Integer couponId, List<CartDto> cartDtoList);
+
 
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/apparatus/ApparatusServiceImpl.java

@@ -247,7 +247,9 @@ public class ApparatusServiceImpl implements ApparatusService {
             throw new RuntimeException("删除失败，查出多个牙刷");
         }
         apparatus = apparatusList.get(0);
-
+        if(apparatus.getColorId() == null || apparatus.getUserOpenid() == null){
+            throw new RuntimeException("删除失败，绑定牙刷有错误，请联系技术删除");
+        }
 
         //如果该用户只有一个牙刷，则不允许删除
         Apparatus appar = new Apparatus();

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

@@ -0,0 +1,74 @@
+package com.iamberry.wechat.service.coupon;
+
+import com.iamberry.wechat.core.entity.coupon.CouponColor;
+import com.iamberry.wechat.face.coupon.CouponColorService;
+import com.iamberry.wechat.service.mapper.CouponColorMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  优惠券对应颜色接口
+ * @author xm
+ * @Date 2019-05-15
+ */
+@Service
+public class CouponColorServiceImpl  implements CouponColorService {
+    @Autowired
+    private CouponColorMapper couponColorMapper;
+    /**
+     * 获取集合
+     * @param  couponColor
+     * @return List
+     */
+    @Override
+    public List<CouponColor> getCouponColorList(CouponColor  couponColor){
+        return  couponColorMapper.getCouponColorList(couponColor);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  couponColor
+     */
+    @Override
+    public  CouponColor  getCouponColorById(Integer  id){
+        return  couponColorMapper.getCouponColorById(id);
+    }
+    /**
+     * 增加数据
+     * @param  couponColor
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(CouponColor  couponColor){
+        return  couponColorMapper.save(couponColor);
+    }
+    /**
+     * 修改数据
+     * @param  couponColor
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(CouponColor  couponColor){
+        return  couponColorMapper.update(couponColor);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  couponColorMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  couponColorList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<CouponColor>  couponColorList){
+        return  couponColorMapper.saveList(couponColorList);
+    }
+}

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

@@ -1,7 +1,11 @@
 package com.iamberry.wechat.service.coupon;
 
 import java.util.List;
+import java.util.Objects;
 
+import com.iamberry.wechat.core.entity.cart.CartDto;
+import com.iamberry.wechat.core.entity.coupon.CouponColor;
+import com.iamberry.wechat.service.mapper.CouponColorMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,7 +24,8 @@ import com.iamberry.wechat.tools.StrUtils;
 public class CouponItemServiceImpl implements CouponItemService {
 	@Autowired
 	private CouponItemMapper couponItemMapper;
-	
+	@Autowired
+	private CouponColorMapper couponColorMapper;
 	
 	public List<CouponItemDto> getCouponItemDtoList(CouponItemDto couponItemDto) {
 		return couponItemMapper.getCouponItemDtoList(couponItemDto);
@@ -78,4 +83,20 @@ public class CouponItemServiceImpl implements CouponItemService {
 		return couponItemMapper.allCouponItemNumber(couponItem);
 	}
 
+	@Override
+	public boolean isUniversal(Integer couponId, List<CartDto> cartDtoList) {
+		boolean flag = false;
+		CouponColor couponColor= new CouponColor();
+		couponColor.setCouponId(couponId);
+		List<CouponColor> couponColorList = couponColorMapper.getCouponColorList(couponColor);
+		for (CouponColor cc:couponColorList) {
+			for (CartDto cd:cartDtoList) {
+				if(Objects.equals(cc.getColorId(), cd.getCartColorId())){
+					flag = true;
+				}
+			}
+		}
+		return flag;
+	}
+
 }

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

@@ -0,0 +1,49 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.coupon.CouponColor;
+
+import java.util.List;
+
+/**
+ *  优惠券对应颜色接口
+ * @author xm
+ * @Date 2019-05-15
+ */
+public interface CouponColorMapper {
+    /**
+     * 获取集合
+     * @param  couponColor
+     * @return List
+     */
+    List<CouponColor> getCouponColorList(CouponColor  couponColor);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  couponColor
+     */
+    CouponColor  getCouponColorById(Integer  id);
+    /**
+     * 增加数据
+     * @param  couponColor
+     * @return Integer
+     */
+    Integer  save(CouponColor  couponColor);
+    /**
+     * 修改数据
+     * @param  couponColor
+     * @return Integer
+     */
+    Integer  update(CouponColor  couponColor);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  couponColorList
+     * @return Integer
+     */
+    Integer  saveList(List<CouponColor>  couponColorList);
+}

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

@@ -0,0 +1,107 @@
+<?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.CouponColorMapper">
+    <resultMap  id="BaseResultMap" type="CouponColor" >
+        <result    column="coup_col_id"    property="coupColId" />
+        <result    column="coupon_id"    property="couponId" />
+        <result    column="color_id"    property="colorId" />
+        <result    column="coup_col_is_deduction"    property="coupColIsDeduction" />
+        <result    column="coupon_color_remark"    property="couponColorRemark" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.coup_col_id,
+        t.coupon_id,
+        t.color_id,
+        t.coup_col_is_deduction,
+        t.coupon_color_remark
+    </sql>
+    <select id="getCouponColorList" resultMap="BaseResultMap" parameterType="CouponColor" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_coupon_color t
+        <where>
+            <if test="coupColId != null ">
+                AND t.coup_col_id = #{coupColId}
+            </if >
+            <if test="couponId != null ">
+                AND t.coupon_id = #{couponId}
+            </if >
+            <if test="colorId != null ">
+                AND t.color_id = #{colorId}
+            </if >
+            <if test="coupColIsDeduction != null ">
+                AND t.coup_col_is_deduction = #{coupColIsDeduction}
+            </if >
+        </where>
+    </select>
+    <select id="getCouponColorById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_coupon_color t
+        where t.coup_col_id= #{coupColId}
+    </select>
+    <insert id="save" parameterType="CouponColor" >
+        insert into
+        tb_iamberry_coupon_color
+        (
+        coup_col_id,
+        coupon_id,
+        color_id,
+        coup_col_is_deduction,
+        coupon_color_remark
+        )
+        values
+        (
+        #{coupColId},
+        #{couponId},
+        #{colorId},
+        #{coupColIsDeduction},
+        #{couponColorRemark}
+        )
+    </insert>
+    <update id="update" parameterType="CouponColor" >
+        update
+        tb_iamberry_coupon_color
+        <set >
+            <if test="couponId != null ">
+                coupon_id = #{couponId},
+            </if >
+            <if test="colorId != null ">
+                color_id = #{colorId},
+            </if >
+            <if test="coupColIsDeduction != null ">
+                coup_col_is_deduction = #{coupColIsDeduction},
+            </if >
+            <if test="couponColorRemark != null and couponColorRemark != ''">
+                coupon_color_remark = #{couponColorRemark}
+            </if >
+        </set >
+        where coup_col_id= #{coupColId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete FROM
+        tb_iamberry_coupon_color
+        where coup_col_id=#{coupColId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_iamberry_coupon_color
+        (
+        coup_col_id,
+        coupon_id,
+        color_id,
+        coup_col_is_deduction,
+        coupon_color_remark
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+                #{node.coupColId},
+                #{node.couponId},
+                #{node.colorId},
+                #{node.coupColIsDeduction},
+                #{node.couponColorRemark}
+            )
+        </foreach >
+    </insert>
+</mapper>

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

@@ -22,7 +22,9 @@
  		CT.COUPON_REDUCE couponReduce,
  		CT.COUPON_IS_PURCHASE,
  		CT.COUPON_CONSUME_ENOUGH couponConsumeEnough,
- 		CT.coupon_toothbrush_enough couponToothbrushEnough
+ 		CT.coupon_toothbrush_enough couponToothbrushEnough,
+ 		CT.coupon_is_universal couponIsUniversal,
+ 		CT.coupon_is_vip couponIsVip
 	</sql>
  	<!-- 查询优惠券详情列表 分页 -->
  	<select id="getCouponItemDtoList" resultType="CouponItemDto" parameterType="CouponItemDto">

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

@@ -5,7 +5,9 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 
 import com.iamberry.wechat.core.entity.activity.Activity;
+import com.iamberry.wechat.core.entity.apparatus.Apparatus;
 import com.iamberry.wechat.face.activity.ActivityService;
+import com.iamberry.wechat.face.apparatus.ApparatusService;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,12 +47,12 @@ public class CouponTypeHandler {
 	private MemberService memberService;
 	@Autowired
 	private SystemService systemService;
-
+	@Autowired
+	private ApparatusService apparatusService;
 	@Autowired
 	private ActivityService activityService;
 
-	private static Logger logger = LoggerFactory
-			.getLogger(CouponTypeHandler.class);
+	private static Logger logger = LoggerFactory.getLogger(CouponTypeHandler.class);
 	/**
 	 * 领取优惠券的锁
 	 */
@@ -615,6 +617,18 @@ public class CouponTypeHandler {
 		activity.setUserOpenId(memberInfo.getUserOpenid());
 		List<Activity> activityList = activityService.getActivityList(activity);
 
+		boolean isNewLIps = false;
+		Apparatus apparatus = new Apparatus();
+		apparatus.setUserOpenid(memberInfo.getUserOpenid());
+		List<Apparatus> apparatusList = apparatusService.listApparatusPage(apparatus);
+		for (Apparatus app : apparatusList) {
+			if(app != null && app.getColorId() != null){
+				if(app.getColorId() == 100 || app.getColorId() == 101 || app.getColorId() == 102){
+					isNewLIps = true;
+				}
+			}
+		}
+
 		boolean flag = true;
 		if (couponItemDtoList != null && couponItemDtoList.size() > 0) {
 			if(couponItemDtoList.size() > 1){
@@ -658,12 +672,35 @@ public class CouponTypeHandler {
 			couponItem.setCouponUseStatus(1);
 			couponItem.setCouponIsDonation(2);
 			couponItem.setCouponItemRemark("新人优惠券");
-			if(couponItemService.insertCouponItem(couponItem) > 0){
+			Integer fl = couponItemService.insertCouponItem(couponItem);
+			if(fl < 1){
+				resultMsg.setResultCode(ResultInfo.ERRORCODE);
+				resultMsg.setMessage("领取出错");
+				resultMsg.setStatus(false);
+				return resultMsg;
+			}
+
+			if(isNewLIps){
+				CouponItem ci = new CouponItem();
+				ci.setCouponId(20001);
+				Calendar cdi = Calendar.getInstance();
+				cdi.add(Calendar.DATE,60);
+				ci.setCouponUseEndDate(cdi.getTime());//领取后一年有效
+				ci.setCouponReceiveDate(new Date());
+				ci.setCouponItemUseropenid(memberInfo.getUserOpenid());
+				ci.setCouponUseStatus(1);
+				ci.setCouponIsDonation(2);
+				ci.setCouponItemRemark("399轻奢款牙刷60元优惠券/仅限微商城使用");
+				fl = couponItemService.insertCouponItem(ci);
+			}
+			if(fl > 0){
 				resultMsg.setResultCode(ResultInfo.SUCCESSCODE);
 				resultMsg.setStatus(true);
 			}else{
 				resultMsg.setResultCode(ResultInfo.ERRORCODE);
+				resultMsg.setMessage("领取出错");
 				resultMsg.setStatus(false);
+				return resultMsg;
 			}
 		}
 		return resultMsg;

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

@@ -288,6 +288,9 @@
 		<!-- 客服信息 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.customer.CustomerInfo" alias="CustomerInfo"/>
 
+		<!-- 优惠券对应商品 -->
+		<typeAlias type="com.iamberry.wechat.core.entity.coupon.CouponColor" alias="CouponColor"/>
+
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
 	<!-- PageHelper -->
@@ -425,5 +428,8 @@
 		<!--活动-->
 		<mapper resource="com/iamberry/wechat/service/mapper/salesActivitiesMapper.xml"/>
 
+		<!--优惠券对应产品表-->
+		<mapper resource="com/iamberry/wechat/service/mapper/couponColorMapper.xml"/>
+
 	</mappers>
 </configuration>