修改了添加质保卡逻辑

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;
 	});