Merge remote-tracking branch 'liujiankang/master'

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java

@@ -98,4 +98,6 @@ public interface MachineService {
 
     //批量添加机器
     Integer addMahineBatch(ArrayList<PtsMachine> ptsList);
+
+    PtsMachine getMachineAppByQrcode(String qrcode);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/order/EfastOrderServiceImpl.java

@@ -521,13 +521,11 @@ public class EfastOrderServiceImpl implements EfastOrderService {
             String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
             resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
             resultJson = resultJson.replaceAll("[\\t\\n\\r]", "");
-            logger.info("get-百胜订单列表，百胜返回信息:" + resultJson);
             JSONObject jsonObject = JSONObject.fromObject(resultJson);
-
             // default HTTP SUCCESS
             JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
             // 发货状态 : shipping_status
-            logger.info("get-百胜订单列表，百胜返回信息:" + resultJson);
+           // logger.info("get-百胜订单列表，百胜返回信息:" + resultJson);
             return respData;
         } catch (Exception e) {
             // TODO Auto-generated catch block

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java

@@ -176,5 +176,10 @@ public class MachineServiceImpl implements MachineService {
         return machineMapper.addMahineBatch(ptsList);
     }
 
+    @Override
+    public PtsMachine getMachineAppByQrcode(String qrcode) {
+        return machineMapper.getMachineAppByQrcode(qrcode);
+    }
+
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineMapper.java

@@ -35,6 +35,9 @@ public interface MachineMapper {
     //查询机器列表--webapp
     List<PtsMachine> listMachineWebApp(PtsMachine ptsMachine);
 
+    //查询机器列表--webapp
+    PtsMachine getMachineAppByQrcode(String qrcode);
+
     //查询当天的出库的机器台数
     Integer machineNumberWebApp(PtsMachine ptsMachine);
 

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -565,4 +565,14 @@
             tb_rst_pts_machine pm LEFT JOIN tb_rst_pts_sales_company sc on pm.machine_sales_company_id = sc.sales_company_id
              WHERE  machine_barcode = #{machineBarcode}
     </select>
+
+    <select id="getMachineAppByQrcode" parameterType="String" resultType="PtsMachine">
+        SELECT
+        t.machine_id machineId,
+        t.machine_qrcode machineQrcode,
+        t.machine_barcode machineBarcode
+        FROM  tb_rst_pts_machine t
+        WHERE
+          t.machine_qrcode = #{machineBarcode}
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -115,7 +115,7 @@ public class MQTask implements InitializingBean {
 	 * @throws Exception
 	 */
 	 @Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
-	//@Scheduled(cron = "0 0/2 * * * ?")//每三分钟执行一次
+	//@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 	//@Scheduled(cron = "*/10 * * * * ?")
 	public void syncEfastOrderList() throws Exception {
 		logger.info("---------------- 批量同步百胜订单开始 ---------------");
@@ -125,16 +125,6 @@ public class MQTask implements InitializingBean {
 		String date = "";
 		synchronized (lock) {
 			String configParameter = sysConfigService.getSysConfig(1);
-
-			//根据时间排序查询订单信息
-//			List<SalesOrder> orderList = salesOrderService.listSalesOrder(new SalesOrder());
-//			if (orderList != null && orderList.size() > 0) {
-//				SalesOrder salesOrder = orderList.get(0);
-//				date = salesOrder.getSalesCreateTime().toString();
-//			} else {
-//				date = "2016-04-01";
-//			}
-			String endTime = configParameter;
 			do {
 				//批量获取百胜订单信息
 				JSONObject obj = null;
@@ -160,10 +150,11 @@ public class MQTask implements InitializingBean {
 	}
 
 	/**
-	 * 同步百胜订单状态等信息
+	 * 同步百胜订单状态等信息----客诉系统
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+//	@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 	//@Scheduled(cron = "*/10 * * * * ?")
 	public void syncEfastOrderStatus() throws Exception {
 		int pageNo = 1;
@@ -179,29 +170,16 @@ public class MQTask implements InitializingBean {
 			SalesOrder order = new SalesOrder();
 			Calendar date = Calendar.getInstance();
 
-			Relu relu = new Relu();
-			relu.setrId(6);
-			relu.setrIsStatus(1);
 			//获取同步百胜订单的开始时间
-			List<Relu> reluList = sysService.ListSysRelu(relu);
-			if (reluList == null || reluList.size() == 0) {
-				relu.setrNum(7);
-				relu.setrText("0");
-			} else {
-				relu = reluList.get(0);
-			}
-			if (Integer.parseInt(relu.getrText()) > 0) {
-				date.setTime(beginDate);
-				date.set(Calendar.DATE, date.get(Calendar.DATE) - (int) relu.getrNum());
-				order.setSalesCreateTime(format.parse(format.format(date.getTime())));
-			} else {
-				order.setSalesCreateTime(format.parse("2016-04-01"));
-				relu.setrText("1");
-				//从头开始同步，只同步一次
-				//sysService.updateRelu(relu);
-			}
+			String configParameter = sysConfigService.getSysConfig(2);  //获取客诉订单同步百胜订单状态时间间隔
+			date.setTime(beginDate);
+			date.set(Calendar.DATE, date.get(Calendar.DATE) - Integer.valueOf(configParameter));
+			order.setStartDate(format.parse(format.format(date.getTime())));
+			order.setSalesCreateTime(format.parse(format.format(date.getTime())));
+
 			//根据创建时间获取订单信息
 			List<SalesOrder> orderlist = salesOrderService.listSalesOrder(order);
+			logger.info("需要同步订单状态的订单有：" + orderlist.size() + "个；");
 			if (orderlist == null || orderlist.size() == 0) {
 				return;
 			}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -961,6 +961,33 @@ public class AdminMachineController {
         rj.setResultMsg("取消出库操作成功");
         return rj;
     }
+
+    /**
+     * 查询机器
+     */
+    @ResponseBody
+    @RequiresPermissions("machine:delivery:machine")
+    @RequestMapping("/get_machine_app")
+    public ResponseJson getMachineApp(HttpServletRequest request, String machineQrcode) {
+        if (machineQrcode == null || "".equals(machineQrcode)) {
+            ResponseJson rj = new ResponseJson(500, "ERROR", 500);
+            rj.setResultMsg("未查询到机器");
+            return rj;
+        }
+
+        PtsMachine ptsMachine = machineService.getMachineAppByQrcode(machineQrcode);
+        System.out.println(machineQrcode + "--" + ptsMachine.getMachineBarcode());
+        if(ptsMachine!=null){
+            ResponseJson rj = new ResponseJson(200, "SUCCESS", 200);
+            rj.addResponseKeyValue("machineBarcode",ptsMachine.getMachineQrcode());
+            rj.setResultMsg("查询成功");
+            return rj;
+        }
+        ResponseJson rj = new ResponseJson(500, "ERROR", 500);
+        rj.setResultMsg("未查询到机器");
+        return rj;
+    }
+
     @ResponseBody
     @RequiresPermissions("machine:select_all:machine")
     @RequestMapping("/select_Batch")

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -317,7 +317,7 @@
     function batchUpdatePring(){
         var a = new Array();
         $("input[name='checkbox']:checkbox:checked").each(function(i) {
-            a[i] = $(this).val().substring(0, 13);
+            a[i] = $(this).val();
         })
         $.ajax({
             "type" : "post",

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/tooth_print_List.ftl

@@ -287,7 +287,7 @@
             function batchUpdatePring(){
                 var a = new Array();
                 $("input[name='checkbox']:checkbox:checked").each(function(i) {
-                    a[i] = $(this).val().substring(0, 13);
+                    a[i] = $(this).val();
                 })
                 $.ajax({
                     "type" : "post",

watero-rst-web/src/main/webapp/WEB-INF/views/wap/pts/machine_delivery.ftl

@@ -285,7 +285,35 @@
             success: function (res) {
                 var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
                 if (result.indexOf("weixin.qq.com") > 0) {
-                    mui.alert("请扫描条形码!");
+                    alert("请扫描条形码!");
+                    return;
+                    /*alert(result);
+                    var brCode = result.split(",");
+                    mui.ajax('${path}/admin/machine/get_machine_app', {
+                        data: {
+                            machineQrcode:result
+                        },
+                        type: 'post',
+                        timeout: 15000,
+                        success: function(dt) {
+                            if(dt.isRedirect) {
+                                if(dt.resultCode=="200") {
+                                    $('#machineBarcode').val(dt.returnMsg);
+                                    var btnArray = ['否', '是'];
+                                    mui.confirm('条形码：'+brCode[1], '是否出库？', btnArray, function(e) {
+                                        if (e.index == 1) {
+                                            addMachineDelivery();  //调用提交
+                                        }
+                                    })
+                                }else{
+                                    mui.alert("未查询到该机器!");
+                                }
+                            }
+                        },
+                        error: function(xhr, type, errorThrown) {
+                            mui.alert("加载失败！请检查网络或稍后重试！");
+                        }
+                    });*/
                 } else {
                     var code = result;
                     var brCode = code.split(",");

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -261,7 +261,7 @@ public class WeChatServiceImpl implements WeChatService {
 		Status status = new Status();
 		String senceid = requestMap.get("EventKey");//场景值
 		senceid = senceid.replaceAll(ResultInfo.barCodePrefix,"");//替换标识前的字符串
-        String str = bindingMachine(senceid, fromUserName);
+        String str = "【美国WaterO】经检测，您的机器为美国WaterO正品，请放心使用。";//bindingMachine(senceid, fromUserName);
         status.setCountext(str);
 		status.setFlag(false);
 		return status;
@@ -278,7 +278,7 @@ public class WeChatServiceImpl implements WeChatService {
 		Member member = refreshUserInfo(fromUserName);
 		String senceid = requestMap.get("EventKey");//场景值
 		senceid = senceid.replaceAll(ResultInfo.barCodePrefix,"");//替换标识前的字符串
-		String str = bindingMachine(senceid.trim(), fromUserName);
+		String str = "【美国WaterO】经检测，您的机器为美国WaterO正品，请放心使用。";//bindingMachine(senceid.trim(), fromUserName);
 		status.setCountext(str);
 		status.setFlag(false);
 		return status;