修改

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

@@ -481,8 +481,6 @@ public class AppUserInfoController {
                 customerElectronicCard.setUnionId(request.getUnionId());
             }
 
-            appUserInfo.setStationId(request.getStationId());
-
             customerPoints.setCreateTime(new Date());
             customerPoints.setUnionId(request.getUnionId());
             customerPoints.setPoints(0);
@@ -509,16 +507,17 @@ public class AppUserInfoController {
             stationInfo.setStationId(request.getStationId());
             //获取油站功能信息
             StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
+            appUserInfo.setStationId(stationInfos.getGroupId());
             if(request.getUserType()!=null){
                 String userType = request.getUserType();
                 appUserInfo.setUserType(userType);
                 switch (userType){
                     case "1":       //当为微信用户时
                         AppUserInfo wxInfo = new AppUserInfo();
-                        wxInfo.setStationId(request.getStationId());
-                        if(stationInfos.getCardRuleFlag().equals("1")){
-                            wxInfo.setStationId(stationInfos.getGroupId());
-                        }
+                        wxInfo.setStationId(stationInfos.getGroupId());
+//                        if(stationInfos.getCardRuleFlag().equals("1")){
+//                            wxInfo.setStationId(stationInfos.getGroupId());
+//                        }
                         //判断当前登录是否存在手机号
                         if(StringUtils.isNotBlank(request.getMobilePhone())){
                             appUserInfo.setMinaOpenid(openId);

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

@@ -162,12 +162,12 @@ public class ElectronicMembershipCardController {
                 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.setStationId(stationInfos.getGroupId());
+//                if(stationInfos.getCardRuleFlag().equals("1")){
+//                    //如果油站充值规则共享
+//                    customerCardSetting.setStationId(stationInfos.getGroupId());
+//                    appUserInfo.setStationId(stationInfos.getGroupId());
+//                }
                 appUserInfo.setUnionId(unionId);
 
                 AppUserInfo appUserInfoPhone = appUserInfoService.getAppUserInfo(appUserInfo);

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

@@ -287,8 +287,8 @@ public class IntegralShoppingMallController {
                                     map.put("customerName", integralOrder.getCustomerName());
                                     map.put("orderType", "integral");
                                     map.put("stationId", request.getStationId().toString());
-                                    map.put("printSetting", stationInfos.getPrintSetting());
-                                    this.posPrintReceipt(map);
+                                    //map.put("printSetting", stationInfos.getPrintSetting());
+                                    this.posPrintReceipt(map, stationInfos.getPrintSetting());
                                 }else {
                                     //打印机打印小票
                                     List<Map<String, Object>> stationPrinterList = stationService.getStationPrinterList(request.getStationId());
@@ -356,7 +356,7 @@ public class IntegralShoppingMallController {
     }
 
     //POS机打印小票
-    public void posPrintReceipt(Map map){
+    public void posPrintReceipt(Map map, String printSetting){
         logger.info("要推送的订单的信息：" +map.toString());
         //定义推送格式
         Map<String, Object> params = new HashMap<>();
@@ -372,7 +372,7 @@ public class IntegralShoppingMallController {
             params.put("posFanoutExchange", stationDeviceManagerInfo.getPosFanoutExchange());
             params.put("posQueue", stationDeviceManagerInfo.getPosQueue());
             params.put("tusn", stationDeviceManagerInfo.getDeviceNo());
-            params.put("printSetting", map.get("printSetting").toString());
+            params.put("printSetting", printSetting);
         }
         List<Map<String, Object>> list = new ArrayList<>();
         list.add(map);

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

@@ -630,6 +630,7 @@ public class PayOrderController {
         CustomerElectronicCard electronicCardInfo = electronicMembershipCardService.getElectronicCardInfoByUnionId(customerElectronicCard);
         BigDecimal balance = null;
         String cardOilsType1 ="";
+
         Map<String, String> result = new HashMap<>();
         if(electronicCardInfo !=null){
             balance = electronicCardInfo.getAmt();
@@ -638,7 +639,41 @@ public class PayOrderController {
             result.put("oilsCardFlag", "1");
             result.put("cardOilsType",cardOilsType1);
         }else {
-            result.put("oilsCardFlag", "0");
+            StationInfo stationInfo  = new StationInfo();
+            stationInfo.setStationId(stationId);
+            StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
+
+            CustomerCardSetting customerCardSetting = new CustomerCardSetting();
+            customerCardSetting.setStationId(stationId);
+            if(stationInfos.getCardRuleFlag().equals("1")){
+                customerCardSetting.setStationId(stationInfos.getGroupId());
+            }
+            customerCardSetting.setDelFlag("0");
+            //customerCardSetting.setCardOilsType(cardOilsType);
+            List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
+            if(cardRechargeSettingList !=null && cardRechargeSettingList.size()>0){
+                String cardOilsTypeExist = cardRechargeSettingList.get(0).getCardOilsType();
+                String[] split = cardOilsTypeExist.split(",");
+                List<String> strings = Arrays.asList(split);
+                if(strings.contains(cardOilsType)){
+                    String currentTime = String.valueOf(System.currentTimeMillis());
+                    String customerNo = stationId + currentTime;
+                    customerElectronicCard.setCustomerNo(customerNo);
+                    customerElectronicCard.setAmt(new BigDecimal(0));
+                    customerElectronicCard.setCreateTime(new Date());
+                    electronicMembershipCardService.insetElectronicCard(customerElectronicCard);
+                    CustomerElectronicCard electronicCardInfoNew  = electronicMembershipCardService.getElectronicCardInfoByUnionId(customerElectronicCard);
+                    balance = electronicCardInfoNew.getAmt();
+                    result.put("balance",balance.toString());
+                    result.put("oilsCardFlag", "1");
+                    result.put("cardOilsType",electronicCardInfoNew.getCardOilsType());
+                }else {
+                    result.put("oilsCardFlag", "0");
+                }
+            }else {
+                result.put("oilsCardFlag", "0");
+            }
+
         }
         return result;
     }

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

@@ -27,11 +27,13 @@ import java.util.*;
 public class PosPrinterUtil {
 
     private static Logger logger =(Logger) LoggerFactory.getLogger(PosPrinterUtil.class);
-    //POS机打印订单小票地址 http://www.huijy.net/mqapi/sendPosPrintDirectMessage
-    //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";
+
+    //生产环境： http://www.huijy.net/mqapi/sendPosPrintDirectMessage
+    //public static final String SEND_POS_PRINT_MESSAGE_URL = "http://www.huijy.net/mqapi/sendPosPrintFanoutMessage";
+
+    //测试环境：http://mp.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){
@@ -42,6 +44,7 @@ public class PosPrinterUtil {
         try {
             // 创建Http Post请求
             HttpPost httpPost = new HttpPost(SEND_POS_PRINT_MESSAGE_URL);
+            logger.info("POS推送订单消息地址：" +SEND_POS_PRINT_MESSAGE_URL);
             // 创建请求内容
             StringEntity entity = new StringEntity(JSONObject.toJSONString(args), ContentType.APPLICATION_JSON);
             httpPost.setEntity(entity);

YijiaRestful/src/main/resources/application.yml

@@ -15,11 +15,11 @@ pagehelper:
 
 # 域名 路径前缀动态配置
 yijia:
-    # 域名： 测试：pay.huijy.net  生产：www.huijy.net
-    domainName: www.huijy.net
+    # 域名： 测试：mp.huijy.net  生产：www.huijy.net
+    domainName: mp.huijy.net
     # 路径前缀 test：测试； api：生产一线；prod：生产二线； demo：演示；
     path:
-        global-prefix: prod
+        global-prefix: demo
 
 
 # POS机登录解密密文密码