fixed 代码优化

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -627,10 +627,10 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> doSettle(HttpServletRequest request, SettlementParam param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
+        String isWechat = request.getHeader("isWechat") == null ? YesOrNoEnum.NO.getKey() : request.getHeader("isWechat");
         Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
         String platform = request.getHeader("platform") == null ? "" : request.getHeader("platform");
         String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
-        String isWechat = param.getIsWechat() == null ? YesOrNoEnum.NO.getKey() : param.getIsWechat();
         String cartIds = param.getCartIds() == null ? "" : param.getCartIds();
         Integer targetId = param.getTargetId() == null ? 0 : Integer.parseInt(param.getTargetId()); // 储值卡、升级等级必填
         String selectNum = param.getSelectNum() == null ? "" : param.getSelectNum(); // 储值卡必填

fuint-application/src/main/java/com/fuint/common/service/impl/PrinterServiceImpl.java

@@ -175,6 +175,15 @@ public class PrinterServiceImpl extends ServiceImpl<MtPrinterMapper, MtPrinter>
             printContent.append("<C>").append("<B>" + storeInfo.getName() + "</B>").append("<BR></C>");
             printContent.append("<BR>");
 
+            // 分割线
+            printContent.append(org.apache.commons.lang3.StringUtils.repeat("-", 32)).append("<BR>");
+
+            // 单号桌码
+            printContent.append("<L>订单号：").append(orderInfo.getOrderSn()).append("</L>");
+
+            // 分割线
+            printContent.append(org.apache.commons.lang3.StringUtils.repeat("-", 32)).append("<BR>");
+
             printContent.append("品名").append(org.apache.commons.lang3.StringUtils.repeat(" ", 16))
                         .append("数量").append(org.apache.commons.lang3.StringUtils.repeat(" ", 2))
                         .append("单价").append(org.apache.commons.lang3.StringUtils.repeat(" ", 2))

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSettlementController.java

@@ -1,6 +1,5 @@
 package com.fuint.module.clientApi.controller;
 
-import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.common.param.SettlementParam;
 import com.fuint.common.service.OrderService;
 import com.fuint.framework.exception.BusinessCheckException;
@@ -37,8 +36,6 @@ public class ClientSettlementController extends BaseController {
     @RequestMapping(value = "/submit", method = RequestMethod.POST)
     @CrossOrigin
     public ResponseObject submit(HttpServletRequest request, @RequestBody SettlementParam param) throws BusinessCheckException {
-        String isWechat = request.getHeader("isWechat") == null ? YesOrNoEnum.NO.getKey() : request.getHeader("isWechat");
-        param.setIsWechat(isWechat);
         Map<String, Object> result = orderService.doSettle(request, param);
         return getSuccessResult(result);
     }