Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

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

@@ -15,11 +15,13 @@ public class Apparatus implements java.io.Serializable{
     private Integer apparatusId;        //id
     private String apparatusBarcode;    //机器条码
     private String userOpenid;          //用户openid
-    private Integer apparatusStore;            //渠道id
+    private Integer apparatusStore;     //渠道id
     private Integer apparatusStatus;    //状态
     private Date apparatusBuyDate;      //购买时间
     private Date apparatusWarrantyDate; //保修截止日期
     private Date apparatusCreateTime;   //创建时间
+    private String productImg;          //产品介绍图
+    private String productName;         //产品名称
 
     private Integer colorId;    //颜色id
 
@@ -104,4 +106,20 @@ public class Apparatus implements java.io.Serializable{
     public void setColorId(Integer colorId) {
         this.colorId = colorId;
     }
+
+    public String getProductImg() {
+        return productImg;
+    }
+
+    public void setProductImg(String productImg) {
+        this.productImg = productImg;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
 }

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

@@ -8,9 +8,13 @@
     <!-- 分页查询机器列表 -->
     <select id="listApparatusPage" parameterType="Apparatus" resultType="Apparatus">
       SELECT
-       *
+        ma.*,
+        pc.color_img productImg,
+        pi.product_name productName
       FROM
-       tb_iamberry_member_apparatus
+        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
       <where>
         <if test="userOpenid != null and userOpenid != ''">
             user_openid = #{userOpenid}

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

@@ -1,11 +1,6 @@
 package com.iamberry.wechat.handles.coupon;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -515,4 +510,65 @@ public class CouponTypeHandler {
 		}
 		return rm;
 	}
+
+	/**
+	 * 获取用户是否已领取优惠券
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("/getIsReceive")
+	public ResultMsg getIsReceive(HttpServletRequest request){
+		ResultMsg resultMsg = new ResultMsg();
+		Member memberInfo = WechatUtils.getUserBySession(request);
+		Integer msg = couponItemService.getIsReceive(memberInfo.getUserOpenid());
+		if(msg > 0){
+			resultMsg.setResultCode(ResultInfo.ERRORCODE);
+			resultMsg.setStatus(false);
+			resultMsg.setMessage("已领取优惠券");
+			return resultMsg;
+		}else{
+			resultMsg.setResultCode(ResultInfo.SUCCESSCODE);
+			resultMsg.setStatus(true);
+		}
+		return resultMsg;
+	}
+
+	/**
+	 * 点击领取新人优惠券（为当前用户新增一条优惠券）
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("/addAewPeople")
+	public ResultMsg addAewPeople(HttpServletRequest request){
+		ResultMsg resultMsg = new ResultMsg();
+		Member memberInfo = WechatUtils.getUserBySession(request);
+		CouponType couponType = new CouponType();
+		couponType.setCouponIsNewPeople(1);
+		List<CouponType> couponTypeList = couponTypeService.getCouponTypeList(couponType);
+		if(couponTypeList == null || couponTypeList.size() < 1){
+			resultMsg.setResultCode(ResultInfo.ERRORCODE);
+			resultMsg.setStatus(false);
+			return resultMsg;
+		}
+
+		CouponItem couponItem = new CouponItem();
+		couponItem.setCouponId(couponTypeList.get(0).getCouponId());
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(new Date());
+		calendar.set(Calendar.YEAR,1);
+		couponItem.setCouponUseEndDate(calendar.getTime());//领取后一年有效
+		couponItem.setCouponReceiveDate(new Date());
+		couponItem.setCouponItemUseropenid(memberInfo.getUserOpenid());
+		couponItem.setCouponUseStatus(1);
+		couponItem.setCouponIsDonation(2);
+		couponItem.setCouponItemRemark("新人优惠券");
+		if(couponItemService.insertCouponItem(couponItem) > 0){
+			resultMsg.setResultCode(ResultInfo.SUCCESSCODE);
+			resultMsg.setStatus(true);
+		}else{
+			resultMsg.setResultCode(ResultInfo.ERRORCODE);
+			resultMsg.setStatus(false);
+		}
+		return resultMsg;
+	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/CouponWechatHandler.java

@@ -30,10 +30,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Controller
 @RequestMapping("/wechat/couponWechat")
 public class CouponWechatHandler {
-	@Autowired
-	CouponItemService couponItemService;
-	@Autowired
-	CouponTypeService couponTypeService;
 	/**
 	 * 
 	 * @param req
@@ -62,64 +58,4 @@ public class CouponWechatHandler {
 			e.printStackTrace();
 		}
 	}
-
-	/**
-	 * 获取用户是否已领取优惠券
-	 * @param request
-	 * @return
-	 */
-	@RequestMapping("/getIsReceive")
-	public ResultMsg getIsReceive(HttpServletRequest request){
-		ResultMsg resultMsg = new ResultMsg();
-		Member memberInfo = WechatUtils.getUserBySession(request);
-		Integer msg = couponItemService.getIsReceive(memberInfo.getUserOpenid());
-		if(msg > 0){
-			resultMsg.setResultCode(ResultInfo.SUCCESSCODE);
-			resultMsg.setStatus(true);
-		}else{
-			resultMsg.setResultCode(ResultInfo.ERRORCODE);
-			resultMsg.setStatus(false);
-			resultMsg.setMessage("机器信息不存在,请重新进入!");
-			return resultMsg;
-		}
-		return resultMsg;
-	}
-
-	/**
-	 * 点击领取新人优惠券（为当前用户新增一条优惠券）
-	 * @param request
-	 * @return
-	 */
-	@RequestMapping("/getIsReceive")
-	public ResultMsg addAewPeople(HttpServletRequest request){
-		ResultMsg resultMsg = new ResultMsg();
-		Member memberInfo = WechatUtils.getUserBySession(request);
-		CouponType couponType = new CouponType();
-		couponType.setCouponIsNewPeople(1);
-		List<CouponType> couponTypeList = couponTypeService.getCouponTypeList(couponType);
-		if(couponTypeList == null || couponTypeList.size() < 1){
-			resultMsg.setResultCode(ResultInfo.ERRORCODE);
-			resultMsg.setStatus(false);
-			return resultMsg;
-		}
-
-		CouponItem couponItem = new CouponItem();
-		couponItem.setCouponId(couponTypeList.get(0).getCouponId());
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(new Date());
-		calendar.set(Calendar.YEAR,1);
-		couponItem.setCouponUseEndDate(calendar.getTime());//领取后一年有效
-		couponItem.setCouponReceiveDate(new Date());
-		couponItem.setCouponUseStatus(1);
-		couponItem.setCouponIsDonation(2);
-		couponItem.setCouponItemRemark("新人优惠券");
-		if(couponItemService.insertCouponItem(couponItem) > 0){
-			resultMsg.setResultCode(ResultInfo.SUCCESSCODE);
-			resultMsg.setStatus(true);
-		}else{
-			resultMsg.setResultCode(ResultInfo.ERRORCODE);
-			resultMsg.setStatus(false);
-		}
-		return resultMsg;
-	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/QrCodeHandler.java

@@ -37,9 +37,10 @@ public class QrCodeHandler {
         res.sendRedirect("http://w.iamberry.com/tooth/view/default.html?qrCode="+qrCode);
     }
 
-    @RequestMapping("/getMember/{qrCode}")
-    public ResultMsg getMember(@PathVariable("qrCode") String qrCode, HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
+    @RequestMapping("/getMember")
+    public ResultMsg getMember(HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
         ResultMsg msg = new ResultMsg();
+        String qrCode = req.getParameter("qrCode");
         if (!StringUtil.isNotEmpty(qrCode)) {
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setStatus(false);
@@ -61,6 +62,8 @@ public class QrCodeHandler {
         map.put("memberInfo",memberInfo);
         map.put("isActivation",isActivation);
         msg.setData(map);
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
         return msg;
     }
 }