修改

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

@@ -539,6 +539,7 @@ public class PayController {
             logger.info("根据订单号，查询订单"+gson.toJson(list));
             if (list != null && list.size() == 1) {
                 String status = list.get(0).getStatus();
+                logger.info("订单状态：" + status);
                 //状态为未支付 0  修改状态为1已支付
                 if (status.equals("0")) {
                     PayOrder payOrder = new PayOrder();
@@ -546,6 +547,7 @@ public class PayController {
                     payOrder.setStatus("1");
                     payOrder.setPayType("wx");
                     payOrder.setWxAmt(Double.valueOf(amt));
+                    payOrder.setTransactionId(transactionId);
                     //finishTime
                     //SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     //payOrder.setPayDate(sdf.parse(finishTime));    //支付时间
@@ -555,7 +557,7 @@ public class PayController {
                     int count = payOrderService.getUpdatePayOrder(payOrder);
                     if(count == 1){
                         req.put("code","success");
-                        req.put("msg","成功");
+                        req.put("msg","修改订单状态成功");
                         logger.info(req.toString());
 
                         //将用户消费的信息插入顾客表： 以手机号 油品名称 油站id为条件插入且存入 加油升数、实收金额、油站名称  根据订单号查询用户手机号
@@ -590,13 +592,14 @@ public class PayController {
                                 calculateIntegral.setReceivableAmt(new BigDecimal(infoMap.get("receivableAmt").toString()));
                                 //计算积分并推送
                                 integral = calculateIntegralAndPushIntegral(calculateIntegral, customerManage);
-                                payOrder.setIntegral(String.valueOf(integral));
+
                             }
                             if(stationPayManageInfo.getPrintDeviceType().equals("1")){
                                 //打印小票
                                 this.printReceipt(infoMap);
                             }else {
                                 //pos机打印小票
+                                payOrder.setIntegral(String.valueOf(integral));
                                 this.posPrintReceipt(payOrder);
                             }
                         }else{
@@ -759,13 +762,13 @@ 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.getIntegral() !=null){
             m.put("integral", payOrder.getIntegral());
         }
+        //ordNo
         if(infoMap !=null && infoMap.containsKey("orderNo") && infoMap.get("orderNo") !=null){
             m.put("orderNo", infoMap.get("orderNo").toString());
         }
@@ -850,8 +853,7 @@ public class PayController {
         map.put("contentData", list);
         params.put("messageContent", map);
         logger.info("开始推送消息：" +JSONObject.toJSONString(params));
-
-        String resultString = PosPrinterUtil.sendPosPrintDirectMessage(m);
+        String resultString = PosPrinterUtil.sendPosPrintDirectMessage(params);
         JSONObject jsonObject = JSONObject.parseObject(resultString);
         if(jsonObject.containsKey("code") && jsonObject.get("code").toString().equals("200")){
             //如果打印成功 添加小票数量

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

@@ -331,6 +331,7 @@
                 AND T1.pay_date < #{endTime}
             </if>
         </where>
+        ORDER BY T1.pay_date DESC
     </select>
 
 
@@ -357,6 +358,7 @@
         AND pay_date &lt; #{endTime}
       </if>
     </where>
+      ORDER BY pay_date DESC
   </select>
 
   <!--初次班结 班结时间默认为当前时间订单信息-->