双十二

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/apparatus/Apparatus.java

@@ -25,6 +25,9 @@ public class Apparatus implements java.io.Serializable{
 
     private Integer colorId;    //颜色id
 
+    private String userNickname;    //昵称
+    private String userTel;    //电话
+
     private PageBean page;			//分页
 
     public Integer getApparatusStore() {
@@ -122,4 +125,20 @@ public class Apparatus implements java.io.Serializable{
     public void setProductName(String productName) {
         this.productName = productName;
     }
+
+    public String getUserNickname() {
+        return userNickname;
+    }
+
+    public void setUserNickname(String userNickname) {
+        this.userNickname = userNickname;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
 }

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

@@ -44,8 +44,6 @@ public class OrderPayDto implements java.io.Serializable{
 
 	private String channelName;	//自提地点
 
-	private List<SalesActivities> salesActivitiesList = new ArrayList<>();	//满减
-
 	private ActivityDate activityDate = new ActivityDate();
 
 	public boolean isDisable() {
@@ -144,14 +142,6 @@ public class OrderPayDto implements java.io.Serializable{
 		this.channelName = channelName;
 	}
 
-	public List<SalesActivities> getSalesActivitiesList() {
-		return salesActivitiesList;
-	}
-
-	public void setSalesActivitiesList(List<SalesActivities> salesActivitiesList) {
-		this.salesActivitiesList = salesActivitiesList;
-	}
-
 	public ActivityDate getActivityDate() {
 		return activityDate;
 	}

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

@@ -4,8 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
+/**
+ * 活动内容
+ */
 public class ActivityDate implements Serializable{
     private static final long serialVersionUID = -2896156560873603394L;
     //开始时间
@@ -18,11 +23,13 @@ public class ActivityDate implements Serializable{
     private Date endDate;
     //类型：  1：双十二
     private Integer type;
-    //状态：  1：可用   2：停用
+    //状态：true
     private boolean status;
     //说明
     private String remark;
 
+    private List<SalesActivities> salesActivitiesList = new ArrayList<>();	//满减
+
     public Date getBeginDate() {
         return beginDate;
     }
@@ -62,4 +69,12 @@ public class ActivityDate implements Serializable{
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public List<SalesActivities> getSalesActivitiesList() {
+        return salesActivitiesList;
+    }
+
+    public void setSalesActivitiesList(List<SalesActivities> salesActivitiesList) {
+        this.salesActivitiesList = salesActivitiesList;
+    }
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/admin/SystemService.java

@@ -7,10 +7,17 @@ import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 public interface SystemService {
 
 	/**
-	 * 根据ID，获取一条系统规则
+	 * 根据ID，获取一条系统规则，缓存
 	 * @param id
 	 */
 	public ShopSystemRule selectOneShopRuleById(Integer id);
+
+
+	/**
+	 * 根据ID，获取一条系统规则，不缓存
+	 * @param id
+	 */
+	public ShopSystemRule selectOneShopRuleByIdDynamic(Integer id);
 	
 	/**
 	 * 查询所有系统规则

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/apparatus/ApparatusService.java

@@ -2,6 +2,8 @@ package com.iamberry.wechat.face.apparatus;
 
 import com.iamberry.wechat.core.entity.apparatus.Apparatus;
 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.core.entity.product.ProductRelatedRstProduce;
 
 import java.util.List;
@@ -19,6 +21,13 @@ public interface ApparatusService {
     List<Apparatus> listApparatusPage(Apparatus apparatus);
 
     /**
+     * 分页查询机器列表
+     * @param pageRequest
+     * @return
+     */
+    public PagedResult<Apparatus> listApparatusPageByAdmin(PageRequest<Apparatus> pageRequest);
+
+    /**
      * 添加机器信息
      * @param apparatus
      * @return
@@ -56,4 +65,11 @@ public interface ApparatusService {
      * 添加产品颜色与pts产品关联信息
      */
     Integer addColorIdByProductId(ProductRelatedRstProduce productRelatedRstProduce);
+
+    /**
+     * 删除牙刷
+     * @param code
+     * @return
+     */
+    Integer delTooth(String code);
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -120,4 +120,8 @@ public interface UseIntegralService {
      * @return List
      */
     List<UseIntegral>  getUseIntegralList(UseIntegral  useIntegral);
+
+
+
+
 }

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

@@ -1,5 +1,7 @@
 package com.iamberry.wechat.service.apparatus;
 
+import com.github.pagehelper.PageHelper;
+import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.apparatus.Apparatus;
 import com.iamberry.wechat.core.entity.integral.IntegralConfig;
@@ -7,15 +9,22 @@ import com.iamberry.wechat.core.entity.integral.MemberIntegral;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.integral.StayIntegral;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
 import com.iamberry.wechat.core.entity.product.ProductRelatedRstProduce;
 import com.iamberry.wechat.face.apparatus.ApparatusService;
+import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.service.mapper.ApparatusMapper;
 import com.iamberry.wechat.service.mapper.MemberMapper;
 import com.iamberry.wechat.service.mapper.SystemMapper;
 import com.iamberry.wechat.service.mapper.UseIntegralMapper;
+import com.iamberry.wechat.tools.ResultInfo;
+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 util.PageUtil;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -27,6 +36,9 @@ import java.util.List;
 @Service
 public class ApparatusServiceImpl implements ApparatusService {
 
+
+    private Logger logger = LoggerFactory.getLogger(ApparatusServiceImpl.class);
+
     @Autowired
     private ApparatusMapper apparatusMapper;
     @Autowired
@@ -37,12 +49,21 @@ public class ApparatusServiceImpl implements ApparatusService {
     private MemberMapper memberMapper;
 
 
+
     @Override
     public List<Apparatus> listApparatusPage(Apparatus apparatus) {
         return apparatusMapper.listApparatusPage(apparatus);
     }
 
     @Override
+    public PagedResult<Apparatus> listApparatusPageByAdmin(PageRequest<Apparatus> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<Apparatus> detedctList = apparatusMapper.listApparatusPageByAdmin(pageRequest.getData());
+        return PageUtil.getPage(detedctList);
+    }
+
+
+    @Override
     public Integer addApparatus(Apparatus apparatus) {
         return apparatusMapper.addApparatus(apparatus);
     }
@@ -208,4 +229,121 @@ public class ApparatusServiceImpl implements ApparatusService {
     public Integer addColorIdByProductId(ProductRelatedRstProduce productRelatedRstProduce) {
         return apparatusMapper.addColorIdByProductId(productRelatedRstProduce);
     }
+
+    @Override
+    @Transactional
+    public Integer delTooth(String code) {
+        Integer flag = 0;
+        Integer stayStatus=0; //待入账状态
+        Integer stayIntegraNum = 0; //积分
+        Apparatus apparatus = new Apparatus();
+        apparatus.setApparatusBarcode(code);
+        List<Apparatus> apparatusList = apparatusMapper.listApparatusPage(apparatus);
+        if(apparatusList == null || apparatusList.size() < 1){
+            throw new RuntimeException("删除失败，未查询出牙刷");
+        }
+        if(apparatusList != null && apparatusList.size() > 1){
+            throw new RuntimeException("删除失败，查出多个牙刷");
+        }
+        apparatus = apparatusList.get(0);
+
+
+        //如果该用户只有一个牙刷，则不允许删除
+        Apparatus appar = new Apparatus();
+        appar.setUserOpenid(apparatus.getUserOpenid());
+        List<Apparatus> apparList = apparatusMapper.listApparatusPage(appar);
+        if(apparList.size() < 2){
+            throw new RuntimeException("删除失败，该用户只有一个牙刷，不允许直接删除！");
+        }
+
+        //查询配置ID
+        IntegralConfig integralConfig = new IntegralConfig();
+        integralConfig.setIntegralConfigColorId(apparatus.getColorId());
+        List<IntegralConfig>  integralConfigList = useIntegralMapper.listIntegralConfig(integralConfig);
+        if(integralConfigList == null || integralConfigList.size() < 1){
+            throw new RuntimeException("删除失败，未查询出配置项");
+        }
+        if(integralConfigList != null && integralConfigList.size() > 1){
+            throw new RuntimeException("删除失败，查出多个颜色配置");
+        }
+        integralConfig = integralConfigList.get(0);
+
+        //查询待入账
+        StayIntegral stayIntegral = new StayIntegral();
+        stayIntegral.setConfigId(integralConfig.getIntegralConfigId());
+        stayIntegral.setUserOpenId(apparatus.getUserOpenid());
+        List<StayIntegral>  stayIntegralList = useIntegralMapper.listStayIntegral(stayIntegral);
+        if(stayIntegralList == null || stayIntegralList.size() < 1){
+            throw new RuntimeException("删除失败，未查询出待入账");
+        }
+        if(stayIntegralList != null && stayIntegralList.size() > 1){
+            throw new RuntimeException("删除失败，查出多个待入账");
+        }
+        stayIntegral = stayIntegralList.get(0);
+        stayStatus = stayIntegral.getStayStatus();
+        stayIntegraNum = stayIntegral.getStayNumber();
+
+        //修改待入账
+        StayIntegral si = new StayIntegral();
+        si.setStayId(stayIntegral.getStayId());
+        si.setStayStatus(4);
+        flag = useIntegralMapper.updatestayIntegralStatus(si);
+        if(flag < 1){
+            throw new RuntimeException("删除失败，修改待入账失败");
+        }
+
+        //修改日志
+        UseIntegral useIntegral = new UseIntegral();
+        useIntegral.setStayId(stayIntegral.getStayId());
+        useIntegral.setIntegralType(4);
+        flag = useIntegralMapper.updateUseIntegra(useIntegral);
+        if(flag < 1){
+            throw new RuntimeException("删除失败，修改入账记录失败");
+        }
+
+        Member member = memberMapper.getMemberByUserOpenId(apparatus.getUserOpenid());
+        if(member == null){
+            throw new RuntimeException("删除失败，查询用户失败");
+        }
+        Member me = new Member();
+        me.setUserOpenid(member.getUserOpenid());
+        me.setUserId(member.getUserId());
+
+        //修改积分
+        String integraType = "";
+        if(stayStatus == 1){ //1：待入账2：已入账3：订单取消/退货,撤回4：取消   、userStayIntegral
+            integraType = "待入账";
+            if(member.getUserStayIntegral() >= stayIntegraNum){
+                me.setUserStayIntegral(member.getUserStayIntegral() - stayIntegraNum);
+            }else{
+                throw new RuntimeException("删除失败，客户积分不正确"); //可能查询出错误的积分日志
+            }
+        }else if(stayStatus == 2){  //2：已入账
+            integraType = "已入账";
+            if(member.getUserIntegral() >= stayIntegraNum && member.getUserSurplusIntegral() >= stayIntegraNum){
+                me.setUserIntegral(member.getUserIntegral() - stayIntegraNum);
+                me.setUserSurplusIntegral(member.getUserSurplusIntegral() - stayIntegraNum);
+            }else{
+                throw new RuntimeException("删除失败，客户积分不正确");  //可能查询出错误的积分日志
+            }
+        }else{
+            integraType = "其他";
+            throw new RuntimeException("删除失败，待入账状态不正确");
+        }
+        flag = memberMapper.update(me);
+        if(flag < 1){
+            throw new RuntimeException("删除失败，修改积分失败");
+        }
+
+        //删除牙刷
+        flag = apparatusMapper.delApparatus(code);
+        if(flag < 1){
+            throw new RuntimeException("删除失败，删除牙刷失败");
+        }
+
+        logger.info("删除牙刷成功；牙刷编号："+code+";客户openId："+apparatus.getUserOpenid()+";减去积分："+stayIntegraNum+";减去积分类型:"+integraType);
+        return flag;
+    }
+
+
 }

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

@@ -18,6 +18,13 @@ public interface ApparatusMapper {
     List<Apparatus> listApparatusPage(Apparatus apparatus);
 
     /**
+     * 分页查询机器列表
+     * @param apparatus
+     * @return
+     */
+    List<Apparatus> listApparatusPageByAdmin(Apparatus apparatus);
+
+    /**
      * 添加机器信息
      * @param apparatus
      * @return
@@ -38,4 +45,11 @@ public interface ApparatusMapper {
      * 添加产品颜色与pts产品关联信息
      */
     Integer addColorIdByProductId(ProductRelatedRstProduce productRelatedRstProduce);
+
+    /**
+     *删除一个牙刷
+     * @param code
+     * @return
+     */
+    Integer delApparatus(String code);
 }

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

@@ -145,4 +145,11 @@ public interface UseIntegralMapper {
      * @return List
      */
     List<UseIntegral>  getUseIntegralList(UseIntegral  useIntegral);
+
+    /**
+     * 修改日志
+     * @param useIntegral
+     * @return
+     */
+    Integer updateUseIntegra(UseIntegral useIntegral);
 }

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

@@ -32,6 +32,40 @@
       </if>
     </select>
 
+
+    <!-- 分页查询机器列表 -->
+    <select id="listApparatusPageByAdmin" parameterType="Apparatus" resultType="Apparatus">
+        SELECT
+        ma.*,
+        pc.color_img productImg,
+        pi.product_name productName,
+        uu.user_nickname,
+        uu.user_tel
+        FROM
+        tb_iamberry_member_apparatus ma
+        LEFT JOIN tb_iamberry_product_color pc on ma.color_id = pc.color_id
+        LEFT JOIN tb_iamberry_product_info pi on pc.color_product_id = pi.product_id
+        LEFT JOIN tb_iamberry_user_userinfo uu ON ma.user_openid = uu.user_openid
+        <where>
+            <if test="userOpenid != null and userOpenid != ''">
+                user_openid = #{userOpenid}
+            </if>
+            <if test="apparatusStatus != null and apparatusStatus != ''">
+                AND apparatus_status = #{apparatusStatus}
+            </if>
+            <if test="apparatusBarcode != null and apparatusBarcode != ''" >
+                AND apparatus_barcode LIKE CONCAT('%',#{apparatusBarcode},'%')
+            </if>
+            <if test="userNickname != null and userNickname != ''" >
+                AND uu.user_nickname LIKE CONCAT('%',#{userNickname},'%')
+            </if>
+            <if test="userTel != null and userTel != ''" >
+                AND uu.user_tel LIKE CONCAT('%',#{userTel},'%')
+            </if>
+        </where>
+        ORDER BY apparatus_id DESC
+    </select>
+
     <!-- 添加机器信息 -->
     <insert id="addApparatus" parameterType="Apparatus">
         INSERT INTO tb_iamberry_member_apparatus
@@ -57,4 +91,10 @@
     <insert id="addColorIdByProductId" parameterType="ProductRelatedRstProduce">
         INSERT INTO tb_iamberry_product_related_rst_produce(color_id,pts_produce_id,related_create_time) VALUES (#{colorId},#{ptsProduceId},NOW())
     </insert>
+
+    <delete id="delApparatus" parameterType="String" >
+        delete FROM
+        tb_iamberry_member_apparatus
+        where apparatus_barcode = #{code}
+    </delete>
 </mapper>

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

@@ -37,7 +37,6 @@
 
 		user_email userEmail,
 		user_qrcode_type userQrcodeType,
-		user_stay_integral userStayIntegral,
 		user_age_stage userAgeStage
 	</sql>
 	<!-- 获取个人信息-->

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

@@ -335,4 +335,11 @@
         </where>
     </select>
 
+
+
+    <!--修改入账日志 -->
+    <update id="updateUseIntegra" parameterType="UseIntegral" >
+        UPDATE tb_iamberry_use_integral SET integral_type = #{integralType} WHERE stay_id = #{stayId}
+    </update>
+
 </mapper>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/system/SystemServiceImpl.java

@@ -28,7 +28,13 @@ public class SystemServiceImpl implements SystemService {
 		cache.put("shopRule_"+rule.getRuleId(), rule);
 		return rule;
 	}
-	
+
+	@Override
+	public ShopSystemRule selectOneShopRuleByIdDynamic(Integer id) {
+		return systemDao.selectOneShopRuleById(id);
+	}
+
+
 	/**
 	 * 查询所有系统规则
 	 * 2016年5月4日

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/AdminApparatusHandler.java

@@ -0,0 +1,96 @@
+package com.iamberry.wechat.handles.apparatus;
+
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.apparatus.Apparatus;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.face.admin.SystemService;
+import com.iamberry.wechat.face.apparatus.ApparatusService;
+import com.iamberry.wechat.face.member.MemberService;
+import com.iamberry.wechat.face.order.CodeService;
+import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.tools.SendMessageUtil;
+import com.iamberry.wechat.utils.StitchAttrUtil;
+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;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by liuzhiwei on 2017/12/28.
+ */
+@Controller
+@RequestMapping("/admin/apparatus")
+public class AdminApparatusHandler {
+
+    private Logger logger = LoggerFactory.getLogger(AdminApparatusHandler.class);
+
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
+    @Autowired
+    private ApparatusService apparatusService;
+    @Autowired
+    private SystemService systemService;
+    @Autowired
+    private CodeService codeService;
+    @Autowired
+    private MemberService memberService;
+
+
+    /**
+     * 查询积分记录 并分页 (支持查询条件模糊搜索)
+     * 2018年2月24日
+     * @return
+     */
+    @RequestMapping("/listApparatus")
+    public ModelAndView listIntegral(Apparatus apparatus,
+                                     @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                     @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+                                     @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum,
+                                     HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("admin/apparatus/listApparatus");
+        // 封装请求数据
+        PageRequest<Apparatus> pageRequest = new PageRequest<>(apparatus, pageNO, pageSize, totalNum == 0);
+        // 查询订单列表
+        PagedResult<Apparatus> result = apparatusService.listApparatusPageByAdmin(pageRequest);
+        if (totalNum != 0) {
+            result.setTotal(totalNum);
+        }
+        StitchAttrUtil.getSa().setModelAndView(apparatus, mv, "/admin/apparatus/listApparatus", result);
+        return mv;
+    }
+
+    /**
+     * 删除牙刷
+     * @param request
+     * @param code
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/del_tooth")
+    public ResultMsg addApparatus(HttpServletRequest request,String code) throws Exception {
+        if(code == null){
+            return new ResultMsg(false, ResultInfo.ERRORCODE, "删除失败，牙刷编号为空",null);
+        }
+        Integer flag = 0;
+        String msg = "删除失败，请重试";
+        try{
+            flag = apparatusService.delTooth(code);
+        }catch (RuntimeException e){
+            e.printStackTrace();
+            msg = e.getMessage();
+        }
+        if(flag < 1){
+            return new ResultMsg(false, ResultInfo.ERRORCODE, msg ,null);
+        }
+        return new ResultMsg(true, ResultInfo.SUCCESSCODE, "删除成功!",null);
+    }
+
+}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/ApparatusHandler.java

@@ -6,9 +6,11 @@ import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.apparatus.Apparatus;
+import com.iamberry.wechat.core.entity.integral.IntegralConfig;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.apparatus.ApparatusService;
+import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.order.CodeService;
 import com.iamberry.wechat.service.ImberryConfig;
@@ -269,4 +271,25 @@ public class ApparatusHandler {
         calendar.add(Calendar.MONTH, month);
         return calendar.getTime();
     }
+
+
+    /**
+     * 注册会员
+     * @param request
+     * @param code
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/del_tooth")
+    public ResultMsg addApparatus(HttpServletRequest request,String code) throws Exception {
+        if(code == null){
+            return new ResultMsg(false, ResultInfo.ERRORCODE, "删除失败，牙刷编号为空",null);
+        }
+        Integer flag = apparatusService.delTooth(code);
+
+//      SSD0315A180900084
+        return new ResultMsg(false, ResultInfo.ERRORCODE, "会员注册失败，请重新注册!",null);
+    }
+
 }

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

@@ -219,7 +219,7 @@ public class OrderHandler {
 			}
 
 			ActivityDate activityDate = activityUtil.doubleTwelve();
-			if(channelType < 0 && channelId < 0){
+			if(channelType > 0 && channelId > 0){
 				activityDate.setStatus(false);
 			}else{
 				//非分销渠道，才能有促销
@@ -255,7 +255,7 @@ public class OrderHandler {
 				salesActivities.setSalesActivitiesType(1);
 				salesActivities.setSalesActivitiesScenes(1);
 				List<SalesActivities> salesActivitiesList = salesActivitiesService.getSalesActivitiesList(salesActivities);
-				dto.setSalesActivitiesList(salesActivitiesList);
+				activityDate.setSalesActivitiesList(salesActivitiesList);
 			}
 			dto.setActivityDate(activityDate);
 		}else if("2".equals(isCustomize)){
@@ -494,6 +494,7 @@ public class OrderHandler {
 		}
 
 		List<CartDto> cartDtos = new ArrayList<>();
+		ActivityDate activityDate = activityUtil.doubleTwelve();	//活动内容
 		if("1".equals(temp.getIsCustomize())){	//  1：普通牙刷购买  2：定制牙刷购买
 			Integer [] cartId = null;
 			try {
@@ -503,6 +504,55 @@ public class OrderHandler {
 				return msg;
 			}
 			cartDtos = cartService.selectCartItemByListId(cartId);
+
+
+			Integer toothbrush = 0;
+
+			for (CartDto cd : cartDtos) {
+				if(cd.getProductType() == 100){		//当订单中有电动牙刷时，+1
+					toothbrush += cd.getCartNum();
+				}
+			}
+
+			if(temp.getChannelType() > 0 && temp.getChannelId() > 0){
+				activityDate.setStatus(false);
+			}else {
+				//非分销渠道，才能有促销
+				if (activityDate.isStatus()) {
+					if (toothbrush > 3) {    //三支以上
+						CartDto cd1 = getGiftCartDtos(316);        //保温杯
+						if (cd1 != null) {
+							cartDtos.add(cd1);
+						}
+						CartDto cd2 = getGiftCartDtos(315);//漱口水
+						if (cd2 != null) {
+							cartDtos.add(cd2);
+						}
+					} else if (toothbrush > 2) {    //三支牙刷
+						CartDto cd1 = getGiftCartDtos(316);        //保温杯
+						if (cd1 != null) {
+							cartDtos.add(cd1);
+						}
+					} else if (toothbrush > 1) {
+						CartDto cd2 = getGiftCartDtos(315);//漱口水
+						if (cd2 != null) {
+							cartDtos.add(cd2);
+						}
+					} else if (toothbrush > 0) {
+						CartDto cd3 = getGiftCartDtos(314);//牙膏
+						if (cd3 != null) {
+							cartDtos.add(cd3);
+						}
+					}
+				}
+				SalesActivities salesActivities = new SalesActivities();
+				salesActivities.setSalesActivitiesStatus(1);
+				salesActivities.setSalesActivitiesType(1);
+				salesActivities.setSalesActivitiesScenes(1);
+				List<SalesActivities> salesActivitiesList = salesActivitiesService.getSalesActivitiesList(salesActivities);
+				activityDate.setSalesActivitiesList(salesActivitiesList);
+			}
+
 		}else if("2".equals(temp.getIsCustomize())){
 			Integer id = Integer.valueOf(temp.getCartIdStr());
 			CustomizedTooth customizedTooth = customizedToothService.getCustomizedToothById(id);
@@ -742,12 +792,12 @@ public class OrderHandler {
 		}
 
 		//双十二期间，全场满328元减50元，全场满499元减100元，全场满满699元减150元
-		if(mustPay > 69900){
-			mustPay = mustPay - 15000;
-		}else if(mustPay > 49900){
-			mustPay = mustPay - 10000;
-		}else if(mustPay > 32800){
-			mustPay = mustPay - 5000;
+//		activityDate
+		for (SalesActivities salesActivities : activityDate.getSalesActivitiesList()){
+			if(mustPay >= salesActivities.getSalesActivitiesFull()){
+				mustPay = mustPay - salesActivities.getSalesActivitiesReduction();
+				break;
+			}
 		}
 
 		Integer salesPostage = 0;
@@ -1036,6 +1086,7 @@ public class OrderHandler {
 		if((product.getColorSoldNum()+1) > product.getColorAllNum()){
 			return null;
 		}
+		cartDto.setCartId(1);
 		cartDto.setCartProductId(product.getProductId());
 		cartDto.setCartColorId(colorId);
 		cartDto.setCartNum(1);

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

@@ -7,6 +7,7 @@ import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrder;
 import com.iamberry.wechat.core.entity.channel.ChannelPrice;
 import com.iamberry.wechat.core.entity.channel.ChannelRebate;
+import com.iamberry.wechat.core.entity.coupon.ActivityDate;
 import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
 import com.iamberry.wechat.core.entity.giftCard.AgentInfo;
@@ -30,6 +31,7 @@ import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.face.apparatus.ApparatusService;
 import com.iamberry.wechat.face.cart.CartService;
 import com.iamberry.wechat.face.channel.ChannelRebateService;
+import com.iamberry.wechat.face.channel.ChildChannelService;
 import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.giftCard.AgentMachineService;
 import com.iamberry.wechat.face.giftCard.AgentService;
@@ -49,6 +51,7 @@ import com.iamberry.wechat.face.receive.ChargReceiveService;
 import com.iamberry.wechat.handles.mq.MQServiceProxy;
 import com.iamberry.wechat.tools.*;
 import com.iamberry.wechat.tools.SendMessageUtil;
+import com.iamberry.wechat.utils.ActivityUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -134,6 +137,9 @@ public class ResponseWechatPayHandler {
 	private ChargReceiveService chargReceiveService;
 	@Autowired
 	private ProductColorService productColorService;
+	private ChildChannelService childChannelService;
+	@Autowired
+	private ActivityUtil activityUtil;
 
 	/**
 	 * 销售订单支付回调方法 -- tooth订单返回
@@ -214,53 +220,60 @@ public class ResponseWechatPayHandler {
 //					}
 						}
 
-						//优惠金额
-						Integer offerAmount = (or.getSalesAmount() - or.getSalesYetAmount()) / 100;
 
 						/*-- 计算积分 ----*/
 						//			总积分 		-- 牙刷总金额 --  刷头金额		-- 组合套装优惠，返一倍积分
 						Integer allIntegral = 0, toothbrush = 0, brushHead = 0, combinationOffer = 0;
 						List<OrderItem> orderItemList = adminOrderService.getShopOrderItemByOrderId(orderIdMD5);
-						for (int i = 0; i < orderItemList.size(); i++) {
-							OrderItem orderItem = orderItemList.get(i);
-							Integer amount = orderItem.getItemProductDiscount()*orderItem.getItemNum() / 100;		//商品优惠价
-							if (orderItem.getItemProductType() == 100) {    //类型为电动牙刷
-								toothbrush += amount;
-							}else {
-								if(310 == orderItem.getItemProductId()){
+						//优惠金额
+						Integer offerAmount = (or.getSalesAmount() - or.getSalesYetAmount()) / 100;
+						ActivityDate activityDate = activityUtil.doubleTwelve();
+						if(activityDate.isStatus()){
+							allIntegral = or.getSalesYetAmount()/ 100 * 2;	//活动期间双倍积分
+						}else{
+							for (int i = 0; i < orderItemList.size(); i++) {
+								OrderItem orderItem = orderItemList.get(i);
+								Integer amount = orderItem.getItemProductDiscount()*orderItem.getItemNum() / 100;		//商品优惠价
+								if (orderItem.getItemProductType() == 100) {    //类型为电动牙刷
+									toothbrush += amount;
+								}else {
+									if(310 == orderItem.getItemProductId()){
 							/*优惠套装组合*/
-									combinationOffer += amount;
-								}else{
-									brushHead += amount;
+										combinationOffer += amount;
+									}else{
+										brushHead += amount;
+									}
 								}
 							}
-						}
-						if(20000 == couponTypeId|| 40000 == couponTypeId){
-							//刷头优惠券
-							brushHead -= offerAmount;
-						}else{
-							//牙刷优惠券
-							toothbrush -= offerAmount;
-						}
-						if(or.getSalesPostage() > 0){
-							if(brushHead >= 10){
-								brushHead -= or.getSalesPostage()/100;
-							}else if(toothbrush >= 10){
-								toothbrush -= or.getSalesPostage()/100;
+							if(20000 == couponTypeId|| 40000 == couponTypeId){
+								//刷头优惠券
+								brushHead -= offerAmount;
+							}else{
+								//牙刷优惠券
+								toothbrush -= offerAmount;
+							}
+							if(or.getSalesPostage() > 0){
+								if(brushHead >= 10){
+									brushHead -= or.getSalesPostage()/100;
+								}else if(toothbrush >= 10){
+									toothbrush -= or.getSalesPostage()/100;
+								}
+							}
+							if(brushHead < 0){
+								brushHead = 0;
+							}
+							if(toothbrush < 0){
+								toothbrush = 0;
 							}
-						}
-						if(brushHead < 0){
-							brushHead = 0;
-						}
-						if(toothbrush < 0){
-							toothbrush = 0;
-						}
 
-						//后面的小数积分直接去掉，不需要四舍五入
-						allIntegral = (int)( toothbrush * 2 + brushHead * 1.5 + combinationOffer * 1);
+							//后面的小数积分直接去掉，不需要四舍五入
+							allIntegral = (int)( toothbrush * 2 + brushHead * 1.5 + combinationOffer * 1);
+						}
 						/*-----end-----*/
-
-						ratFWLogger.error(this, "订单：" + orderIdMD5 + "订单使用优惠金额：" + offerAmount + "所得积分为：" + allIntegral);
+						if(activityDate.isStatus()){
+							ratFWLogger.info("双十二活动双倍积分");
+						}
+						ratFWLogger.info(this, "订单：" + orderIdMD5 + "订单使用优惠金额：" + offerAmount + "所得积分为：" + allIntegral);
 						boolean flag = apparatusService.addStayIntegral(or.getSalesOpenid(), 3, allIntegral, or.getSalesOrderid(),null);
 						ratFWLogger.info("积分是否入账：" + flag);
 						/*----------计算积分-----------*/
@@ -420,52 +433,59 @@ public class ResponseWechatPayHandler {
 //					}
 				}
 
-				//优惠金额
-				Integer offerAmount = (or.getSalesAmount() - or.getSalesYetAmount()) / 100;
 
-				/*-- 计算积分 ----*/
+						/*-- 计算积分 ----*/
 				//			总积分 		-- 牙刷总金额 --  刷头金额		-- 组合套装优惠，返一倍积分
 				Integer allIntegral = 0, toothbrush = 0, brushHead = 0, combinationOffer = 0;
 				List<OrderItem> orderItemList = adminOrderService.getShopOrderItemByOrderId(orderIdMD5);
-				for (int i = 0; i < orderItemList.size(); i++) {
-					OrderItem orderItem = orderItemList.get(i);
-					Integer amount = orderItem.getItemProductDiscount()*orderItem.getItemNum() / 100;		//商品优惠价
-					if (orderItem.getItemProductType() == 100) {    //类型为电动牙刷
-						toothbrush += amount;
-					}else {
-						if(310 == orderItem.getItemProductId()){
+				//优惠金额
+				Integer offerAmount = (or.getSalesAmount() - or.getSalesYetAmount()) / 100;
+				ActivityDate activityDate = activityUtil.doubleTwelve();
+				if(activityDate.isStatus()){
+					allIntegral = or.getSalesYetAmount()/ 100 * 2;	//活动期间双倍积分
+				}else{
+					for (int i = 0; i < orderItemList.size(); i++) {
+						OrderItem orderItem = orderItemList.get(i);
+						Integer amount = orderItem.getItemProductDiscount()*orderItem.getItemNum() / 100;		//商品优惠价
+						if (orderItem.getItemProductType() == 100) {    //类型为电动牙刷
+							toothbrush += amount;
+						}else {
+							if(310 == orderItem.getItemProductId()){
 							/*优惠套装组合*/
-							combinationOffer += amount;
-						}else{
-							brushHead += amount;
+								combinationOffer += amount;
+							}else{
+								brushHead += amount;
+							}
 						}
 					}
-				}
-				if(20000 == couponTypeId|| 40000 == couponTypeId){
-					//刷头优惠券
-					brushHead -= offerAmount;
-				}else{
-					//牙刷优惠券
-					toothbrush -= offerAmount;
-				}
-				if(or.getSalesPostage() > 0){
-					if(brushHead >= 10){
-						brushHead -= or.getSalesPostage()/100;
-					}else if(toothbrush >= 10){
-						toothbrush -= or.getSalesPostage()/100;
+					if(20000 == couponTypeId|| 40000 == couponTypeId){
+						//刷头优惠券
+						brushHead -= offerAmount;
+					}else{
+						//牙刷优惠券
+						toothbrush -= offerAmount;
 					}
+					if(or.getSalesPostage() > 0){
+						if(brushHead >= 10){
+							brushHead -= or.getSalesPostage()/100;
+						}else if(toothbrush >= 10){
+							toothbrush -= or.getSalesPostage()/100;
+						}
+					}
+					if(brushHead < 0){
+						brushHead = 0;
+					}
+					if(toothbrush < 0){
+						toothbrush = 0;
+					}
+
+					//后面的小数积分直接去掉，不需要四舍五入
+					allIntegral = (int)( toothbrush * 2 + brushHead * 1.5 + combinationOffer * 1);
 				}
-				if(brushHead < 0){
-					brushHead = 0;
-				}
-				if(toothbrush < 0){
-					toothbrush = 0;
+						/*-----end-----*/
+				if(activityDate.isStatus()){
+					ratFWLogger.info("双十二活动双倍积分");
 				}
-
-				//后面的小数积分直接去掉，不需要四舍五入
-				allIntegral = (int)( toothbrush * 2 + brushHead * 1.5 + combinationOffer * 1);
-				/*-----end-----*/
-
 				ratFWLogger.error(this, "订单：" + orderIdMD5 + "订单使用优惠金额：" + offerAmount + "所得积分为：" + allIntegral);
 				boolean flag = apparatusService.addStayIntegral(or.getSalesOpenid(), 3, allIntegral, or.getSalesOrderid(),null);
 				ratFWLogger.info("积分是否入账：" + flag);

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/apparatus/listApparatus.jsp

@@ -0,0 +1,161 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <LINK rel="Bookmark" href="/favicon.ico">
+    <LINK rel="Shortcut Icon" href="/favicon.ico" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+    <link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+
+    <!--[if IE 6]>
+    <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
+    <script>DD_belatedPNG.fix('*');</script>
+    <![endif]-->
+    <title>牙刷绑定列表</title>
+</head>
+<body>
+<nav class="breadcrumb">
+    <i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span>
+    牙刷绑定管理 <span class="c-gray en">&gt;</span> 牙刷绑定列表 <a
+        class="btn btn-success radius r mr-20"
+        style="line-height: 1.6em; margin-top: 3px"
+        href="javascript:location.replace(location.href);" title="刷新"><i
+        class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="pd-20">
+    <form action="${pageContext.request.contextPath }/admin/apparatus/listApparatus" method="post" style="text-align: center;margin-bottom: 10px;">
+
+        <input name="apparatusBarcode" id="apparatusBarcode" value="${apparatusBarcode }" placeholder="牙刷编号" style="width: 150px" class="input-text" type="text">
+        <input name="userNickname" id="userNickname" value="${userNickname }" placeholder="微信昵称" style="width: 150px" class="input-text" type="text">
+        <input name="userTel" id="userTel" value="${userTel }" placeholder="手机号码" style="width: 150px" class="input-text" type="text">
+
+        <button name="" id="submitBtn" class="btn btn-success" type="submit">
+            <i class="Hui-iconfont"></i> 搜索
+        </button>
+    </form>
+    <form id="goodsform" >
+        <table class="table table-border table-bordered table-bg">
+            <thead>
+            <tr>
+                <th scope="col" colspan="13">牙刷绑定列表</th>
+            </tr>
+            <tr class="text-c">
+                <th width="150">牙刷编号</th>
+                <th width="150">openId</th>
+                <th width="150">微信昵称</th>
+                <th width="100">手机号码</th>
+                <th width="70">渠道</th>
+                <th width="150">颜色</th>
+                <th width="80">创建时间</th>
+                <th width="40">操作</th>
+            </tr>
+            </thead>
+            <tbody>
+            <c:if test="${! (empty page.dataList) }">
+                <c:forEach items="${page.dataList }" var="infolist">
+                <tr class="text-c">
+                    <td>${infolist.apparatusBarcode }</td>
+                    <td>${infolist.userOpenid }</td>
+                    <td>${infolist.userNickname}</td>
+                    <td>${infolist.userTel }</td>
+                   <td>
+                        <c:if test="${infolist.apparatusStore == 1 }">
+                            天猫
+                        </c:if>
+                        <c:if test="${infolist.apparatusStore == 2 }">
+                            淘宝
+                        </c:if>
+                        <c:if test="${infolist.apparatusStore == 3 }">
+                            京东
+                        </c:if>
+                       <c:if test="${infolist.apparatusStore == 4 }">
+                           微信
+                        </c:if>
+                       <c:if test="${infolist.apparatusStore == 5 }">
+                           其他
+                        </c:if>
+                       <c:if test="${infolist.apparatusStore == 6 }">
+                           一条
+                        </c:if>
+                       <c:if test="${infolist.apparatusStore == 7 }">
+                           小红书
+                        </c:if>
+                    </td>
+                    <td>${infolist.productName }</td>
+
+                    <td><fmt:formatDate value="${infolist.apparatusCreateTime}" pattern="yyyy-MM-dd"/></td>
+                    <td>
+                        <a href="javascript:void(0)" lang="取消绑定" title="取消绑定" alt="取消绑定" onclick="del_tooth('${infolist.apparatusBarcode }')">
+                            取消绑定
+                        </a>
+                    </td>
+                 </c:forEach>
+             </c:if>
+                <c:if test="${empty page.dataList}">
+                    <tr align="center"><td colspan="13" style="text-align: center;">未查询到该类数据!</td></tr>
+                </c:if>
+            </tbody>
+        </table>
+        <div align="right" class="mt-10 mb-10 mr-10">
+            <%@include file="/common/other/paper/pager.jsp"%>
+        </div>
+    </form>
+</div>
+
+
+
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script>
+<script type="text/javascript">
+    /* $(document).ready(function(){
+     $('#beginDate').datepicker();//时间控件
+     $('#endDate').datepicker();
+     }); */
+
+    /**
+     * 发货
+     * @param receiveId
+     */
+    function  del_tooth(code){
+        layer.confirm('确定取消绑定吗?', {icon: 3, title:'提示'}, function(index){
+            var url = "${pageContext.request.contextPath }" + '/admin/apparatus/del_tooth';
+            $.ajax({
+                type: "POST",
+                url: url,
+                traditional : true,
+                data: {
+                    code : code
+                },
+                dataType: "json",
+                success: function(data){
+                    if(data.status){
+                        layer.msg(data.message,{icon: 1,time:3000});
+                        return false;
+                    }else{
+                        layer.msg(data.message,{icon: 5,time:3000});
+                        return false;
+                    }
+                }
+            });
+            layer.close(index);
+        });
+    }
+</script>
+</body>
+</html>