修改小票单联两联调整

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

@@ -629,10 +629,9 @@ public class PayController {
                             content1 += "<BOLD><B>原价： "+receivableAmtP+" 元</B></BOLD><BR>";
                             content1 += "优惠： "+discountAmtP+" 元<BR>";
                             content1 += "支付： "+amtP+" 元<BR>";
-                            //content1 += "手机号： "+mobilePhoneP+" <BR>";
                             content1 += "支付方式： "+payWayP+" <BR>";
                             content1 += "<BR>";
-                            content1 += "--------------------------------<BR>";
+                            //content1 += "--------------------------------<BR>";
                             content1 += "<BR>";
 
                             content2 = "<CB>支付小票--商户联</CB><BR>";
@@ -661,9 +660,22 @@ public class PayController {
 //                                if(jsonPrintStatus.getString("data").equals("\\u5728\u7ebf\\uff0c\\u5de5\\u4f5c\\u72b6\u6001\\u6b63\\u5e38\\u3002")){
 //                                    logger.info("打印机在线，工作状态正常：" + jsonPrintStatus.toString());
                                 //开始打印
-                                String printInfo = FeiEPrinterUtil.printReceipt(sn, content1 + content2);
+                                String printInfo="";    //打印信息
+                                if(m.containsKey("printSetting") && m.get("printSetting").toString()!= null && m.get("printSetting").toString()!=""){
+                                    switch (m.get("printSetting").toString()){
+                                        case "1":   //1 客户联
+                                            printInfo = FeiEPrinterUtil.printReceipt(sn, content1);
+                                            break;
+                                        case "2":   //2 商户联
+                                            printInfo = FeiEPrinterUtil.printReceipt(sn, content2);
+                                            break;
+                                        case "3":   //3商户联和客户联
+                                            printInfo = FeiEPrinterUtil.printReceipt(sn, content1 + content2);
+                                            break;
+                                    }
+                                }
                                 JSONObject jsonObject = JSONObject.parseObject(printInfo);
-                                if(jsonObject.getString("msg").equals("ok")){
+                                if(jsonObject != null && jsonObject.getString("msg").equals("ok")){
                                     logger.info("打印成功：" + jsonObject.toString());
                                     //如果打印成功 添加小票数量
                                     PayOrder p = new PayOrder();

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -62,8 +62,10 @@ public class PayOrderServiceImpl implements PayOrderService {
         payOrder.setPayType("sxf");      //支付类型
         if(StringUtils.isNotBlank(payOrderRequest.getUserType())&& payOrderRequest.getUserType().equals("1")){
             payOrder.setPayWay("02");        //支付方式：02公众号，03小程序',
+            payOrder.setWxAmt(Double.valueOf(payOrderRequest.getAmt()));    //微信支付金额
         }else if(StringUtils.isNotBlank(payOrderRequest.getUserType())&& payOrderRequest.getUserType().equals("2")){
             payOrder.setPayWay("03");
+            payOrder.setWxAmt(Double.valueOf(payOrderRequest.getAmt()));    //微信支付金额
         }
         payOrder.setCreatedDate(new Date());                    //创建时间
         payOrder.setOrderType(payOrderRequest.getOrderType());  //订单类型

YijiaRestful/src/main/resources/mapper/StationOilGunMapper.xml

@@ -319,17 +319,19 @@
   <!--根据油站Id油枪号获取打印机编号 -->
   <select id="getPrinterSnByStationIdAndOilGunNo" parameterType="map" resultType="map">
     SELECT
-        gun_no       AS oilGunNo,
-        station_id   AS stationId,
-        device_no    AS printerSn
-    FROM  station_device_manage
+        A.gun_no            AS oilGunNo,
+        A.station_id        AS stationId,
+        A.device_no         AS printerSn,
+        B.print_setting     AS printSetting
+    FROM  station_device_manage     AS A
+        LEFT JOIN station_pay       AS B ON A.station_id = B.station_id
     <where>
-            device_status = "1"
+            A.device_status = "1"
         <if test="oilGunNo != null and oilGunNo !=''">
-          AND FIND_IN_SET(#{oilGunNo}, gun_no)
+          AND FIND_IN_SET(#{oilGunNo}, A.gun_no)
         </if>
         <if test="stationId != null and stationId !=''">
-          AND station_id = #{stationId}
+          AND A.station_id = #{stationId}
         </if>
     </where>