fixed 云打印控制

fuint-application/src/main/java/com/fuint/common/aspect/TActionLogAop.java

@@ -136,16 +136,19 @@ public class TActionLogAop {
     @After("serviceAspect() && @annotation(operationServiceLog)")
     public void doAfterInService(OperationServiceLog operationServiceLog) {
         try {
+            HttpServletRequest request = getRequest();
+            if (request == null) {
+                return;
+            }
             endTimeMillis = System.currentTimeMillis(); // 记录方法执行完成的时间
-            clientIp = CommonUtil.getIPFromHttpRequest(getRequest());
-            userAgent = getRequest().getHeader("user-agent");
-            url = getRequest().getRequestURI();
+            clientIp = CommonUtil.getIPFromHttpRequest(request);
+            userAgent = request.getHeader("user-agent");
+            url = request.getRequestURI();
             clientPort = 0;
             module = operationServiceLog.description();
             if (module.length() > 255) {
                 module = module.substring(0, 255);
             }
-            HttpServletRequest request = getRequest();
             String token = request.getHeader("Access-Token");
             if (StringUtils.isNotEmpty(token)) {
                 AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);

fuint-application/src/main/java/com/fuint/common/service/PrinterService.java

@@ -33,6 +33,8 @@ public interface PrinterService extends IService<MtPrinter> {
      */
     MtPrinter addPrinter(MtPrinter mtPrinter) throws BusinessCheckException;
 
+    void doPrint() throws BusinessCheckException;
+
     /**
      * 根据ID获取打印机信息
      *

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

@@ -10,10 +10,9 @@ import com.fuint.common.enums.*;
 import com.fuint.common.param.OrderListParam;
 import com.fuint.common.param.SettlementParam;
 import com.fuint.common.service.*;
-import com.fuint.common.util.CommonUtil;
-import com.fuint.common.util.DateUtil;
-import com.fuint.common.util.SeqUtil;
-import com.fuint.common.util.TokenUtil;
+import com.fuint.common.util.*;
+import com.fuint.common.vo.printer.ObjectRestResponse;
+import com.fuint.common.vo.printer.PrintRequest;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationResponse;
@@ -169,6 +168,11 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
      * */
     private PaymentService paymentService;
 
+    /**
+     * 会员卡券服务接口
+     * */
+    private PrinterService printerService;
+
     /**
      * 获取用户订单列表
      * @param  orderListParam
@@ -1438,6 +1442,8 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             }
         }
 
+        printerService.doPrint();
+
         // 给商家发送通知短信
         try {
             MtStore mtStore = storeService.queryStoreById(mtOrder.getStoreId());

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

@@ -66,11 +66,6 @@ public class PaymentServiceImpl implements PaymentService {
      * */
     private UserCouponService userCouponService;
 
-    /**
-     * 开卡赠礼服务接口
-     * */
-    private OpenGiftService openGiftService;
-
     /**
      * 创建预支付订单
      *

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

@@ -8,10 +8,7 @@ import com.fuint.common.enums.SettingTypeEnum;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.util.HashSignUtil;
 import com.fuint.common.util.PrinterUtil;
-import com.fuint.common.vo.printer.AddPrinterRequest;
-import com.fuint.common.vo.printer.AddPrinterRequestItem;
-import com.fuint.common.vo.printer.DelPrinterRequest;
-import com.fuint.common.vo.printer.RestRequest;
+import com.fuint.common.vo.printer.*;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -140,6 +137,60 @@ public class PrinterServiceImpl extends ServiceImpl<MtPrinterMapper, MtPrinter>
         }
     }
 
+    /**
+     * 执行打印
+     *
+     * @param
+     * */
+    @Override
+    public void doPrint() throws BusinessCheckException {
+        PrintRequest printRequest = new PrintRequest();
+        createRequestHeader(0, printRequest);
+        printRequest.setSn("74BLW3L8C2FE448");
+
+        StringBuilder printContent = new StringBuilder();
+        printContent.append("不加标签：").append("默认字体大小<BR>");
+        printContent.append("<BR>");
+        printContent.append("L标签：").append("<L>左对齐<BR></L>");
+        printContent.append("<BR>");
+        printContent.append("R标签：").append("<R>右对齐<BR></R>");
+        printContent.append("<BR>");
+        printContent.append("C标签：").append("<C>居中对齐<BR></C>");
+
+        printContent.append("<BR>");
+        printContent.append("N标签：").append("<N>字体正常大小<BR></N>");
+        printContent.append("<BR>");
+        printContent.append("HB标签：").append("<HB>字体变高一倍<BR></HB>");
+        printContent.append("<BR>");
+        printContent.append("WB标签：").append("<WB>字体变宽一倍<BR></WB>");
+        printContent.append("<BR>");
+        printContent.append("B标签：").append("<B>字体放大一倍<BR></B>");
+        printContent.append("<BR>");
+        printContent.append("HB2标签：").append("<HB2>字体变高二倍<BR></HB2>");
+        printContent.append("<BR>");
+        printContent.append("WB2标签：").append("<WB2>字体变宽二倍<BR></WB2>");
+        printContent.append("<BR>");
+        printContent.append("B2标签：").append("<B2>字体放大二倍<BR></B2>");
+        printContent.append("<BR>");
+        printContent.append("BOLD标签：").append("<BOLD>字体加粗<BR></BOLD>");
+
+        // 嵌套使用对齐和字体
+        printContent.append("<BR>");
+        printContent.append("<C>嵌套使用：").append("<BOLD>居中加粗</BOLD>").append("<BR></C>");
+
+        // 打印条形码和二维码
+        printContent.append("<BR>");
+        printContent.append("<C><BARCODE>9884822189</BARCODE></C>");
+        printContent.append("<C><QR>https://www.xpyun.net</QR></C>");
+
+        printRequest.setContent(printContent.toString());
+        printRequest.setCopies(1);
+        printRequest.setVoice(2);
+        printRequest.setMode(0);
+        ObjectRestResponse<String> resp = PrinterUtil.print(printRequest);
+        String a = "abc";
+    }
+
     /**
      * 根据ID获打印机取息
      *
@@ -182,7 +233,7 @@ public class PrinterServiceImpl extends ServiceImpl<MtPrinterMapper, MtPrinter>
     /**
      * 修改打印机数据
      *
-     * @param mtPrinter
+     * @param mtPrinter 打印机参数
      * @throws BusinessCheckException
      * @return
      */
@@ -268,7 +319,6 @@ public class PrinterServiceImpl extends ServiceImpl<MtPrinterMapper, MtPrinter>
                 request.setTimestamp(System.currentTimeMillis() + "");
                 //*必填*：对参数 user + UserKEY + timestamp 拼接后（+号表示连接符）进行SHA1加密得到签名，值为40位小写字符串，其中 UserKEY 为用户开发者密钥
                 request.setSign(HashSignUtil.sign(request.getUser() + userKey + request.getTimestamp()));
-
                 //debug=1返回非json格式的数据，仅测试时候使用
                 request.setDebug("0");
             }