Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/ProductColor.java

@@ -24,11 +24,15 @@ public class ProductColor implements java.io.Serializable {
     private Integer colorStatus;        //状态    1：使用中，2：禁用
     private Integer colorPrice;			//产品市场价
     private String color69Code;			//产品69码
+    private String colorDesc;           //产品备注
     private Date colorCretaeTime;		//创建时间
     private Date colorUpdateTime;	//修改时间
     private List<SalesUserGift> salesUserGiftList; //赠品集合
     private PageBean page = new PageBean();		//分页
 
+    private Integer cartId; //购物车id
+    private Integer cartNum;//购物车数量
+
     public Integer getColorStatus() {
         return colorStatus;
     }
@@ -148,4 +152,28 @@ public class ProductColor implements java.io.Serializable {
     public void setSalesUserGiftList(List<SalesUserGift> salesUserGiftList) {
         this.salesUserGiftList = salesUserGiftList;
     }
+
+    public String getColorDesc() {
+        return colorDesc;
+    }
+
+    public void setColorDesc(String colorDesc) {
+        this.colorDesc = colorDesc;
+    }
+
+    public Integer getCartId() {
+        return cartId;
+    }
+
+    public void setCartId(Integer cartId) {
+        this.cartId = cartId;
+    }
+
+    public Integer getCartNum() {
+        return cartNum;
+    }
+
+    public void setCartNum(Integer cartNum) {
+        this.cartNum = cartNum;
+    }
 }

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/CartService.java

@@ -173,4 +173,9 @@ public interface CartService {
 	 * @return
 	 */
 	Integer updateSendWarnNum(Order order);
+
+	/**
+	 * 根据商品id和openid查询购物车数量和ID
+	 * **/
+	CartDto getCartByOpenId(CartDto cartDto);
 }

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

@@ -296,4 +296,9 @@ public class CartServiceImpl implements CartService {
 	public Integer updateSendWarnNum(Order order) {
 		return cartDao.updateSendWarnNum(order);
 	}
+
+	@Override
+	public CartDto getCartByOpenId(CartDto cartDto) {
+		return cartDao.getCartByOpenId(cartDto);
+	}
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/CartDao.java

@@ -174,4 +174,9 @@ public interface CartDao {
 	 * @return
 	 */
 	Integer updateSendWarnNum(Order order);
+
+	/**
+	 * 根据商品id和openid查询购物车数量和ID
+	 * **/
+	CartDto getCartByOpenId(CartDto cartDto);
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/CartDaoImpl.java

@@ -223,4 +223,9 @@ public class CartDaoImpl implements CartDao{
 	public Integer updateSendWarnNum(Order order) {
 		return cartMapper.updateSendWarnNum(order);
 	}
+
+	@Override
+	public CartDto getCartByOpenId(CartDto cartDto) {
+		return cartMapper.getCartByOpenId(cartDto);
+	}
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/CartMapper.java

@@ -121,4 +121,9 @@ public interface CartMapper {
 	 * @return
 	 */
 	Integer updateSendWarnNum(Order order);
+
+	/**
+	 * 根据商品id和openid查询购物车数量和ID
+	 * **/
+	CartDto getCartByOpenId(CartDto cartDto);
 }

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

@@ -410,4 +410,15 @@ PUBLIC
 			SALES_STATUS = #{oldStatus}
 		</if>
 	</update>
+
+	<!-- 根据商品id和openid查询购物车数量和ID -->
+	<select id="getCartByOpenId" parameterType="CartDto" resultType="CartDto">
+		SELECT
+		CART_ID cartId,
+		CART_NUM cartNum
+		FROM
+		TB_IAMBERRY_SHOP_CART
+		WHERE
+		CART_OPENID = #{cartOpenId} AND CART_COLOR_ID = #{cartColorId}
+	</select>
 </mapper>

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

@@ -36,6 +36,7 @@
 		<result column="color_code" property="colorCode"/>
 		<result column="color_product_pic" property="colorProductPic"/>
 		<result column="color_status" property="colorStatus"/>
+		<result column="color_desc" property="colorDesc"/>
 		<result column="color_cretae_time" property="colorCretaeTime"/>
 		<result column="color_update_time" property="colorUpdateTime"/>
 		<collection property="salesUserGiftList" column="color_id" ofType="SalesUserGift" select="listGift"/>
@@ -95,7 +96,10 @@
 		ug.user_gift_count userGiftCount,
 		ug.user_status userStatus,
 		ug.user_create_time userCreateTime,
-		pi.product_name productName
+		pi.product_name giftName,
+		pi.product_color giftColorName,
+		pi.product_child_type giftChildType,
+		pi.Product_introduce_img giftProductPic
 		FROM
 		tb_iamberry_sales_user_gift ug
 		LEFT JOIN tb_iamberry_product_color pc on pc.color_id = #{cartColorId}

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

@@ -11,8 +11,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.cart.CartDto;
 import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.core.entity.search.SearchInfo;
+import com.iamberry.wechat.face.cart.CartService;
+import com.iamberry.wechat.service.cart.dao.CartDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -66,6 +69,9 @@ public class ProductInfoHandler {
 
 	@Autowired
 	private SystemService systemService;
+
+	@Autowired
+	private CartService cartService;
 	/**
 	 * 首页进入商城
 	 * @param request
@@ -527,8 +533,27 @@ public class ProductInfoHandler {
 			remsg.setMessage(ResultInfo.loginOutError);
 			return remsg;
 		}
+		Member member =  wechatUtils.getUserBySession(request);
+		if (member == null || member.getUserOpenid() == null) {
+			remsg.setMessage(ResultInfo.loginOutError);
+			remsg.setStatus(false);
+			remsg.setMessage(ResultInfo.loginOutError);
+			return remsg;
+		}
 		//查询所有产品颜色
 		List<ProductColor> productColorList = productInfoService.selectColorByPid(productId);
+		if(productColorList.size() > 0){
+			for (ProductColor color : productColorList){
+				CartDto cartDto = new CartDto();
+				cartDto.setCartColorId(color.getColorId());
+				cartDto.setCartOpenId(member.getUserOpenid());
+				cartDto = cartService.getCartByOpenId(cartDto);
+				if(cartDto != null){
+					color.setCartId(cartDto.getCartId());
+					color.setCartNum(cartDto.getCartNum());
+				}
+			}
+		}
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("productColorList", productColorList);
 		remsg.setMessage(ResultInfo.SUCCESSINFO);

iamberry-wechat-web/src/main/webapp/common/wechat/pro-details.html

@@ -1,110 +1,198 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<title>产品详情</title>
-		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="css/main.css" />
-		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
-		<script>
-			//屏蔽分享
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-//				WeixinJSBridge.call('hideOptionMenu');
-//			});
-		</script>
-	</head>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<title>产品详情</title>
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wechat/aiberle/css/mui.min.css" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wechat/aiberle/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wechat/aiberle/css/main.css" />
+	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
+	<script>
+        //屏蔽分享
+        //			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+        //				WeixinJSBridge.call('hideOptionMenu');
+        //			});
+	</script>
+</head>
 
-	<body>
-		<footer class="mui-bar mui-bar-tab">
-			<ul class="mui-table-view mui-table-view-striped mui-table-view-condensed my-grid-view-no">
-				<li class="mui-table-view-cell">
-					<div class="mui-table"><div class="mui-table-cell mui-col-xs-4 table-middle"><span class="iconfont icon-gouwuche"></span></div><div class="mui-table-cell mui-col-xs-8 table-middle div-btn-buy-know">立即购买</div></div>
-				</li>
-			</ul>
-		</footer>
-		<div class="mui-content">
-			<div class="banner-box-pro">
-			<div id="slider" class="mui-slider">
-				<div class="mui-slider-group mui-slider-loop">
-					<!-- 额外增加的一个节点(循环轮播：第一个节点是最后一张轮播) -->
-					<div class="mui-slider-item mui-slider-item-duplicate">
-						<a href="#">
-							<img src="images/banner-3.jpg">
-						</a>
-					</div>
-					<!-- 第一张 -->
-					<div class="mui-slider-item">
-						<a href="#">
-							<img src="images/banner-1.jpg">
-						</a>
-					</div>
-					<!-- 第二张 -->
-					<div class="mui-slider-item">
-						<a href="#">
-							<img src="images/banner-2.jpg">
-						</a>
-					</div>
-					<!-- 第三张 -->
-					<div class="mui-slider-item">
-						<a href="#">
-							<img src="images/banner-3.jpg">
-						</a>
-					</div>
-					<!-- 额外增加的一个节点(循环轮播：最后一个节点是第一张轮播) -->
-					<div class="mui-slider-item mui-slider-item-duplicate">
-						<a href="#">
-							<img src="images/banner-1.jpg">
-						</a>
-					</div>
-				</div>
-				<div class="mui-slider-indicator">
-					<div class="mui-indicator mui-active"></div>
-					<div class="mui-indicator"></div>
-					<div class="mui-indicator"></div>
-				</div>
+<body>
+<footer class="mui-bar mui-bar-tab">
+	<ul class="mui-table-view mui-table-view-striped mui-table-view-condensed my-grid-view-no">
+		<li class="mui-table-view-cell">
+			<div class="mui-table"><div class="mui-table-cell mui-col-xs-4 table-middle"><span class="iconfont icon-gouwuche"></span></div><div class="mui-table-cell mui-col-xs-8 table-middle div-btn-buy-know">立即购买</div></div>
+		</li>
+	</ul>
+</footer>
+<div class="mui-content">
+		<div class="banner-box-pro" style="display: none;"></div>
+	<ul class="mui-table-view mui-grid-view my-view-no" style="padding-bottom: 0;">
+		<li class="mui-table-view-cell mui-media mui-col-xs-12" style="padding-right: 2px;">
+			<a href="#" class="proceId">
+				<div class="index-pro-tit">[精选] Aiberle美国智能净饮水一体机</div>
+			</a>
+		</li>
+		<li>
+			<div class="index-title">
+				<p class="giftId"><span class="iconfont icon-liwu"></span></p>
 			</div>
-			</div>
-			<ul class="mui-table-view mui-grid-view my-view-no" style="padding-bottom: 0;">
-		        <li class="mui-table-view-cell mui-media mui-col-xs-12" style="padding-right: 2px;">
-		            <a href="#">
-		                <div class="index-pro-tit">[精选] Aiberle美国智能净饮水一体机</div>
-		                <p class="mui-text-left">4级ro净化、10s加热、3s出水<span style="float: right;color: #ff3b3b;">¥2999.00</span></p>
-		            </a>
-		        </li>
-		        <li>
-		        	<div class="index-title">
-				<p><span class="iconfont icon-liwu"></span>美国aiberle咖啡杯、美国aiberle加湿器</p>
-			</div>
-		        </li>
-		        <li class="mui-table-view-cell mui-media mui-col-xs-12">
-		            <a href="#"><img class="mui-media-object" src="images/details-1.jpg">
-		            </a>
-		        </li>
-		   </ul>
-		</div>
-		<!-- 加载ing -->
-		<div class="loading covers">
-			<div class="loading-bj"></div>
-			<p>加载中...</p>
-		</div>
-		<!-- 加载ing END -->
-		<script src="js/mui.min.js"></script>
-		<script src="js/jquery-2.1.1.min.js"></script>
-		<script src="js/main.js"></script>
-		<script>
-			mui.ready(function() {
-				var slider = mui("#slider");
-				slider.slider({
-					interval: 5000
-				});
-				$(".loading").hide().css("opacity", "0");
-			});
-		</script>
-	</body>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-xs-12">
+			<a href="#" class="product-param-img">
+				<img class="mui-media-object" src="images/details-1.jpg">
+			</a>
+		</li>
+	</ul>
+</div>
+<!-- 加载ing -->
+<div class="loading covers">
+	<div class="loading-bj"></div>
+	<p>加载中...</p>
+</div>
+<!-- 加载ing END -->
+<script src="//s.iamberry.com/wechat/aiberle/js/mui.min.js"></script>
+<script src="//s.iamberry.com/wechat/aiberle/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/wechat/aiberle/js/main.js"></script>
+<script>
+    mui.ready(function() {
+        var nowUrl = location.href;
+        var productId = getParam("productId");
+        param = nowUrl.split("?")[1];
+        // 获取产品信息
+        selectProductInfo(productId);
+        $(".loading").hide();
+    });
+
+    // 产品基本信息
+    function selectProductInfo(productId) {
+        var btnArray = ['否', '是'];
+        mui.ajax('http://test.iamberry.com/iamberry/wechat/product/getProductByProductId?productId=' + productId + '&dates=' + new Date().getTime(), {
+            dataType: 'json',
+            async: false,
+            type: 'GET',
+            timeout: 15000,
+            success: function(dt) {
+                if (dt.isRedirect){
+                    window.location.href = dt.redirectURL;
+                    return;
+                }
+                //console.log(dt)
+                if(dt.status) {
+                    goodStatus = false;
+                    shareOpenid = dt.data.shareOpenid;
+                    /*var imageNote = "<div class='mui-slider-item mui-slider-item-duplicate'>" + "<a href='#'>" + "<img src='" + dt.data.product.pictureList[0].pictureUrl + "'>" + "</a>" + "</div>";
+                    for(var i = 0; i < dt.data.product.pictureList.length; i++) {
+                        imageNote += "<div class='mui-slider-item'>" + "<a href='#'>" + "<img src='" + dt.data.product.pictureList[i].pictureUrl + "'>" + "</a>" + "</div>";
+                        if(i == 0) {
+                            $("#active-div").append("<div class='mui-indicator mui-active'></div>");
+                        } else {
+                            $("#active-div").append("<div class='mui-indicator'></div>");
+                        }
+                    }
+                    imageNote += "<div class='mui-slider-item mui-slider-item-duplicate'>" + "<a href='#'>" + "<img src='" + dt.data.product.pictureList[0].pictureUrl + "'>" + "</a>" + "</div>";
+                    $("#group-images-div").append(imageNote);
+                    var banner = mui('#slider');
+                    banner.slider({
+                        interval: 5000
+                    });*/
+//遍历banner
+                    var bannerstr = "",dian = "";
+                    var banner_data = dt.data.product.pictureList;
+                    mui(banner_data).each(function(index) {
+                        if(index == 0) {
+                            bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[banner_data.length - 1].pictureUrl + '"><img src="' + (banner_data[banner_data.length - 1].pictureUrl) + '"></a></div><div class="mui-slider-item mui-active"><a href="#"><img src="' + (this.pictureUrl) + '"></a></div>';
+                            dian += '<div class="mui-indicator mui-active"></div>'
+                        } else {
+                            bannerstr += '<div class="mui-slider-item"><a href="#"><img src="' + (this.pictureUrl) + '"></a></div>';
+                            dian += '<div class="mui-indicator"></div>'
+                        }
+                        if(index == (banner_data.length - 1) || (banner_data.length - 1) == 0) {
+                            bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="#"><img src="' + (banner_data[0].pictureUrl) + '"></a></div>'
+                        }
+                    });
+                    dc('mui-slider-loop').innerHTML = bannerstr;
+                    dc('my-slider-indicator').innerHTML = dian;
+                    $("<div id='slider' class='mui-slider'><div class='mui-slider-group mui-slider-loop' id='mui-slider-loop'>" + bannerstr + "</div><div id='my-slider-indicator' class='mui-slider-indicator my-slider-indicator'>" + dian + "</div></div>").insertBefore(".banner-box-pro");
+
+                    //初始化banner自动轮播（interval:0为不自动轮播）单位ms
+                    var banner = mui('#slider');
+                    banner.slider({
+                        interval: 5000
+                    });
+                    $("#product-name-font").html(dt.data.product.productColorList[0].colorProductName);
+                    var productName = dt.data.product.productName;
+                    if(dt.data.product.productChoiceness != 0){
+                        productName = productName;
+					}
+            		$(".index-pro-tit").html(productName);
+					$(".proceId").append('<p class="mui-text-left">'+dt.data.product.productColorDes+'<span style="float: right;color: #ff3b3b;">'+"¥" + (dt.data.product.productColorList[0].colorDiscount/100).toFixed(2)+'</span></p>');
+                    var gift = "";
+					$.each(dt.data.product.productColorList[0].salesUserGiftList,function () {
+					    if(gift == ""){
+                            gift = this.giftName;
+						}else{
+                            gift = gift +"、" +this.giftName;
+						}
+                    });
+					$(".giftId").append(gift);
+                    selectProductImageText(productId);
+                    if(dt.data.product.productStatus == 1) {
+                        pStatus = true;
+                    } else {
+                        pStatus = false;
+                    }
+                } else {
+                    mui.confirm(dt.message + '是否重新加载页面？', '提示', btnArray, function(e) {
+                        if(e.index == 1) {
+                            location.reload(true);
+                        }
+                    });
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                errorfn(xhr);
+            }
+        });
+    }
+
+    // 获取产品详情
+    function selectProductImageText(productId) {
+        var btnArray = ['否', '是'];
+        mui.ajax('/iamberry/wechat/product/getPictureByProductId?productId=' + productId, {
+            dataType: 'json',
+            type: 'POST',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.status) {
+                    //console.log(dt.data)
+                    if(dt.data != null) {
+                        /*$("#item2").html(dt.data.imagetextContext);*/
+                        $(".product-param-img").html(dt.data.imagetextContext);
+                    } else {
+                        $(".product-param-img").empty();
+                        mui.alert('商品详情获取失败');
+                    }
+                } else {
+                    mui.confirm(dt.message + '是否刷新页面？', '提示', btnArray, function(e) {
+                        if(e.index == 1) {
+                            location.reload(true);
+                        }
+                    });
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                mui.confirm('您的网络开小差了，是否重新加载页面？', '提示', btnArray, function(e) {
+                    if(e.index == 1) {
+                        location.reload(true);
+                    }
+                });
+            }
+        });
+    }
+</script>
+</body>
 
 </html>

