Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java

@@ -73,11 +73,11 @@ public class HighOrderController {
     @RequestMapping(value = "/print", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "打印")
-    public ResponseData print(@RequestParam(name = "orderId", required = true) Long orderId,
+    public ResponseData print(@RequestParam(name = "orderNo", required = true) String orderNo,
                               @RequestParam(name = "printType", required = true) Integer printType) {
         try {
 
-            HighOrder order = highOrderService.getOrderById(orderId);
+            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
             if (order == null) {
                 log.error("HighCouponController -> getCouponList() error!","权限不足");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, "");

hai-service/src/main/java/com/hai/config/SpPrinterTemplate.java

@@ -77,7 +77,7 @@ public class SpPrinterTemplate {
                 "------------------------------<BR>" +
                 "打印时间：" + DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss") + "<BR>" +
                 "支付时间：" + payTime + "<BR>" +
-                "电话：" + phone.substring(0, 3) + "****" + phone.substring(7) + "<BR>" +
+                "电话：" + (StringUtils.isNotBlank(phone)?phone.substring(0, 3) + "****" + phone.substring(7):"") + "<BR>" +
                 "来源：" + (StringUtils.isNotBlank(MapUtils.getString(receiptMap, "receiptSource"))?MapUtils.getString(receiptMap, "receiptSource"):"嗨森逛")+ "<BR>" +
                 "油枪："+ gunNo + "号<BR>" +
                 "油品：" + oilNo + "#<BR>" +
@@ -122,7 +122,7 @@ public class SpPrinterTemplate {
                 "------------------------------<BR>" +
                 "打印时间：" + DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss") + "<BR>" +
                 "支付时间：" + payTime + "<BR>" +
-                "电话：" + phone.substring(0, 3) + "****" + phone.substring(7) + "<BR>" +
+                "电话：" + (StringUtils.isNotBlank(phone)?phone.substring(0, 3) + "****" + phone.substring(7):"") + "<BR>" +
                 "来源：" + (StringUtils.isNotBlank(MapUtils.getString(receiptMap, "receiptSource"))?MapUtils.getString(receiptMap, "receiptSource"):"嗨森逛")+ "<BR>" +
                 "油枪："+ gunNo + "号<BR>" +
                 "油品：" + oilNo + "#<BR>" +

hai-service/src/main/java/com/hai/config/ZkcPrinterTemplate.java

@@ -153,7 +153,7 @@ public class ZkcPrinterTemplate {
         stream.write(("支付时间：" + payTime).getBytes("UTF-8"));
         stream.write(0x0A);
 
-        stream.write(("电话：" + phone.substring(0, 3) + "****" + phone.substring(7)).getBytes("UTF-8"));
+        stream.write(("电话：" + (StringUtils.isNotBlank(phone)?phone.substring(0, 3) + "****" + phone.substring(7):"")).getBytes("UTF-8"));
         stream.write(0x0A);
 
         stream.write(("来源：" + (StringUtils.isNotBlank(MapUtils.getString(receiptMap, "receiptSource"))?MapUtils.getString(receiptMap, "receiptSource"):"嗨森逛")).getBytes("UTF-8"));
@@ -257,7 +257,7 @@ public class ZkcPrinterTemplate {
         stream.write(("支付时间：" + payTime).getBytes("UTF-8"));
         stream.write(0x0A);
 
-        stream.write(("电话：" + phone.substring(0, 3) + "****" + phone.substring(7)).getBytes("UTF-8"));
+        stream.write(("电话：" + (StringUtils.isNotBlank(phone)?phone.substring(0, 3) + "****" + phone.substring(7):"")).getBytes("UTF-8"));
         stream.write(0x0A);
 
         stream.write("来源：嗨森逛".getBytes("UTF-8"));