修改

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

@@ -502,7 +502,7 @@ public class PayController {
                                     reqData.put("payTimeStamp", response.getTimeStamp());
                                     reqData.put("payPackage", response.getPackage_str());
                                     reqData.put("paynonceStr", response.getNonceStr());
-                                    reqData.put("signType", response.getSignType());
+                                    reqData.put("paySignType", response.getSignType());
                                     reqData.put("paySign", response.getPaySign());
                                     reqData.put("return_msg", response.getReturn_msg());
                                     reqData.put("merchant_name", response.getMerchant_name());

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

@@ -559,53 +559,62 @@ public class StationController {
         Gson gson =new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
         ResultData resultData = null;
         try {
-            Map<String, Object> resultMap = new HashMap<>();
-
-            //获取油站加油员列表
-            HashMap<String, Object> params_1 = new HashMap<>();
-            params_1.put("stationId", stationId);
-            List<Map> personnalList = payOrderMapper.selectPersonelName(params_1);    //使用list原因：一个枪号对应多个加油员场景
-            resultMap.put("personnalList", personnalList);
-
-            //获取油站图片和公告
-            StationInfo stationPic = new StationInfo();
-            stationPic.setStationId(stationId);
-            StationInfo stationPics = stationService.getStationPicList(stationPic);
-            List<String>  listPic = new ArrayList<>();
-            if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage1())){
-                listPic.add(stationPics.getImage1());
-            }
-            if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage2())){
-                listPic.add(stationPics.getImage2());
-            }
-            if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage3())){
-                listPic.add(stationPics.getImage3());
-            }
-            if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage4())){
-                listPic.add(stationPics.getImage4());
-            }
-            if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage5())){
-                listPic.add(stationPics.getImage5());
-            }
-            resultMap.put("notice", stationPics.getNotice());
-            resultMap.put("listPic", listPic);
-
-            //获取油枪
-            if(personnelId !=null && personnelId !="" && !personnelId.equals("undefined")){
-                Map<String, Object> params = new HashMap<>();
-                params.put("personnelId", personnelId);
-                params.put("stationId", stationId);
-                List<Map<String, Object>> stationOilGunList = stationOilGunService.selectOilGunByPersonalId(params);
-                resultMap.put("stationOilGunList", stationOilGunList);
-                //resultData=ResultData.success(stationOilGunList);
+            StationInfo staInfo = new StationInfo();
+            staInfo.setStationId(stationId);
+            StationInfo stationInfo = stationService.selectStationInfo(staInfo);
+            if(stationInfo !=null){
+                Map<String, Object> resultMap = new HashMap<>();
+
+                //获取油站加油员列表
+                HashMap<String, Object> params_1 = new HashMap<>();
+                params_1.put("stationId", stationId);
+                List<Map> personnalList = payOrderMapper.selectPersonelName(params_1);    //使用list原因：一个枪号对应多个加油员场景
+                resultMap.put("personnalList", personnalList);
+
+
+                //获取油站图片和公告
+                StationInfo stationPic = new StationInfo();
+                stationPic.setStationId(stationId);
+                StationInfo stationPics = stationService.getStationPicList(stationPic);
+                List<String>  listPic = new ArrayList<>();
+                if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage1())){
+                    listPic.add(stationPics.getImage1());
+                }
+                if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage2())){
+                    listPic.add(stationPics.getImage2());
+                }
+                if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage3())){
+                    listPic.add(stationPics.getImage3());
+                }
+                if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage4())){
+                    listPic.add(stationPics.getImage4());
+                }
+                if(stationPics != null && StringUtils.isNotBlank(stationPics.getImage5())){
+                    listPic.add(stationPics.getImage5());
+                }
+                resultMap.put("notice", stationPics.getNotice());
+                resultMap.put("listPic", listPic);
+
+                //获取油枪
+                if(personnelId !=null && personnelId !="" && !personnelId.equals("undefined")){
+                    Map<String, Object> params = new HashMap<>();
+                    params.put("personnelId", personnelId);
+                    params.put("stationId", stationId);
+                    List<Map<String, Object>> stationOilGunList = stationOilGunService.selectOilGunByPersonalId(params);
+                    resultMap.put("stationOilGunList", stationOilGunList);
+                    //resultData=ResultData.success(stationOilGunList);
+                }else {
+                    StationOilGun stationOilGun =new StationOilGun();
+                    stationOilGun.setStationId(stationId);
+                    List<StationOilGun> stationOilGunList = stationOilGunService.stationOilGunList(stationOilGun);
+                    resultMap.put("stationOilGunList", stationOilGunList);
+                    //resultData=ResultData.success(stationOilGunList);
+                }
+                resultMap.put("isAliPayFlag", stationInfo.getIsAliPayFlag());
+                resultData = ResultData.success(resultMap);
             }else {
-                StationOilGun stationOilGun =new StationOilGun();
-                stationOilGun.setStationId(stationId);
-                List<StationOilGun> stationOilGunList = stationOilGunService.stationOilGunList(stationOilGun);
-                resultMap.put("stationOilGunList", stationOilGunList);
-                //resultData=ResultData.success(stationOilGunList);
+                resultData=ResultData.success(CodeMsg.STATION_NULL_INFO);
             }
-            resultData = ResultData.success(resultMap);
         }catch (Exception e){
             resultData=ResultData.success(CodeMsg.SEARCH_FAIL);
             e.printStackTrace();

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

@@ -202,6 +202,7 @@
         T1.balance,
         T1.coupon_flag,
         T1.coupon_enabled_flag,
+        T1.is_alipay_flag,
         T1.pay_channel_type,
         T2.card_enabled_flag    AS card_enabled_flag_group,
         T2.card_rule_flag       AS card_rule_flag_group,