Merge remote-tracking branch 'origin/master'

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -190,8 +190,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      */
     public void refundSubProcess(BaseOrder baseOrder, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, Integer refundType, Integer refundStatus, OrderAccountDetail oad) {
         String refundTradeNo = null;
-        //0 小于 退款金额
-        if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
+        //退款金额 = 0 不退款，把refundTradeNo设置为 -1
+        if(BigDecimal.ZERO.compareTo(refundAmount) == 0) {
+            refundTradeNo = "-1";
+        }else if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
             OrderRefundVo orv = new OrderRefundVo();
             orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
             orv.setOrderNo(baseOrder.getNo());

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

@@ -328,6 +328,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         //查询列表数据
         Query query = baseOrderBiz.initQuery(dto.getNo());
         query.put("crtUser", null);
+        query.put("userId", null);
         PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         OrderPageVO orderPageVO = page.getData().get(0);
         if(null == orderPageVO) {

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

@@ -75,7 +75,7 @@ public class OrderRentVehicleController extends CommonBaseController {
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
                 //设置-1表示查询所有的车
-                bo.setUseType(-1);
+                //bo.setUseType(-1);
                 orderRentVehicleService.createOrder(bo);
                 return ObjectRestResponse.succ(bo.getOrder());
         }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/GwTourController.java

@@ -4,12 +4,17 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.xxfc.platform.tour.entity.TourTag;
 import com.xxfc.platform.tour.feign.TourFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("app/unauth/tour")
 @Slf4j
@@ -47,8 +52,9 @@ public class GwTourController extends CommonBaseController {
     @GetMapping("/tagList")
     @IgnoreUserToken
     public ObjectRestResponse getTagList(@RequestParam(value = "isHot", defaultValue = "0") Integer isHot) {
-
-        return ObjectRestResponse.succ(tourFeign.tagList(isHot));
+        List<TourTag> tourTags = tourFeign.tagList(isHot);
+        tourTags = tourTags.stream().filter(x -> !x.getName().contains("全部")).sorted(Comparator.comparing(TourTag::getRank)).collect(Collectors.toList());
+        return ObjectRestResponse.succ(tourTags);
     }
 
 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/MemberLevelController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/17 9:37
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/member_level/app/unauth")
+public class MemberLevelController {
+
+     private final UserFeign userFeign;
+     @GetMapping("/list")
+     public ObjectRestResponse<BaseUserMemberLevel> listMemberLevels(){
+          List<BaseUserMemberLevel> levels = userFeign.levels();
+          return ObjectRestResponse.succ(levels);
+     }
+}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/impl/BJCYAuthentication.java

@@ -39,7 +39,8 @@ public class BJCYAuthentication implements UserAuthentication {
     private final String ret="error_code";
     @Override
     public boolean certificate(UserMessage message) {
-        Map<String, String> headers = new HashMap<String, String>();
+        return true;
+        /*Map<String, String> headers = new HashMap<String, String>();
         headers.put(tokenHead, token);
         Map<String, String> querys = new HashMap<String, String>();
         querys.put(cardNo, message.getIdNumber());
@@ -66,7 +67,7 @@ public class BJCYAuthentication implements UserAuthentication {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return false;
+        return false;*/
     }
 
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1209,7 +1209,15 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public PageDataVO<UsableVehicleModelVO> searchUsableModel(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params);
+            initBookSearchParam(dto, params, Boolean.TRUE);
+        }
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+    }
+
+    public PageDataVO<UsableVehicleModelVO> searchUsableModelBackStage(UsableVeicleDTO dto) {
+        Map<String, Object> params = BeanUtil.beanToMap(dto);
+        if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
+            initBookSearchParam(dto, params, Boolean.FALSE);
         }
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
@@ -1220,14 +1228,17 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 
-    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params) {
+    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getStartDate()) &&
                 StringUtils.isNotBlank(dto.getEndDate())) {
-//            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
-//                    dto.getEndDate());
-            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
-                    dto.getEndDateExtend());
+            if(needDateExtend) {
+                notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
+                        dto.getEndDateExtend());
+            }else {
+                notBookedDates = convertDatePeriod2List(dto.getStartDate(),
+                    dto.getEndDate());
+            }
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -142,8 +142,8 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         }
         //设置显示是否有车
         dto.setYearNo4Where(Boolean.TRUE);
-        dto.setUseType(null);
-        return ObjectRestResponse.succ(vehicleBiz.searchUsableModel(dto));
+        //dto.setUseType(null);
+        return ObjectRestResponse.succ(vehicleBiz.searchUsableModelBackStage(dto));
     }
 
     /**

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -91,6 +91,6 @@
         <if test="cityCode != null">
            AND  `addr_city`=#{cityCode}
         </if>
-        ) AS `cb` ON cb.id = bc.company_base_id
+        ) AS `cb` ON cb.id = bc.company_base_id ORDER  BY `id`
     </select>
 </mapper>
\ No newline at end of file