jk-GitHub-coder 3 éve
szülő
commit
8b5702d446

+ 2 - 3
YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -556,9 +556,8 @@ public class ElectronicMembershipCardController {
                     stationDeviceManager.setStationId(Integer.valueOf(stationId));
                     stationDeviceManager.setStationId(Integer.valueOf(stationId));
                     List<StationDeviceManager> stationDeviceManagerList = stationService.getStationDeviceManagerList(stationDeviceManager);
                     List<StationDeviceManager> stationDeviceManagerList = stationService.getStationDeviceManagerList(stationDeviceManager);
                     if(stationDeviceManagerList !=null && stationDeviceManagerList.size() >0){
                     if(stationDeviceManagerList !=null && stationDeviceManagerList.size() >0){
-                        String deviceType = stationDeviceManagerList.get(0).getDeviceType();
-                        if(deviceType !=null && deviceType !=""){
-                            switch (deviceType){
+                        if(stationDeviceManagerList.get(0).getDeviceType() !=null && stationDeviceManagerList.get(0).getDeviceType() !=""){
+                            switch (stationDeviceManagerList.get(0).getDeviceType()){
                                 case "1":
                                 case "1":
                                     logger.info("小票机打印方式");
                                     logger.info("小票机打印方式");
                                     if(stationDeviceManagerList.get(0).getDeviceNo() !=null){
                                     if(stationDeviceManagerList.get(0).getDeviceNo() !=null){

+ 2 - 3
YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -650,9 +650,8 @@ public class PayController {
                             stationDeviceManager.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
                             stationDeviceManager.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
                             List<StationDeviceManager> stationDeviceManagerList = stationService.getStationDeviceManagerList(stationDeviceManager);
                             List<StationDeviceManager> stationDeviceManagerList = stationService.getStationDeviceManagerList(stationDeviceManager);
                             if(stationDeviceManagerList !=null && stationDeviceManagerList.size() >0){
                             if(stationDeviceManagerList !=null && stationDeviceManagerList.size() >0){
-                                String deviceType = stationDeviceManagerList.get(0).getDeviceType();
-                                if(deviceType !=null && deviceType !=""){
-                                    switch (deviceType){
+                                if(stationDeviceManagerList.get(0).getDeviceType() !=null && stationDeviceManagerList.get(0).getDeviceType() !=""){
+                                    switch (stationDeviceManagerList.get(0).getDeviceType()){
                                         case "1":
                                         case "1":
                                             logger.info("小票机打印方式");
                                             logger.info("小票机打印方式");
                                             infoMap.put("sn", stationDeviceManagerList.get(0).getDeviceNo());
                                             infoMap.put("sn", stationDeviceManagerList.get(0).getDeviceNo());