乘客购票

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/PassengerInfoServiceImpl.java

@@ -408,7 +408,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
                     //创建订单
                     OrderInfo orderInfo = new OrderInfo();
                     orderInfo.setId(UUID.randomUUID().toString());
-                    orderInfo.setTotalFee(price);
+                    orderInfo.setTotalFee(price1);
                     orderInfo.setBody("买车票");
                     orderInfo.setPayStatus(10);
                     orderInfo.setOutOrderNo(com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
@@ -419,7 +419,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
 
                     if (!goodTicketStatus){
                         orderInfo.setGoodsTicket(new BigDecimal(goodsTicket));
-                        orderInfo.setTotalFee(price.add(new BigDecimal(goodsTicket)));
+                        orderInfo.setTotalFee(price1.add(new BigDecimal(goodsTicket)));
                         goodTicketStatus = true;
                     }
 

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/PassengerApiController.java

@@ -751,7 +751,7 @@ public class PassengerApiController {
             List<String> shiftIdList = new ArrayList<>();
             List<StationInfo> stationInfos0 = new ArrayList<>();
             if (stationInfoList.size() > 0) {
-                int dis0 = 500;
+                int dis0 = 600;
                 StationInfo stationInfo0 = null;
                 for (StationInfo stationInfo : stationInfoList){
                     //距离