修改

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

@@ -467,6 +467,10 @@ public class AppUserInfoController {
                 appUserInfo.setBlogNickName(request.getBlogNickName());
                 customerPoints.setCustomerName(request.getBlogNickName());
                 customerElectronicCard.setCustomerName(request.getBlogNickName());
+            }else {
+                appUserInfo.setBlogNickName(request.getOpenId());
+                customerPoints.setCustomerName(request.getOpenId());
+                customerElectronicCard.setCustomerName(request.getOpenId());
             }
             if(StringUtils.isNotBlank(request.getBlogProfilePhoto())){
                 appUserInfo.setBlogProfilePhoto(request.getBlogProfilePhoto());

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

@@ -161,9 +161,19 @@ public class ElectronicMembershipCardController {
                 CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();      //电子会员卡使用记录
                 CustomerCardSetting customerCardSetting = new CustomerCardSetting();        //电子卡优惠规则设置
                 customerCardSetting.setStationId(stationId);
+                AppUserInfo appUserInfo = new AppUserInfo();
+                appUserInfo.setStationId(stationId);
                 if(stationInfos.getCardRuleFlag().equals("1")){
                     //如果油站充值规则共享
                     customerCardSetting.setStationId(stationInfos.getGroupId());
+                    appUserInfo.setStationId(stationInfos.getGroupId());
+                }
+                appUserInfo.setUnionId(unionId);
+
+                AppUserInfo appUserInfoPhone = appUserInfoService.getAppUserInfo(appUserInfo);
+                if(appUserInfoPhone !=null && appUserInfoPhone.getMobilePhone() !=null){
+                    //获取客户手机号
+                    customerCardUseRecord.setMobilePhone(appUserInfoPhone.getMobilePhone());
                 }
                 customerCardSetting.setCardOilsType(cardOilsType);
                 customerCardSetting.setOrderBy("DESC");
@@ -331,6 +341,7 @@ public class ElectronicMembershipCardController {
                 String oilGun = resultMap.get("oilGun").toString();
 
                 CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();  //电子会员卡插入消费记录
+                customerCardUseRecord.setMobilePhone(mobilePhone);
                 BigDecimal balance = new BigDecimal("0.00");                                                  //电子会员卡余额
                 CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
                 Oil oil = new Oil();
@@ -499,13 +510,17 @@ public class ElectronicMembershipCardController {
                     }
                     resultData = ResultData.success(CodeMsg.SUCCESS);
 
+                    //logger.info("小票打印方式：" + stationInfo.getPrintDeviceType());
                     //油站小票打印方式
-                    if(stationInfos !=null && StringUtils.isNotBlank(stationInfo.getPrintDeviceType())){
+                    if(stationInfos !=null && stationInfos.getPrintDeviceType() !=null){
+                        logger.info("小票打印方式：" + stationInfo.getPrintDeviceType());
                         switch (stationInfos.getPrintDeviceType()){
                             case "1":   //小票机打印
+                                logger.info("小票机打印");
                                 this.printReceipt(payOrder);
                                 break;
                             case "2":   //POS机打印
+                                logger.info("POS打印");
                                 payOrder.setIntegral(String.valueOf(integral));
                                 payOrder.setPrintSetting(stationInfos.getPrintSetting());
                                 this.posPrintReceipt(payOrder);

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

@@ -573,7 +573,11 @@ public class PayController {
                             if(stationInfos !=null && stationInfos.getIntegralFlag().equals("1")){                             //是否启用积分功能
                                 CalculateIntegral calculateIntegral = new CalculateIntegral();
                                 calculateIntegral.setOrderNo(ordNo);
-                                calculateIntegral.setNickName(infoMap.get("consumer").toString());
+                                if(infoMap.containsKey("consumer") && infoMap.get("consumer") !=null){
+                                    calculateIntegral.setNickName(infoMap.get("consumer").toString());
+                                }else {
+                                    calculateIntegral.setNickName("");
+                                }
                                 calculateIntegral.setGroupId(Integer.valueOf(infoMap.get("groupId").toString()));               //集团ID
                                 calculateIntegral.setCustomerGrade(customerManage.getGrade());                                  //客户等级
                                 calculateIntegral.setIntegralRuleFlag(stationInfos.getIntegralRuleFlag());                      //是否共享积分规则
@@ -600,9 +604,11 @@ public class PayController {
                                 this.pushIntegral(customerPoints);
                             }
 
-                            if(stationInfos !=null && StringUtils.isNotBlank(stationInfo.getPrintDeviceType())){
+                            //logger.info("小票打印方式：" + stationInfo.getPrintDeviceType());
+                            if(stationInfos !=null && stationInfos.getPrintDeviceType() !=null){
                                 switch (stationInfos.getPrintDeviceType()){
                                     case "1":   //小票机打印
+                                        logger.info("小票机打印");
                                         Map map = new HashMap();
                                         map.put("stationId", infoMap.get("stationId").toString());
                                         map.put("oilGunNo", infoMap.get("oilGun").toString());

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

@@ -133,6 +133,7 @@ public class PayOrderController {
                         payOrder.setDiscountAmt(Double.valueOf(0));                                 //优惠金额
                         payOrder.setOilPirce(payOrderRequest.getReceivableAmt());        //非油品价格
                         payOrder.setOrderLiters("0");
+                        resultMap.put("oilsCardFlag", "0");
                         resultMap.put("discountAmt", "0");                                          //优惠价格
                         resultMap.put("amt", payOrderRequest.getReceivableAmt());                   //实收价格
                         resultMap.put("receivableAmt", payOrderRequest.getReceivableAmt());         //应收价格
@@ -286,6 +287,7 @@ public class PayOrderController {
         payOrderResultInfo.setReceivableAmt(receivableAmt.toString());
         payOrderResultInfo.setOilPrice(oilPrice.toString());
         payOrderResultInfo.setDzkAmt(amt.toString());
+        payOrderResultInfo.setOilsCardFlag("0");
         payOrderResultInfo.setCardEnabledFlag(params.get("cardEnabledFlag").toString());
         logger.info("油站是否开启电子会员卡功能: " +params.get("cardEnabledFlag").toString());
         if(params.get("cardEnabledFlag").toString().equals("1")){
@@ -385,6 +387,7 @@ public class PayOrderController {
         payOrderResultInfo.setReceivableAmt(receivableAmt.toString());
         payOrderResultInfo.setOilPrice(oilPrice.toString());
         payOrderResultInfo.setDzkAmt(amt.toString());
+        payOrderResultInfo.setOilsCardFlag("0");
         payOrderResultInfo.setCardEnabledFlag(params.get("cardEnabledFlag").toString());
         logger.info("油站是否开启电子会员卡功能: " +params.get("cardEnabledFlag").toString());
         if(params.get("cardEnabledFlag").toString().equals("1")){
@@ -484,6 +487,7 @@ public class PayOrderController {
         payOrderResultInfo.setReceivableAmt(receivableAmt.toString());
         payOrderResultInfo.setOilPrice(oilPrice.toString());
         payOrderResultInfo.setDzkAmt(amt.toString());
+        payOrderResultInfo.setOilsCardFlag("0");
         payOrderResultInfo.setCardEnabledFlag(params.get("cardEnabledFlag").toString());
         logger.info("油站是否开启电子会员卡功能: " +params.get("cardEnabledFlag").toString());
         if(params.get("cardEnabledFlag").toString().equals("1")){
@@ -588,6 +592,7 @@ public class PayOrderController {
         payOrderResultInfo.setReceivableAmt(receivableAmt.toString());
         payOrderResultInfo.setOilPrice(oilPrice.toString());
         payOrderResultInfo.setDzkAmt(amt.toString());
+        payOrderResultInfo.setOilsCardFlag("0");
         payOrderResultInfo.setCardEnabledFlag(params.get("cardEnabledFlag").toString());
         //电子卡是否开启
         logger.info("油站是否开启电子会员卡功能: " +params.get("cardEnabledFlag").toString());

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

@@ -12,6 +12,7 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.io.IOException;
 import java.util.*;
@@ -30,6 +31,7 @@ public class PosPrinterUtil {
     //mqapi/sendPosPrintTopicMessageAll
     //扇形交换机 sendPosPrintFanoutMessage
     public static final String SEND_POS_PRINT_MESSAGE_URL = "http://www.huijy.net/mqapi/sendPosPrintFanoutMessage";
+    //public static final String SEND_POS_PRINT_MESSAGE_URL = "http://mp.huijy.net/mqapi/sendPosPrintFanoutMessage";
 
     //推送要打印小票的信息
     public static String sendPosPrintDirectMessage(Map<String, Object> args){

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

@@ -218,6 +218,9 @@
             <if test="status !=null">
                 status,
             </if>
+            <if test="mobilePhone !=null">
+                mobile_phone,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNo !=null">
@@ -262,6 +265,9 @@
             <if test="status !=null">
                 #{status},
             </if>
+            <if test="mobilePhone !=null">
+                #{mobilePhone},
+            </if>
         </trim>
     </insert>
 
@@ -305,6 +311,9 @@
             <if test="status !=null">
                 status,
             </if>
+            <if test="mobilePhone !=null">
+                mobile_phone,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNo !=null">
@@ -343,6 +352,9 @@
             <if test="status !=null">
                 #{status},
             </if>
+            <if test="mobilePhone !=null">
+                #{mobilePhone},
+            </if>
         </trim>
     </insert>
 

YijiaRestful/src/test/java/com/palatform/yijia/TestEnum.java

@@ -0,0 +1,9 @@
+package com.palatform.yijia;
+
+public enum TestEnum {
+    TEST1, TEST2;
+
+    TestEnum(){
+        System.out.println("testEnum");
+    }
+}