jk-GitHub-coder 4 anni fa
parent
commit
ffc2edf3e4

+ 9 - 1
YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -560,7 +560,15 @@ public class ElectronicMembershipCardController {
         if(infoMap !=null && infoMap.containsKey("orderType") && infoMap.get("orderType") !=null){
             m.put("orderType", infoMap.get("orderType").toString());
         }
-        PosPrinterUtil.sendPosPrintDirectMessage(m);
+        String resultString = PosPrinterUtil.sendPosPrintDirectMessage(m);
+        JSONObject jsonObject = JSONObject.parseObject(resultString);
+        if(jsonObject.containsKey("code") && jsonObject.get("code").toString().equals("200")){
+            //如果打印成功 添加小票数量
+            PayOrder p = new PayOrder();
+            p.setPrintCount(1);
+            p.setOrderNo(infoMap.get("orderNo").toString());
+            payOrderService.getUpdatePayOrder(p);
+        }
     }
 
 

+ 7 - 1
YijiaRestful/src/main/java/com/platform/yijia/controller/IntegralShoppingMallController.java

@@ -252,7 +252,13 @@ public class IntegralShoppingMallController {
                             map.put("surplusPoints", surplusPoints);
                             map.put("customerName", integralOrder.getCustomerName());
                             map.put("orderType", "3");
-                            PosPrinterUtil.sendPosPrintDirectMessage(map);
+                            String resultString = PosPrinterUtil.sendPosPrintDirectMessage(map);
+                            JSONObject jsonObject_pos = JSONObject.parseObject(resultString);
+                            if(jsonObject_pos.containsKey("code") && jsonObject_pos.get("code").toString().equals("200")){
+                                //如果打印成功 添加小票数量
+                                integralOrder.setPrinterStatus("1");
+                                integralOrderService.updateIntegralOrder(integralOrder);
+                            }
 
                             //打印机打印小票
                             List<Map<String, Object>> stationPrinterList = stationService.getStationPrinterList(request.getStationId());

+ 9 - 1
YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -815,7 +815,15 @@ public class PayController {
         if(infoMap !=null && infoMap.containsKey("orderType") && infoMap.get("orderType") !=null){
             m.put("orderType", infoMap.get("orderType").toString());
         }
-        PosPrinterUtil.sendPosPrintDirectMessage(m);
+        String resultString = PosPrinterUtil.sendPosPrintDirectMessage(m);
+        JSONObject jsonObject = JSONObject.parseObject(resultString);
+        if(jsonObject.containsKey("code") && jsonObject.get("code").toString().equals("200")){
+            //如果打印成功 添加小票数量
+            PayOrder p = new PayOrder();
+            p.setPrintCount(1);
+            p.setOrderNo(infoMap.get("orderNo").toString());
+            payOrderService.getUpdatePayOrder(p);
+        }
     }
 
 

+ 4 - 2
YijiaRestful/src/main/java/com/platform/yijia/utils/PosPrinterUtil.java

@@ -38,7 +38,7 @@ public class PosPrinterUtil {
     // "discountAmt":0.0,"wxAmt":0.01,"printCount":1,"oilType":"2"}
 
     //推送要打印小票的信息
-    public static void sendPosPrintDirectMessage(Map<String, Object> args){
+    public static String sendPosPrintDirectMessage(Map<String, Object> args){
         logger.info("开始推送消息:" +args.toString());
         Map<String, Object> params = new Hashtable<>();
         params.put("messageTitle", "pos");
@@ -52,6 +52,7 @@ public class PosPrinterUtil {
         //创建请求
         CloseableHttpClient httpClients = HttpClients.createDefault();
         CloseableHttpResponse response = null;
+        String resultString ="";
         try {
             // 创建Http Post请求
             HttpPost httpPost = new HttpPost(SEND_POS_PRINT_MESSAGE_URL);
@@ -60,7 +61,7 @@ public class PosPrinterUtil {
             httpPost.setEntity(entity);
             // 执行http请求
             response = httpClients.execute(httpPost);
-            String resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
             logger.info("POS推送订单消息结果:" +resultString);
         } catch (Exception e) {
             e.printStackTrace();
@@ -71,5 +72,6 @@ public class PosPrinterUtil {
                 e.printStackTrace();
             }
         }
+        return resultString;
     }
 }