Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTrave...

luo

2024-01-31 021640e69b32dbd9b88a538402671c47f280df9e

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -122,16 +122,10 @@
    private IOrderPositionService orderPositionService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Autowired
    private IOrderCancelService orderCancelService;

    @Value("${filePath}")
    private String filePath;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;

    @Value("${callbackPath}")
    private String callbackPath;
@@ -158,8 +152,15 @@
     * @throws Exception
     */
    @Override
    public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception {
        return orderCrossCityMapper.queryOrderList(state, driverId);
    public List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception {
        List<Map<String, Object>> list = orderCrossCityMapper.queryOrderList(state, driverId);
        for (Map<String, Object> map : list) {
            if(null != map.get("time")){
                String time = map.get("time").toString();
                map.put("time", DateUtil.conversionFormat(language, time));
            }
        }
        return list;
    }

    /**
@@ -170,8 +171,15 @@
     * @throws Exception
     */
    @Override
    public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
        return orderCrossCityMapper.queryMyAllOrder(state, uid);
    public List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception {
        List<Map<String, Object>> list = orderCrossCityMapper.queryMyAllOrder(state, uid);
        for (Map<String, Object> map : list) {
            if(null != map.get("time")){
                String time = map.get("time").toString();
                map.put("time", DateUtil.conversionFormat(language, time));
            }
        }
        return list;
    }


@@ -182,7 +190,7 @@
     * @throws Exception
     */
    @Override
    public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
    public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
        Map<String, Object> map = new HashMap<>();
        OrderCrossCity orderCrossCity = this.selectById(orderId);
        List<Map<String, Object>> order = orderCrossCityMapper.queryOrderInfo(orderCrossCity.getOrderNum());
@@ -190,6 +198,18 @@
        Double serverMoney = 0D;
        Double totalMoney = 0D;
        for(Map<String, Object> m : order){
            if(null != m.get("travelTime_")){
                String travelTime_ = m.get("travelTime_").toString();
                m.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
            }
            if(null != m.get("travelTime")){
                String travelTime = m.get("travelTime").toString();
                m.put("travelTime", DateUtil.conversionFormat(language, travelTime));
            }
            if(null != m.get("arriveTime")){
                String arriveTime = m.get("arriveTime").toString();
                m.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
            }
            num += Integer.valueOf(m.get("peopleNumber").toString());
            totalMoney += Double.valueOf(m.get("payMoney").toString());
            List<Income> incomes = incomeService.queryData(1, null, 2, Integer.valueOf(m.get("orderId").toString()), 3);
@@ -293,8 +313,17 @@
     * @throws Exception
     */
    @Override
    public Map<String, Object> queryOrderCrossCityInfo(Integer orderId) throws Exception {
        return orderCrossCityMapper.queryOrderCrossCityInfo(orderId);
    public Map<String, Object> queryOrderCrossCityInfo(Integer language, Integer orderId) throws Exception {
        Map<String, Object> map = orderCrossCityMapper.queryOrderCrossCityInfo(orderId);
        if(null != map.get("travelTime_")){
            String travelTime_ = map.get("travelTime_").toString();
            map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
        }
        if(null != map.get("arriveTime")){
            String arriveTime = map.get("arriveTime").toString();
            map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
        }
        return map;
    }