添加了质保卡信息

wateroPF-common-core/src/main/java/com/iamberry/wechat/core/entity/machineNumber/MachineNumber.java

@@ -12,19 +12,19 @@ import java.util.Date;
  */
 public class MachineNumber implements Serializable {
     private static final long serialVersionUID = 8495948690542817004L;
-    private Integer numberId;
-    private String numberOpenId;
-    private String numberQrcode;
-    private String numberBarcode;
-    private String numberBatch;
+    private Integer numberId;                   //id
+    private String numberOpenId;                //openId
+    private String numberQrcode;                //二维码
+    private String numberBarcode;               //条形码
+    private String numberBatch;                 //批次
 
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date numberSalesTime;
-    private Integer numberStatus;
-    private Date numberCreateTime;
-    private Date numberSubTime;
-    private Integer numberIsPrint;
+    private Date numberSalesTime;               //购买日期
+    private Integer numberStatus;               //状态
+    private Date numberCreateTime;              //创建时间
+    private Date numberSubTime;                 //关注时间
+    private Integer numberIsPrint;              //是否打印
     private PageBean page = new PageBean();		//分页
 
     public PageBean getPage() {

wateroPF-wechat-interface/src/main/java/com/iamberry/wechat/face/machineNumber/MachineNumberService.java

@@ -101,4 +101,11 @@ public interface MachineNumberService {
      * @return
      */
     Integer addMachineNumberAndUser(MachineNumber machineNumber);
+
+    /**
+     * 批量添加机器编号信息
+     * @param list
+     * @return
+     */
+    boolean addMachineNumberList(List<MachineNumber> list, String openid, Member member);
 }

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

@@ -9,12 +9,16 @@ import com.iamberry.wechat.core.entity.machineNumber.MachineNumberLogs;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
+import com.iamberry.wechat.core.entity.wx.QRCJson;
 import com.iamberry.wechat.face.machineNumber.MachineNumberService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.service.cart.CartServiceImpl;
 import com.iamberry.wechat.service.cart.dao.CartDao;
 import com.iamberry.wechat.service.mapper.MachineNumberMapper;
+import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.OrderNOUtil;
+import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.tools.WeixinUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -136,4 +140,86 @@ public class MachineNumberServiceImpl implements MachineNumberService{
     public Integer addMachineNumberAndUser(MachineNumber machineNumber) {
         return machineNumberMapper.addMachineNumberAndUser(machineNumber);
     }
+
+    @Override
+    public boolean addMachineNumberList(List<MachineNumber> list, String openid, Member member) {
+        boolean flag = false;
+        boolean isflag = true;//判断是否需要进入循环
+        int sum = 0;
+        String qrcode = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";//暂时不用二维码
+        MachineNumber machineNumber = new MachineNumber();
+        machineNumber.setNumberOpenId(openid);
+        machineNumber.setPage(null);
+        List<MachineNumber> numberList = new ArrayList<MachineNumber>();
+
+        if (list == null || list.size() <= 0) {
+            return flag;
+        }
+
+        //生成条形码
+        String userid = member.getUserId().toString();
+        int len = 11;//条形码不加sum的定长
+        StringBuilder berQrcode = new StringBuilder(userid);
+        String dateTime = String.valueOf(new Date().getTime());
+        int dateTimeLen = len - userid.length();
+        dateTime = dateTime.substring(0,dateTimeLen);
+        berQrcode.append(dateTime);
+
+        //根据条形码查询该机器信息
+        List<MachineNumber> machineList = machineNumberMapper.listMachineNumber(machineNumber);
+        if (machineList == null || machineList.size() == 0) {
+            numberList = list;
+            isflag = false;
+        }
+        if (isflag) {
+            //循环筛选出还未添加的机器信息
+            for (MachineNumber machine : list) {
+                int num = 0;
+                sum++;
+                for (MachineNumber number : machineList) {
+                    if (machine.getNumberSalesTime().getTime() == number.getNumberSalesTime().getTime()) {
+                        num++;
+                    }
+                }
+                if (num == 0) {
+
+                    //生成机器二维码
+                    /*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);
+                    machine.setNumberBatch(berQrcode.toString());
+                    machine.setNumberStatus(1);
+                    numberList.add(machine);
+                }
+            }
+        } else {
+            for (MachineNumber machine : numberList) {
+                sum++;
+                //生成机器二维码
+                /*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);
+                machine.setNumberBatch(berQrcode.toString());
+                machine.setNumberStatus(1);
+            }
+        }
+
+        //修改用户信息
+        int num = memberService.updateMemberByUserId(member);
+        //批量添加
+        int count = 1;
+        if (numberList.size() > 0) {
+            count = machineNumberMapper.addMachineNumberList(numberList);
+        }
+        if (num > 0 && count > 0) {
+            flag = true;
+        } else {
+            flag = false;
+        }
+
+        return flag;
+    }
 }

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/MachineNumberMapper.java

@@ -85,11 +85,18 @@ public interface MachineNumberMapper {
   */
     List<MachineNumberLogs> qrcodProgressUpdate(String[] logsBatchs);
 
- /**
-  * 添加机器编号，二维码及用户信息
-  * @param machineNumber
-  * @return
-  */
-  Integer addMachineNumberAndUser(MachineNumber machineNumber);
+   /**
+    * 添加机器编号，二维码及用户信息
+    * @param machineNumber
+    * @return
+    */
+    Integer addMachineNumberAndUser(MachineNumber machineNumber);
+
+   /**
+    * 批量添加机器编号信息
+    * @param list
+    * @return
+    */
+   Integer addMachineNumberList(List<MachineNumber> list);
 
 }

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

@@ -185,4 +185,23 @@ PUBLIC
 		VALUES
 		(#{numberOpenId},#{numberQrcode},#{numberBarcode},#{numberBatch},#{numberSalesTime},1,NOW(),#{numberSubTime})
 	</insert>
+
+	<insert id="addMachineNumberList" parameterType="ArrayList">
+		<selectKey resultType="int" keyProperty="numberId" order="AFTER">
+			SELECT
+			LAST_INSERT_ID()
+		</selectKey>
+		INSERT INTO tb_iamberry_user_machine_number
+		(
+			number_open_id,number_qrcode,number_barcode,number_batch,number_sales_time,
+			number_status,number_create_time,number_sub_time
+		)
+		VALUES
+		<foreach collection="list" item="item" index="index" separator="," >
+			(
+			#{item.numberOpenId},#{item.numberQrcode},#{item.numberBarcode},#{item.numberBatch},
+			#{item.numberSalesTime},#{item.numberStatus},NOW(),NOW()
+			)
+		</foreach>
+	</insert>
 </mapper>

wateroPF-wechat-web/pom.xml

@@ -45,6 +45,12 @@
             <artifactId>jstl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.7.3</version>
+        </dependency>
+
         <!-- 新的项目使用druid -->
         <dependency>
             <groupId>com.alibaba</groupId>

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -3,10 +3,15 @@ package com.iamberry.wechat.handles.mq;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.face.admin.SystemService;
+import com.iamberry.wechat.tools.HttpClient431Util;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +65,8 @@ public class MQTask implements InitializingBean {
 	
 	@Autowired
 	private CodeService codeService;
+	@Autowired
+	private SystemService systemService;
 	
 	private Lock lock = new ReentrantLock();
 
@@ -349,4 +356,31 @@ public class MQTask implements InitializingBean {
 			}
 		}
 	}
+
+	@SuppressWarnings(value = {"unchecked", "rawtypes"})
+	@Scheduled(cron = "0 0/1 * * * ?")
+	public void selectEfastOrder() {
+		try{
+			//获取cookie值
+			ShopSystemRule rule =  systemService.selectOneShopRuleById(244);
+
+			String phone = "13590159563";
+			String url = "http://121.199.165.244/efast_test/order_export.php";
+			Map<String,String> params = new HashMap<String,String>();
+			params.put("mobile",phone);     //手机号码
+			params.put("is_ajax","1");
+			params.put("act","query_order_export");
+			params.put("no_confirm","1");   //未确认
+			params.put("is_confirm","1");   //已确认
+			params.put("is_shipping","1");  //已发货
+			params.put("no_shipping","1");  //未发货
+			params.put("wait_shipping","1");//待发货
+			String cookie = rule.getRuleDesc();
+			//查询百胜订单信息
+			String str = HttpClient431Util.doGet(params,url,null,null,cookie);
+		} catch(Exception e) {
+			System.out.println("------------请求百胜接口失败-------------");
+		}
+
+	}
 }

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/vip_center.html

@@ -131,9 +131,9 @@
 				<div class="iconfont icon-wodequanbao"></div>
 				我的券包
 			</a>
-			<a  id="myMachine" class="mui-control-item" href="/wateroPF/view/my_equipment1.html" style="display:none">
-				<div class="iconfont icon-shebeiliebiao"></div>
-				我的设备
+			<a  id="myMachine" class="mui-control-item" href="/wateroPF/view/warranty_card.html">
+				<div class="iconfont icon-zhi"></div>
+				质保卡
 			</a>
 			<a id="fenxiao" class="mui-control-item try-a-fenxiao" href="#" style="display:none">
 				<div class="iconfont icon-fenxiaozhongxin"></div>

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/vip_center.js

@@ -70,9 +70,9 @@ mui.ready(function() {
                     $("#2WM").hide();
                     $("#fx2WM").show();
                 }
-                if(data.isMachine == 2){ //是否有机器 1:有 2:没有   没有机器则直接跳转到绑定机器页面
+                /*if(data.isMachine == 2){ //是否有机器 1:有 2:没有   没有机器则直接跳转到绑定机器页面
                     $("#myMachine").attr("href","/wateroPF/view/personal_information.html");
-                }
+                }*/
 
                 $.ajax({
 					type: 'post',