打印

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

@@ -455,27 +455,46 @@ public class PayController {
             System.out.println("===================验签成功==============");
             logger.info("验签成功");
             //验签成功，修改订单状态
-            List<PayOrder> list = payOrderService.getPayOrderList(ordNo);
-            logger.info("根据订单号，查询订单"+gson.toJson(list));
-            if (list != null && list.size() == 1) {
-                String status = list.get(0).getStatus();
-                int ordId= list.get(0).getOrderId();
-                //状态为未支付 0  修改状态为1已支付
-                if (status.equals("0")) {
-                    PayOrder payOrder = new PayOrder();
-                    payOrder.setOrderId(ordId);
-                    payOrder.setOrderNo(ordNo);
-                    payOrder.setStatus("1");
-                    payOrder.setPayDate(new Date());    //支付时间
-                    payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
-                    //修改订单状态
-                    int count = payOrderService.getUpdatePayOrder(payOrder);
-                    if(count == 1){
-                        req.put("code","success");
-                        req.put("msg","修改订单状态成功");
-                        logger.info(req.toString());
-                    }
-
+            PayOrder payOrder = new PayOrder();
+            //payOrder.setOrderId(ordId);
+            payOrder.setOrderNo(ordNo);
+            payOrder.setStatus("1");
+            payOrder.setPayDate(new Date());    //支付时间
+            payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
+            int count = payOrderService.getUpdatePayOrder(payOrder);
+            if(count > 0){
+                req.put("code","success");
+                req.put("msg","修改订单状态成功");
+                logger.info(req.toString());
+                List<PayOrder> list = payOrderService.getPayOrderList(ordNo);
+                logger.info("根据订单号，查询订单"+gson.toJson(list));
+                String sn = "921611605";     //测试打印机 sn：921611605 key：72338zma
+                String content;
+                if(list != null && list.size() == 1){
+                    content = "<CB>支付小票--商户联</CB><BR>";
+                    //content += "--------------------------------<BR>";
+                    content += "订单号："+list.get(0).getOrderNo()+" <BR>";
+                    content += "时间："+list.get(0).getCreatedDate().toString()+"<BR>";
+                    content += "油站："+list.get(0).getStationName()+" 元<BR>";
+                    content += "油品： "+list.get(0).getOilName()+" 元<BR>";
+                    content += "油量： "+list.get(0).getOrderLiters()+" 升<BR>";
+                    content += "单价： "+list.get(0).getOilPirce()+" L/元<BR>";
+                    content += "金额： "+list.get(0).getReceivableAmt().toString()+" 元<BR>";
+                    content += "优惠： "+list.get(0).getDiscountAmt().toString()+" 元<BR>";
+                    content += "支付： "+list.get(0).getDiscountAmt().toString()+" 元<BR>";
+                    content += "--------------------------------<BR>";
+                    content = "<CB>支付小票--顾客联</CB><BR>";
+                    //content += "--------------------------------<BR>";
+                    content += "订单号："+list.get(0).getOrderNo()+" <BR>";
+                    content += "时间："+list.get(0).getCreatedDate().toString()+"<BR>";
+                    content += "油站："+list.get(0).getStationName()+" 元<BR>";
+                    content += "油品： "+list.get(0).getOilName()+" 元<BR>";
+                    content += "油量： "+list.get(0).getOrderLiters()+" 升<BR>";
+                    content += "单价： "+list.get(0).getOilPirce()+" L/元<BR>";
+                    content += "金额： "+list.get(0).getReceivableAmt().toString()+" 元<BR>";
+                    content += "优惠： "+list.get(0).getDiscountAmt().toString()+" 元<BR>";
+                    content += "支付： "+list.get(0).getDiscountAmt().toString()+" 元<BR>";
+                    FeiEPrinterUtil.printReceipt(sn, content);
                 }
             }
         }else {

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

@@ -34,50 +34,46 @@ public class StationController {
     private AppUserInfoService appUserInfoService;
 
 
-    /*
-     * 新增打印机
-     * @param jsonObject
-     * @return
-     */
-
-    @RequestMapping(value = "/addprinter", consumes = "application/json", method = RequestMethod.POST)
-    @ResponseBody
-    public String addprinter(@RequestBody JSONObject jsonObject){
-        String snlist = jsonObject.getString("sn")+"#"+jsonObject.getString("key");
-        return FeiEPrinterUtil.addprinter(snlist);
-    }
-
-    /*
-     * 班结打印
-     * @return
-     */
-    @RequestMapping(value = "/printClassesSummary", consumes = "application/json", method = RequestMethod.POST)
-    @ResponseBody
-    public String printClassesSummary(@RequestBody JSONObject jsonObject){
-        //打印机编号
-        String sn="";
-        //打印内容
-        String content;
-        content = "<CB>班结小票</CB><BR>";
-        content += "--------------------------------<BR>";
-        content += "油品　　　　　 升数  金额 单数  优惠<BR>";
-        content += "--------------------------------<BR>";
-        content += "饭　　　　　　 1.0    1   1.0<BR>";
-        content += "炒饭　　　　　 10.0   10  10.0<BR>";
-        content += "蛋炒饭　　　　 10.0   10  100.0<BR>";
-        content += "鸡蛋炒饭　　　 100.0  1   100.0<BR>";
-        content += "番茄蛋炒饭　　 1000.0 1   100.0<BR>";
-        content += "西红柿蛋炒饭　 1000.0 1   100.0<BR>";
-        content += "西红柿鸡蛋炒饭 100.0  10  100.0<BR>";
-        content += "备注：加辣<BR>";
-        content += "--------------------------------<BR>";
-        content += "合计：xx.0元<BR>";
-        content += "送货地点：广州市南沙区xx路xx号<BR>";
-        content += "联系电话：13888888888888<BR>";
-        content += "订餐时间：2016-08-08 08:08:08<BR>";
-        content += "<QR>http://www.dzist.com</QR>";
-        return FeiEPrinterUtil.printReceipt(sn, content);
-    }
+//    /*
+//     * 新增打印机
+//     * @param jsonObject
+//     * @return
+//     */
+//    @RequestMapping(value = "/addprinter", consumes = "application/json", method = RequestMethod.POST)
+//    @ResponseBody
+//    public String addprinter(@RequestBody JSONObject jsonObject){
+//        //提示：打印机编号(必填) # 打印机识别码(必填) # 备注名称(选填) # 流量卡号码(选填)，多台打印机请换行（\n）添加新打印机信息，每次最多100行(台)。
+//        // snlist = "sn1#key1#remark1#carnum1\nsn2#key2#remark2#carnum2";
+//        String snlist = jsonObject.getString("sn")+"#"+jsonObject.getString("key");
+//        return FeiEPrinterUtil.addprinter(snlist);
+//    }
+//
+//    /*
+//     * 班结打印
+//     * @return
+//     */
+//    @RequestMapping(value = "/printClassesSummary")
+//    @ResponseBody
+//    public String printClassesSummary(){
+//        //打印机编号
+//        String sn="921611605";  //测试打印机 sn：921611605 key：72338zma
+//        //打印内容
+//        String content;
+//        content = "<CB>班结小票</CB><BR>";
+//        content += "--------------------------------<BR>";
+//        content += "油品   升数   金额  单数  优惠<BR>";
+//        content += "--------------------------------<BR>";
+//        content += "92#    1.0    1   1.0   20<BR>";
+//        content += "95#　 10.0   10  10.0   30<BR>";
+//        content += "--------------------------------<BR>";
+//        content += "合计： 55    350  23     36<BR>";
+//        content += "小票张数：23 张<BR>";
+//        content += "班结金额：350 元<BR>";
+//        content += "优惠总额：36 元<BR>";
+//        content += "实际支付：314 元<BR>";
+//        content += "班结人：莉雅丝<BR>";
+//        return FeiEPrinterUtil.printReceipt(sn, content);
+//    }
 
     /**
      * 根据坐标获取油站列表

YijiaRestful/src/main/java/com/platform/yijia/utils/FeiEPrinterUtil.java

@@ -29,8 +29,8 @@ public class FeiEPrinterUtil {
     private static Logger logger =(Logger) LoggerFactory.getLogger(FeiEPrinterUtil.class);
 
     public static final String URL = "http://api.feieyun.cn/Api/Open/";//不需要修改
-    public static final String USER = "*****************";//*必填*：账号名
-    public static final String UKEY = "*****************";//*必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
+    public static final String USER = "79800875@qq.com";//*必填*：账号名
+    public static final String UKEY = "ScyIqKvntVSJkWhz";//*必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
     //public static final String SN = "*********";//*必填*：打印机编号，必须要在管理后台里添加打印机或调用API接口添加之后，才能调用API
 
     /*

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

@@ -667,7 +667,7 @@
         received_amt = #{receivedAmt,jdbcType=DOUBLE},
         pay_date = #{payDate,jdbcType=TIMESTAMP}
     <where>
-      order_id = #{orderId,jdbcType=INTEGER}
+      order_no = #{orderNo,jdbcType=VARCHAR}
     </where>
   </update>