POS机小票

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -472,7 +472,7 @@ public class ElectronicMembershipCardController {
 //                    }
                     resultData = ResultData.success(CodeMsg.SUCCESS);
                     //打印小票
-                    //this.printReceipt(payOrder);
+                    this.printReceipt(payOrder);
                     //pos机打印小票
                     this.posPrintReceipt(payOrder);
                 }else {
@@ -495,12 +495,12 @@ public class ElectronicMembershipCardController {
     public void posPrintReceipt(PayOrder payOrder){
         Map<String, Object> infoMap = payOrderService.getOrderInfoAndUserInfoByOrderNo(payOrder);
         Map<String, Object> m = new HashMap<>();
-        if(payOrder.getTransactionId() !=null){
-            m.put("transactionId", payOrder.getTransactionId());
-        }
+//        if(payOrder.getTransactionId() !=null){
+//            m.put("transactionId", payOrder.getTransactionId());
+//        }
         //ordNo
         if(infoMap !=null && infoMap.containsKey("orderNo") && infoMap.get("orderNo") !=null){
-            m.put("ordNo", infoMap.get("orderNo").toString());
+            m.put("orderNo", infoMap.get("orderNo").toString());
         }
         if(infoMap !=null && infoMap.containsKey("amt") && infoMap.get("amt") !=null){
             m.put("amt", infoMap.get("amt").toString());

YijiaRestful/src/main/java/com/platform/yijia/controller/IntegralShoppingMallController.java

@@ -6,6 +6,7 @@ import com.platform.yijia.pojo.*;
 import com.platform.yijia.service.*;
 import com.platform.yijia.utils.CodeMsg;
 import com.platform.yijia.utils.FeiEPrinterUtil;
+import com.platform.yijia.utils.PosPrinterUtil;
 import com.platform.yijia.utils.ResultData;
 import com.platform.yijia.utils.redis.RedisCacheUtil;
 import com.platform.yijia.utils.weixinapp.WeiXinUserUtil;
@@ -238,6 +239,21 @@ public class IntegralShoppingMallController {
                                 wxPushUtil.push(gzhAppId, gzhAppSecret, gzhNewsTemplateInfo.getTemplateId(), request.getOpenId(), wxMpTemplate);
                                 resultData=ResultData.success(CodeMsg.SUCCESS);
                             }
+
+                            //POS机打印小票
+                            Map<String, Object> map = new HashMap<>();
+                            map.put("orderNo", integralOrderNo);
+                            map.put("createdDate", new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime()));
+                            map.put("payDate", new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime()));
+                            map.put("stationName", stationName);
+                            map.put("waresName", integralOrder.getWaresName());
+                            map.put("exchangeNum", integralOrder.getExchangeNum());
+                            map.put("orderSumIntegral", orderSumIntegral);
+                            map.put("surplusPoints", surplusPoints);
+                            map.put("customerName", integralOrder.getCustomerName());
+                            map.put("orderType", "3");
+                            PosPrinterUtil.sendPosPrintDirectMessage(map);
+
                             //打印机打印小票
                             List<Map<String, Object>> stationPrinterList = stationService.getStationPrinterList(request.getStationId());
                             if(stationPrinterList != null && stationPrinterList.get(0).get("integralPrintFlag").toString().equals("1")){
@@ -279,6 +295,9 @@ public class IntegralShoppingMallController {
         return gson.toJson(resultData);
     }
 
+
+
+
     //获取公众号消息模板
 //    @RequestMapping(value = "/getGzhNewsTemplate", method = RequestMethod.GET)
 //    @ResponseBody

YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -751,8 +751,11 @@ public class PayController {
     public void posPrintReceipt(PayOrder payOrder){
         Map<String, Object> infoMap = payOrderService.getOrderInfoAndUserInfoByOrderNo(payOrder);
         Map<String, Object> m = new HashMap<>();
-        if(payOrder.getTransactionId() !=null){
-            m.put("transactionId", payOrder.getTransactionId());
+//        if(payOrder.getTransactionId() !=null){
+//            m.put("transactionId", payOrder.getTransactionId());
+//        }
+        if(infoMap !=null && infoMap.containsKey("orderNo") && infoMap.get("orderNo") !=null){
+            m.put("orderNo", infoMap.get("orderNo").toString());
         }
         if(infoMap !=null && infoMap.containsKey("amt") && infoMap.get("amt") !=null){
             m.put("amt", infoMap.get("amt").toString());

YijiaRestful/src/main/java/com/platform/yijia/pojo/ContentData.java

@@ -0,0 +1,36 @@
+package com.platform.yijia.pojo;
+
+import lombok.Data;
+
+@Data
+public class ContentData {
+
+    //小票样式公用参数
+    private String orderType;       //订单类型： 1、油品订单； 2、非油品订单； 3、积分订单；
+    private String orderNo;         //订单号
+    private String createdDate;     //下单时间
+    private String payDate;         //付款时间
+    private String stationName;     //油站名称
+    private String stationId;       //油站ID
+
+    //油品订单参数
+    private String oilGun;          //油枪
+    private String oilName;         //油品
+    private String oilPirce;        //油品价格（单价）
+    private String orderLiters;     //订单加油升数
+    private String receivableAmt;   //应收金额
+    private String amt;             //实收金额
+    private String discountAmt;     //优惠金额
+    private String payType;         //支付方式  例：微信、电子卡
+    private String mobilePhone;     //手机号   例：186****5051
+
+    //积分小票
+    private String waresName;                //兑换商品
+    private String exchangeNum;              //商品数量
+    private String orderSumIntegral;         //消耗积分
+    private String surplusPoints;            //剩余积分
+    private String customerName;             //客户昵称
+
+
+
+}