修改

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

@@ -452,6 +452,7 @@ public class ElectronicMembershipCardController {
 //                        }
 //                    }
 
+                    int integral =0;
 //                    StationPayManage stationPayManage = new StationPayManage();
 //                    stationPayManage.setStationId(Integer.valueOf(stationId));
 //                    StationPayManage stationPayManageInfo = stationService.selectStationPayManage(stationPayManage);
@@ -468,12 +469,14 @@ public class ElectronicMembershipCardController {
 //                        calculateIntegral.setUnionId(unionId);
 //                        calculateIntegral.setOpenId(minaOpenid);   //小程序openId
 //                        //计算积分且推送积分
-//                        calculateIntegralAndPushIntegral(calculateIntegral, customerManage);
+//                        integral = calculateIntegralAndPushIntegral(calculateIntegral, customerManage);
 //                    }
                     resultData = ResultData.success(CodeMsg.SUCCESS);
                     //打印小票
                     this.printReceipt(payOrder);
                     //pos机打印小票
+                    payOrder.setIntegral(String.valueOf(integral));
+                    payOrder.setTransactionId(ordNo);
                     this.posPrintReceipt(payOrder);
                 }else {
                     resultData=ResultData.error(CodeMsg.BALANCE_NOT_EENOUGH);
@@ -495,9 +498,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());
+        }
+        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());
@@ -1087,7 +1093,7 @@ public class ElectronicMembershipCardController {
      * 注释：  1.判断油站配置的优惠类型
      *        2.如果是等级直降则存在等级取对应等级的积分规则，否则按照其他优惠方式
      */
-    public void calculateIntegralAndPushIntegral(CalculateIntegral calculateIntegral, CustomerManage customerManage){
+    public int calculateIntegralAndPushIntegral(CalculateIntegral calculateIntegral, CustomerManage customerManage){
         int integral =0;
         //获取该油站的优惠方式
         String discountPlanType = stationService.getStationDiscountWay(calculateIntegral.getStationId().toString());
@@ -1299,6 +1305,7 @@ public class ElectronicMembershipCardController {
             calculateIntegral.setIntegral(integral);
             this.pushIntegral(calculateIntegral);
         }
+        return  integral;
     }
 
     //更新积分并公众号推送积分

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

@@ -569,6 +569,7 @@ public class PayController {
                             stationPayManage.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
                             StationPayManage stationPayManageInfo = stationService.selectStationPayManage(stationPayManage);
                             //是否启用积分功能
+                            int integral =0;
                             if(stationPayManageInfo !=null && stationPayManageInfo.getIntegralFlag().equals("1")){
                                 //计算积分并推送
                                 CalculateIntegral calculateIntegral = new CalculateIntegral();
@@ -587,10 +588,14 @@ public class PayController {
                                 calculateIntegral.setMobilePhone(infoMap.get("mobilePhone").toString());
                                 calculateIntegral.setReceivableAmt(new BigDecimal(infoMap.get("receivableAmt").toString()));
                                 //计算积分并推送
-                                this.calculateIntegralAndPushIntegral(calculateIntegral, customerManage);
+                                integral = calculateIntegralAndPushIntegral(calculateIntegral, customerManage);
                             }
                             //打印小票
                             this.printReceipt(infoMap);
+
+                            //pos机打印小票
+                            payOrder.setIntegral(String.valueOf(integral));
+                            this.posPrintReceipt(payOrder);
                         }else{
                             logger.info("该用户无手机号！");
                         }
@@ -751,9 +756,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.getTransactionId() !=null){
+            m.put("transactionId", payOrder.getTransactionId());
+        }
+        if(payOrder.getIntegral() !=null){
+            m.put("integral", payOrder.getIntegral());
+        }
         if(infoMap !=null && infoMap.containsKey("orderNo") && infoMap.get("orderNo") !=null){
             m.put("orderNo", infoMap.get("orderNo").toString());
         }
@@ -975,7 +984,7 @@ public class PayController {
      * 注释：  1.判断油站配置的优惠类型
      *        2.如果是等级直降则存在等级取对应等级的积分规则，否则按照其他优惠方式
      */
-    public void calculateIntegralAndPushIntegral(CalculateIntegral calculateIntegral, CustomerManage customerManage){
+    public int calculateIntegralAndPushIntegral(CalculateIntegral calculateIntegral, CustomerManage customerManage){
         int integral =0;
         //获取该油站的优惠方式
         String discountPlanType = stationService.getStationDiscountWay(calculateIntegral.getStationId().toString());
@@ -1178,6 +1187,7 @@ public class PayController {
             //customerManagerService.updateCustomerInfo(customerManage);
             this.pushIntegral(calculateIntegral);
         }
+        return integral;
     }
 
     /*

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

@@ -15,12 +15,14 @@ public class ContentData {
 
     //油品订单参数
     private String oilGun;          //油枪
+    private String transactionId;   //交易订单流水号
     private String oilName;         //油品
     private String oilPirce;        //油品价格（单价）
     private String orderLiters;     //订单加油升数
     private String receivableAmt;   //应收金额
     private String amt;             //实收金额
     private String discountAmt;     //优惠金额
+    private String integral;        //积分
     private String payType;         //支付方式  例：微信、电子卡
     private String mobilePhone;     //手机号   例：186****5051
 

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

@@ -77,5 +77,6 @@ public class PayOrder implements Serializable {
 
     //打印小票所需要的流水单号
     private String transactionId;
+    private String integral;
 
 }