补打接口追加补打参数

src/main/java/com/sqx/modules/order/controller/OrderController.java

@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 @Slf4j
-@Api(tags={"管理端-订单"})
+@Api(tags = {"管理端-订单"})
 @RestController
 @RequestMapping("/admin/order")
 public class OrderController extends AbstractController {
@@ -38,8 +38,8 @@ public class OrderController extends AbstractController {
 
     @ApiOperation("条件查询所有订单")
     @GetMapping(value = "selectAllOrder")
-    public Result selectAllOrder(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName, String orderNumber, Integer orderType,String shopName){
-        return appOrderService.selectAllOrder(page, limit, status, phone, shopId, userName, orderNumber, orderType,shopName);
+    public Result selectAllOrder(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName, String orderNumber, Integer orderType, String shopName) {
+        return appOrderService.selectAllOrder(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName);
     }
 
     @ApiOperation("条件查询所有订单(管理端)")
@@ -47,22 +47,22 @@ public class OrderController extends AbstractController {
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
                                       String orderNumber, String indentStatus, String reservationFlag,
                                       @ApiParam("1上门 2骑手配送 3商家配送 不传查所有") Integer orderType,
-                                      String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime){
+                                      String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime) {
         return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime, endTime, payStartTime, payEndTime);
     }
 
     @GetMapping("excelOrder")
     @ApiOperation("导出卡密列表")
     public void excelOrder(Integer status, String phone, Long shopId, String userName,
-                           String orderNumber, Integer orderType,String shopName,String riderPhone,
-                           String startTime, String endTime, HttpServletResponse response) throws Exception{
+                           String orderNumber, Integer orderType, String shopName, String riderPhone,
+                           String startTime, String endTime, HttpServletResponse response) throws Exception {
         ExcelData excelData = appOrderService.excelAllOrderAdmin(status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, startTime, endTime);
-        ExportExcelUtils.exportExcel(response,"订单列表.xlsx",excelData);
+        ExportExcelUtils.exportExcel(response, "订单列表.xlsx", excelData);
     }
 
     @ApiOperation("完成订单")
     @PostMapping(value = "accomplishOrder")
-    public Result accomplishOrder(@Valid OrderFinishByShopDTO orderFinishByShopDTO){
+    public Result accomplishOrder(@Valid OrderFinishByShopDTO orderFinishByShopDTO) {
         appOrderService.finishOrderByShop(orderFinishByShopDTO);
 
         return Result.success();
@@ -70,7 +70,7 @@ public class OrderController extends AbstractController {
 
     @ApiOperation("添加送达照片")
     @PostMapping(value = "add-receive-img/{orderId}")
-    public Result addReceiveImg(@PathVariable Long orderId, @DecryptParam String img){
+    public Result addReceiveImg(@PathVariable Long orderId, @DecryptParam String img) {
         appOrderService.addReceiveImg(orderId, img);
 
         return Result.success();
@@ -78,43 +78,43 @@ public class OrderController extends AbstractController {
 
     @ApiOperation("管理订单")
     @PostMapping(value = "updateOrder")
-    public Result updateOrder(@RequestBody TbOrder tborder){
+    public Result updateOrder(@RequestBody TbOrder tborder) {
 
         return appOrderService.updateOrder(tborder);
     }
 
     @ApiOperation("管理端退款")
     @PostMapping(value = "adminCancelOrder")
-    public Result adminCancelOrder(Long orderId){
+    public Result adminCancelOrder(Long orderId) {
 
         return appOrderService.adminCancelOrder(orderId);
     }
 
     @ApiOperation("商家回复评论")
     @PostMapping(value = "shopReplyEvaluate")
-    public Result shopReplyEvaluate(String orderNumber, String shopReplyMessage){
+    public Result shopReplyEvaluate(String orderNumber, String shopReplyMessage) {
 
         return appOrderService.shopReplyEvaluate(orderNumber, shopReplyMessage);
     }
 
     @ApiOperation("商家删除评论")
     @PostMapping("/deleteEvaluate")
-    public Result deleteEvaluate(Long evaluateId){
+    public Result deleteEvaluate(Long evaluateId) {
         evaluateService.removeById(evaluateId);
         return Result.success();
     }
 
     @ApiOperation("打印票")
     @PostMapping(value = "/print")
-    public Result print(Long orderId){
-        return appOrderService.print(orderId);
+    public Result print(Long orderId, Integer isAppend) {
+        return appOrderService.print(orderId, isAppend);
     }
 
     @ApiOperation("获取用户评价列表")
     @GetMapping(value = "getEvaluateList")
-    public Result getEvaluateList( Long userId, Evaluate evaluate, Integer page, Integer limit){
+    public Result getEvaluateList(Long userId, Evaluate evaluate, Integer page, Integer limit) {
         evaluate.setUserId(userId);
-        return Result.success().put("data", appOrderService.getEvaluateList(evaluate,page,limit));
+        return Result.success().put("data", appOrderService.getEvaluateList(evaluate, page, limit));
     }
 
 }

src/main/java/com/sqx/modules/order/service/AppOrderService.java

@@ -17,7 +17,7 @@ public interface AppOrderService extends IService<TbOrder> {
 
     void insertOrder(Long userId, Long shopId, Long goodsId, Integer num, Long skuId, String skuMessage, Integer orderType);
 
-    Result print(Long orderId);
+    Result print(Long orderId, Integer isAppend);
 
     Result updateOrder(TbOrder order);
 

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -641,7 +641,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
                         // 设置店铺名称
                         order.setShopName(goodsShop.getShopName());
 
-                        FeiYunUtils.print(goodsShop.getSnCode(), null, order);
+                        FeiYunUtils.print(goodsShop.getSnCode(), null, order,null);
                     } catch (Exception e) {
                         log.error("订单：{}，小票打印失败，失败原因：{}", order.getOrderId(), e);
                     }
@@ -1558,7 +1558,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     }
 
     @Override
-    public Result print(Long orderId) {
+    public Result print(Long orderId, Integer isAppend) {
         // 查询订单信息
         TbOrder tbOrder = selectOrderByIds(orderId);
         Long shopId = tbOrder.getShopId();
@@ -1567,7 +1567,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         GoodsShop goodsShop = goodsShopDao.selectById(shopId);
 
         if (StringUtils.isNotEmpty(goodsShop.getSnCode())) {
-            FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder);
+            FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder, isAppend);
         } else {
             return Result.error("当前商家未绑定打印机！");
         }
@@ -1639,7 +1639,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             // 如果是预约订单，则不再打印小票（订单支付的时候已经打印过了）
             if (!StrUtil.equals(tbOrder.getReservationFlag(), Constant.YES)) {
                 if (StringUtils.isNotEmpty(goodsShop.getSnCode())) {
-                    FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder);
+                    FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder,null);
                 }
             }
         } else if (order.getStatus() == 3) {

src/main/java/com/sqx/modules/printInfo/controller/PrintInfoController.java

@@ -66,7 +66,7 @@ public class PrintInfoController {
         tbOrder.setCountOrder(3);
 
         if (StringUtils.isNotEmpty(goodsShop.getSnCode())) {
-            FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder);
+            FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder,null);
         } else {
             return Result.error("当前商家未绑定打印机！");
         }

src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -309,7 +309,7 @@ public class FeiYunUtils {
      * @return 成功：{"msg":"ok","ret":0,"data":"xxxxxxx_xxxxxxxx_xxxxxxxx","serverExecutedTime":5}
      * 失败：{"msg":"错误描述","ret":非0,"data":"null","serverExecutedTime":5}
      */
-    public static String print(String sn, Integer classify, TbOrder tbOrder) {
+    public static String print(String sn, Integer classify, TbOrder tbOrder, Integer isAppend) {
         try {
             //标签说明：
             //单标签:
@@ -1493,7 +1493,7 @@ public class FeiYunUtils {
 
             String content = stringBuilder.toString();
 
-            doRequest(sn, content);
+            doRequest(sn, content, tbOrder.getStatus(), isAppend);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -1522,7 +1522,7 @@ public class FeiYunUtils {
             sb.append("<BR>");
             sb.append("<CUT>");
 
-            doRequest(sn, sb.toString());
+            doRequest(sn, sb.toString(),5,null);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -1531,7 +1531,7 @@ public class FeiYunUtils {
         return null;
     }
 
-    private static void doRequest(String sn, String content) {
+    private static void doRequest(String sn, String content, Integer status, Integer isAppend) {
         RequestConfig requestConfig = RequestConfig.custom()
                 .setSocketTimeout(30000)//读取超时
                 .setConnectTimeout(30000)//连接超时