Merge branch 'master-modify-background-bug-hf' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -194,29 +194,30 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     orderPageVO.setMemberName(appUserVo.getMemberName());
                 }
 
-
+                if (dto.getType() == 1) {
                     String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail();
                     ObjectMapper objectMapper = new ObjectMapper();
                     try {
-                    Map<String,Object> map = objectMapper.readValue(costDetail, Map.class);
+                        Map<String, Object> map = objectMapper.readValue(costDetail, Map.class);
                         String paramJson = (String) map.get("paramJson");
-                    if (StringUtil.isNotBlank(paramJson)){
+                        if (StringUtil.isNotBlank(paramJson)) {
                             RentVehiclePriceVO rentVehiclePriceVO = objectMapper.readValue(paramJson, RentVehiclePriceVO.class);
                             orderPageVO.setRentVehiclePriceVO(rentVehiclePriceVO);
                         }
-                    List<Map<String,String>> children= (List<Map<String, String>>) map.get("children");
+                        List<Map<String, String>> children = (List<Map<String, String>>) map.get("children");
                         orderPageVO.setDetailsOfExpenses(children);
 
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
-                if (dto.getType()==1) {
+
                     if (StringUtils.isNotBlank(orderPageVO.getCouponTickerNos())) {
                         String[] couponIds = orderPageVO.getCouponTickerNos().split(",");
                         List<Coupon> couponList = activityFeign.couponsByTickerNoList(Lists.newArrayList(couponIds));
                         orderPageVO.setCouponList(couponList);
                     }
 
+
                 }
 
                 if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
@@ -230,10 +231,10 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     }
 
                     if (StringUtils.isNotBlank(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds())) {
-                        log.info("自己司机,驾驶人id:{}",orderPageVO.getOrderRentVehicleDetail().getMyDriverIds());
+                        log.info("自己司机,驾驶人id:{}", orderPageVO.getOrderRentVehicleDetail().getMyDriverIds());
                         try {
                             List<VehicleUserLicense> orderUserLicenses = vehicleFeign.getVehicleLicenseList(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds()).getData();
-                            log.info("驾驶人信息:{}",orderUserLicenses);
+                            log.info("驾驶人信息:{}", orderUserLicenses);
                             if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
                                 OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
                                 orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getIdCard());

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -114,14 +114,18 @@
     </select>
 
     <select id="listOrder" parameterType="Map" resultMap="orderListMap">
-        select b.*,i.detail as carArticlesJson
+        select b.*
+        <if test="type==1">
+            ,i.detail  as carArticlesJson
+        </if>
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
         LEFT JOIN order_tour_detail t on t.order_id = b.id
         LEFT JOIN order_member_detail m on m.order_id = b.id
-        LEFT JOIN order_item i on  b.id = i.order_id
+        <if test="type==1">
+            LEFT JOIN (select * from  order_item where type = 104) i on  b.id = i.order_id
+        </if>
         <where>
-            i.type=104
             <if test="crtUser != null">
                 and b.crt_user = #{crtUser}
             </if>