iamberry-wechat-web/src/main/webapp/common/wechat/shopping-cart.html

@@ -139,7 +139,7 @@
 						} else {
 							if(dt.status) {
 								console.log(dt)
-								
+
 							} else {
 								mui.alert("获取数据失败！");
 							}

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/machineNumber/MachineNumberServiceImpl.java

@@ -174,18 +174,20 @@ public class MachineNumberServiceImpl implements MachineNumberService{
         StringBuilder berQrcode = new StringBuilder(userid);
         String dateTime = String.valueOf(new Date().getTime());
         int dateTimeLen = len - userid.length();
-        dateTime = dateTime.substring(0,dateTimeLen);
+        dateTime = dateTime.substring(dateTime.length() - dateTimeLen,dateTime.length() - 1);
         berQrcode.append(dateTime);
 
+        numberList = list;
+        isflag = false;
         //根据条形码查询该机器信息
-        List<MachineNumber> machineList = machineNumberMapper.listMachineNumber(machineNumber);
+        /*List<MachineNumber> machineList = machineNumberMapper.listMachineNumber(machineNumber);
         if (machineList == null || machineList.size() == 0) {
             numberList = list;
             isflag = false;
-        }
+        }*/
         if (isflag) {
             //循环筛选出还未添加的机器信息
-            for (MachineNumber machine : list) {
+            /*for (MachineNumber machine : list) {
                 int num = 0;
                 sum++;
                 for (MachineNumber number : machineList) {
@@ -196,8 +198,8 @@ public class MachineNumberServiceImpl implements MachineNumberService{
                 if (num == 0) {
 
                     //生成机器二维码
-                    /*String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix + berQrcode + sum);
-                    QRCJson qrc = WeixinUtil.createQrcode(json);*/
+                    *//*String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix + berQrcode + sum);
+                    QRCJson qrc = WeixinUtil.createQrcode(json);*//*
                     //不需要用到二维码，所以给默认值
                     machine.setNumberQrcode(qrcode);
                     machine.setNumberBarcode(berQrcode.toString() + sum);
@@ -205,7 +207,7 @@ public class MachineNumberServiceImpl implements MachineNumberService{
                     machine.setNumberStatus(1);
                     numberList.add(machine);
                 }
-            }
+            }*/
         } else {
             for (MachineNumber machine : numberList) {
                 sum++;

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/qrcode/MachineQrCodeHandler.java

@@ -498,7 +498,7 @@ public class MachineQrCodeHandler {
 
         List<MachineNumber> list = new ArrayList<MachineNumber>();
         Member memberInfo = WechatUtils.getUserBySession(request);
-        String txtTime = request.getParameter("txtTime");
+        //String txtTime = request.getParameter("txtTime");
         //查询用户信息
         memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
         if (memberInfo == null) {
@@ -535,8 +535,17 @@ public class MachineQrCodeHandler {
             return msg;
         }
 
+        MachineNumber machineNumber = new MachineNumber();
+        machineNumber.setNumberOpenId(memberInfo.getUserOpenid());
+        machineNumber.setNumberSalesTime(new Date());
+        machineNumber.setNumberWatero(Integer.parseInt(numberWatero));
+        machineNumber.setNumberProvince(numberProvince);
+        machineNumber.setNumberCity(numberCity);
+        machineNumber.setNumberDistrict(numberDistrict);
+        list.add(machineNumber);
+
         //循环添加机器信息
-        if (txtTime != null && !"".equals(txtTime)) {
+        /*if (txtTime != null && !"".equals(txtTime)) {
             txtTime = txtTime.substring(0,txtTime.lastIndexOf(","));
             String[] times = txtTime.split(",");
             for (int i = 0;i < times.length;i++) {
@@ -549,7 +558,7 @@ public class MachineQrCodeHandler {
                 machineNumber.setNumberDistrict(numberDistrict);
                 list.add(machineNumber);
             }
-        }
+        }*/
 
         //添加机器信息
         boolean flag = machineNumberService.addMachineNumberList(list, memberInfo.getUserOpenid(), member);

wateroPF-wechat-web/src/main/webapp/view/add_machine.html

@@ -79,7 +79,7 @@
 			</div>
 			<div class="mui-input-row">
 				<label>手机号</label>
-				<input type="tel" maxlength="11" class="mui-input-clear" placeholder="请填写物流发货时预留的手机号" id="ipt-phone">
+				<input type="tel" maxlength="11" class="mui-input-clear" placeholder="请输入您的手机号码" id="ipt-phone">
 			</div>
 			<div class="mui-input-row">
 				<label>验&nbsp;&nbsp;证&nbsp;&nbsp;码</label>
@@ -239,7 +239,36 @@
                 mui(this).button('reset');
             }.bind(this), 2000);
             //mui.alert("本批watero试用机为新机，请您在试用过程中足够爱惜，切勿刮划机身及损坏包装，感谢您的配合！");
-            var data_array = {
+            var data_all = {
+                "phoneCode":$('#ipt-code').val(),
+                "userName":$('#ipt-name').val(),
+                "userTel":$('#ipt-phone').val(),
+                "userEmail":$('#ipt-email').val(),
+                "numberWatero":$('#ipt-water').attr('txtvalue'),
+                "numberProvince":numberProvince,
+                "numberCity":numberCity,
+                "numberDistrict":numberDistrict
+            };
+            $.ajax({
+                type: 'post',
+                url: base_path + '/qrcode/add_warranty_card',
+                data:data_all,
+                dataType: 'json',
+                timeout: 15000,
+                success: function(dt) {
+                    if (dt.status) {
+                        mui.openWindow({
+                            url: '/wateroPF/view/warranty_card.html'
+                        })
+                    } else {
+                        mui.alert(dt.message);
+                    }
+                },
+                error: function(xhr, type, errorThrown) {
+                    mui.alert("请检查网络或刷新页面重试！");
+                }
+            });
+            /*var data_array = {
                 "userTel":$('#ipt-phone').val()
             };
             $.ajax({
@@ -301,7 +330,7 @@
                 error: function(xhr, type, errorThrown) {
                     mui.alert("请检查网络或刷新页面重试！");
                 }
-            });
+            });*/
         }else{
             console.log("未通过");
             mui.alert(alert_msg);

wateroPF-wechat-web/src/main/webapp/view/warranty_card.html

@@ -119,17 +119,16 @@
 	});
 
 	function datePhone(phone) {
-	    if (phone != null && phone.length >= 12) {
+	    if (phone != null && phone.length >= 11) {
 			var phone1 = phone.substring(0,4);
             var phone2 = phone.substring(4,8);
             var phone3 = phone.substring(8,12);
-            var phone4 = phone.substring(12,phone.length);
+            var phone4 = phone.substring(11,phone.length);
             return phone1 + "  " + phone2 + "  " + phone3 + "  " + phone4;
 		}
 	}
 	//添加质保卡
     mui('body').on('tap', '.go_add_warranty_card', function() {
-        alert(num);
         location.href='/wateroPF/view/add_machine.html?num='+num;
 	});