修改bug

Pu Zhibing

9 天以前 b6da936b0c7379c3e1ef07409f81702074b45f47

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -521,7 +521,7 @@
            }
            orderList = orderPrivateCarService.queryOrderInfo2(orderId, 6, null, null);
            if (orderInfoWarpper.getState() > 1 && orderInfoWarpper.getDriverId() != 0) {
               String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
               String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
               if (value == null || value.equals("")) {
                  if (orderList.isEmpty()) {
                     orderList = orderPrivateCarService.queryOrderInfo2(orderId, 5, "0", "0");
@@ -562,8 +562,8 @@
                  return ResultUtil.error("请先配置价格规则");
               }
               Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId(), systemPriceCity.getId());
               System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
               System.out.println("query1:" + query1);
//               System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
//               System.out.println("query1:" + query1);
               //开始根据不同的方式计算金额
               if (query1 != null) {
                  JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());//等待费