Merge branch 'master-chw' of http://113.105.137.151:22280/youjj/cloud-platform into master-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRestInterface.java

@@ -126,6 +126,19 @@ public interface UserRestInterface  {
         return  null;
     }
 
+    default Integer getBusinessUserCompanyId(){
+        return getBusinessUserCompanyIds() == null? null : getBusinessUserCompanyIds().get(0);
+    }
+
+    default Integer getBgUserCompanyId(){
+        UserDTO userDTO = getAdminUserInfoV2();
+        if(userDTO != null && CollUtil.isNotEmpty(userDTO.getCompanyIds())) {
+            return userDTO.getCompanyIds().get(0);
+        } else {
+            return null;
+        }
+    }
+
     default UserDTO getBusinessUserByAppUser(){
         String currentUserName = BaseContextHandler.getUsername();
         if (StrUtil.isNotBlank(currentUserName)){

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -241,10 +241,10 @@
             </choose>
         </if>
         <if test="realName !=null and  realName != ''">
-            and d.realname like CONCAT('%',#{realName},'%')
+            and (d.realname like CONCAT('%',#{realName},'%') or d.nickname like CONCAT('%',#{realName},'%'))
         </if>
         <if test="nickname !=null and  nickname != ''">
-            and d.nickname, like CONCAT('%',#{nickname},'%')
+            and d.nickname like CONCAT('%',#{nickname},'%')
         </if>
         <if test="citySet != null and citySet.size > 0 ">
             and d.city_code in

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -193,7 +193,7 @@ public class MsgBiz {
             return imQuestionBiz.getList(questionParamDto);
         }
         Query query = new Query(Criteria.where("body.type").in(ids));
-        query.addCriteria(Criteria.where("userId").is(userId));
+        query.addCriteria(Criteria.where("userId").is(userId).and("visible").is(1));
         int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
         query.with(pageable);
         query.with(new Sort(Sort.Direction.DESC, "time"));

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

@@ -93,7 +93,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
      * @param specialRent
      * @param userDTO
      */
-    public void addRent(@RequestBody SpecialRent specialRent, UserDTO userDTO) {
+    public void addRent(@RequestBody SpecialRent specialRent, UserDTO userDTO, Integer currentCompanyId) {
         AssertUtils.isBlank(userDTO);
         AssertUtils.isBlank(specialRent.getUnitPrice());
         if(StrUtil.isBlank(specialRent.getVehicleId())) {
@@ -123,6 +123,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
         specialRent.setCategoryId(vehicle.getCategoryId());
         specialRent.setGoodsType(vehicle.getGoodsType());
         specialRent.setPriceType(vehicle.getPriceType());
+        specialRent.setPublishCompanyId(currentCompanyId);
 
         //缓存商品信息
         specialRent.setGoodsJson(JSONUtil.parse(vehicle).toString());

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

@@ -231,6 +231,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
             setStatus(ShuntApply.STATUS_ORDER);
             setOrderStatus(ShuntApply.ORDER_STATUS_TOPAY);
             setRealAmount(bo.getOrder().getRealAmount());
+            setOrderId(bo.getOrder().getId());
         }});
         return ObjectRestResponse.succ(bo.getOrder());
     }
@@ -363,7 +364,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         shuntApply.setOrderNo(detail.getOrder().getNo());
         shuntApply.setOverTime(DateUtil.offsetHour(DateUtil.date(), 1).getTime());
         shuntApply.setConfirmUserId(userDTO.getId());
-        shuntApply.setConfirmCompanyId(userDTO.getCompanyId());
+        shuntApply.setConfirmCompanyId(getBusinessUserCompanyId());
         shuntApply.setBookRecordId(detail.getBookRecordId());
         baseBiz.updateSelectiveByIdRe(shuntApply);
 
@@ -432,7 +433,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         UserDTO userDTO = getBusinessUserByAppUser();
         AssertUtils.isBlank(userDTO);
         PageDataVO<ShuntApplyController.ShuntApplyVO> pages = PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.selectByWeekend(w -> {
-            w.andEqualTo(ShuntApply::getConfirmUserId, userDTO.getId());
+            w.andEqualTo(ShuntApply::getConfirmCompanyId, getBusinessUserCompanyId());
             w.andEqualTo(ShuntApply::getIsBizdel, SYS_FALSE);
             if(StrUtil.isNotBlank(dto.getMultiStatus())) {
                 w.andIn(ShuntApply::getStatus, CollUtil.toList(dto.getMultiStatus().split(",")));

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

@@ -68,7 +68,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
     public ObjectRestResponse appBusinessAddRent(@RequestBody SpecialRent specialRent) {
         UserDTO userDTO = getBusinessUserByAppUser();
 
-        baseBiz.addRent(specialRent, userDTO);
+        baseBiz.addRent(specialRent, userDTO, getBusinessUserCompanyId());
 
         return ObjectRestResponse.succ();
     }
@@ -152,7 +152,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         Query query = new Query(dto);
         PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
             w.andEqualTo(SpecialRent::getIsDel, SYS_FALSE);
-            w.andEqualTo(SpecialRent::getPublishUserId, userDTO.getId());
+            w.andEqualTo(SpecialRent::getPublishCompanyId, getBusinessUserCompanyId());
             return w;
         }, " crt_time desc "), SpecialRentVO.class);
 
@@ -208,6 +208,8 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
             setId(specialRent.getId());
             setStatus(SpecialRent.STATUS_ORDER);
             setOrderStatus(SpecialRent.ORDER_STATUS_TOPAY);
+            setJoinUserId(getCurrentUserIdInt());
+            setOrderId(bo.getOrder().getId());
         }});
         return ObjectRestResponse.succ(bo.getOrder());
     }

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

@@ -67,7 +67,7 @@ public class BgSpecialRentController extends BaseController<SpecialRentBiz, Spec
     @ApiOperation(value = "添加特惠租车")
     public ObjectRestResponse businessAddRent(@RequestBody SpecialRent specialRent) {
         UserDTO userDTO = getAdminUserInfoV2();
-        baseBiz.addRent(specialRent, userDTO);
+        baseBiz.addRent(specialRent, userDTO, getBgUserCompanyId());
 
         return ObjectRestResponse.succ();
     }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/BannerBiz.java

@@ -47,12 +47,12 @@ public class BannerBiz extends BaseBiz<BannerMapper, Banner> {
 	 * @param indexShow 是否首页展示
 	 * @return
 	 */
-	public ObjectRestResponse<List<Banner>> getAll(Integer indexShow) {
+	public ObjectRestResponse<List<Banner>> getAll(Integer indexShow, Integer location) {
 		Example example = new Example(Banner.class);
 		if (indexShow != null) {
-			example.createCriteria().andEqualTo("isDel", 0).andEqualTo("status", 1).andEqualTo("indexShow",indexShow);
+			example.createCriteria().andEqualTo("isDel", 0).andEqualTo("status", 1).andEqualTo("indexShow",indexShow).andEqualTo("location", location);
 		} else {
-			example.createCriteria().andEqualTo("isDel", 0).andEqualTo("status", 1);
+			example.createCriteria().andEqualTo("isDel", 0).andEqualTo("status", 1).andEqualTo("location", location);
 		}
 		example.orderBy("rank");
 		return ObjectRestResponse.succ(mapper.selectByExample(example));

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SearchBiz.java

@@ -2,7 +2,6 @@ package com.xxfc.platform.uccn.biz;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
-import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -12,7 +11,6 @@ import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.uccn.comstnt.ServiceConstant;
-import com.xxfc.platform.uccn.entity.Article;
 import com.xxfc.platform.uccn.vo.SearchResultVo;
 import com.xxfc.platform.uccn.vo.ServiceResultVo;
 import com.xxfc.platform.uccn.vo.SummitActivityVo;
@@ -199,24 +197,24 @@ public class SearchBiz {
             }
         });
         //新闻
-        threadPoolTaskExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    ServiceResultVo<Article> articleServiceResultVo = new ServiceResultVo<>();
-                    PageInfo articleList = articleBiz.getArticleList(1, ServiceConstant.NEWS_LIMIT, 1, keyWord);
-                    List<Article> result = articleList == null ? Collections.EMPTY_LIST : articleList.getList() == null ? Collections.EMPTY_LIST : articleList.getList();
-                    articleServiceResultVo.setData(result);
-                    articleServiceResultVo.setTotalCount(articleList.getTotal());
-                    searchResultVo.put(ServiceConstant.NEWS, articleServiceResultVo);
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                } finally {
-                    latch.countDown();
-                }
-
-            }
-        });
+//        threadPoolTaskExecutor.execute(new Runnable() {
+//            @Override
+//            public void run() {
+//                try {
+//                    ServiceResultVo<Article> articleServiceResultVo = new ServiceResultVo<>();
+//                    PageInfo articleList = articleBiz.getArticleList(1, ServiceConstant.NEWS_LIMIT, 1, keyWord);
+//                    List<Article> result = articleList == null ? Collections.EMPTY_LIST : articleList.getList() == null ? Collections.EMPTY_LIST : articleList.getList();
+//                    articleServiceResultVo.setData(result);
+//                    articleServiceResultVo.setTotalCount(articleList.getTotal());
+//                    searchResultVo.put(ServiceConstant.NEWS, articleServiceResultVo);
+//                } catch (Exception ex) {
+//                    ex.printStackTrace();
+//                } finally {
+//                    latch.countDown();
+//                }
+//
+//            }
+//        });
         try {
             latch.await();
         } catch (InterruptedException e) {

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

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.uccn.biz.BannerBiz;
+import com.xxfc.platform.uccn.entity.Banner;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("banner/web")
+public class BannerWebController extends BaseController<BannerBiz, Banner> {
+
+	@GetMapping(value = "/app/unauth/getAll")
+	public ObjectRestResponse getAll(@RequestParam(value = "location", defaultValue = "1") Integer location) {
+		return baseBiz.getAll(1, location);
+	}
+}
\ No newline at end of file

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

 package com.xxfc.platform.uccn.rest;
 
-import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.uccn.biz.SearchBiz;
 import com.xxfc.platform.uccn.comstnt.ServiceConstant;
-import com.xxfc.platform.uccn.entity.Article;
 import com.xxfc.platform.uccn.vo.SearchResultVo;
 import com.xxfc.platform.uccn.vo.ServiceResultVo;
 import com.xxfc.platform.uccn.vo.SummitActivityVo;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
@@ -19,7 +16,10 @@ import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -106,16 +106,16 @@ public class SearchController {
                 campsiteSearchResultVo.put(ServiceConstant.CAMPSITE,campsiteShopPageVoServiceResultVo);
                 return ObjectRestResponse.succ(campsiteSearchResultVo);
             case ServiceConstant.NEWS:
-                ObjectRestResponse articleresult = articleController.getArticleList(page, limit, 1, keyWord);
-                PageInfo<Article> articlePageDataVO = (PageInfo<Article>)articleresult.getData();
-                List<Article> articleList = articlePageDataVO.getList();
-                Long articleTotalCount = articlePageDataVO.getTotal();
-                ServiceResultVo<Article> articleServiceResultVo = new ServiceResultVo<>();
-                articleServiceResultVo.setTotalCount(articleTotalCount);
-                articleServiceResultVo.setData(articleList);
-                SearchResultVo  articleSearchResult= new SearchResultVo();
-                articleSearchResult.put(ServiceConstant.NEWS,articleServiceResultVo);
-                return ObjectRestResponse.succ(articleSearchResult);
+//                ObjectRestResponse articleresult = articleController.getArticleList(page, limit, 1, keyWord);
+//                PageInfo<Article> articlePageDataVO = (PageInfo<Article>)articleresult.getData();
+//                List<Article> articleList = articlePageDataVO.getList();
+//                Long articleTotalCount = articlePageDataVO.getTotal();
+//                ServiceResultVo<Article> articleServiceResultVo = new ServiceResultVo<>();
+//                articleServiceResultVo.setTotalCount(articleTotalCount);
+//                articleServiceResultVo.setData(articleList);
+//                SearchResultVo  articleSearchResult= new SearchResultVo();
+//                articleSearchResult.put(ServiceConstant.NEWS,articleServiceResultVo);
+//                return ObjectRestResponse.succ(articleSearchResult);
             case ServiceConstant.ACTIVITY:
                 ObjectRestResponse<PageDataVO<SummitActivityVo>> summitActivityWithPage = summitActivityController.findSummitActivityWithPage(page, limit, null, keyWord);
                 List<SummitActivityVo> summitActivityVos = summitActivityWithPage.getData().getData();

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

@@ -21,8 +21,4 @@ public class BannerController extends BaseController<BannerBiz, Banner> {
 		return baseBiz.selectList(bannerDto);
 	}
 
-	@GetMapping(value = "/app/unauth/getAll")
-	public ObjectRestResponse getAll() {
-		return baseBiz.getAll(1);
-	}
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleVO.java

@@ -72,6 +72,10 @@ public class VehicleVO extends Vehicle {
 
     private List<VehicleExtensionVO> vehicleExtensions;
 
+    public void setExtensionVOS(List<VehicleExtensionVO> extensionVOS) {
+        this.extensionVOS = extensionVOS;
+    }
+
     private String manageProvinceName;
 
     private String manageCityName;

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

@@ -100,6 +100,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     VehicleHolidayPriceInfoBiz vehicleHolidayPriceInfoBiz;
 
+    @Autowired
+    VehicleExtensionBiz extensionBiz;
+
     public UserFeign getUserFeign() {
         return userFeign;
     }
@@ -704,10 +707,25 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
     }
 
+    @GetMapping("app/unauth/website/selectList")
+    @ApiModelProperty("店铺商品列表(官网)")
+    @IgnoreUserToken
+    public  ObjectRestResponse<PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO>> websiteSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
+        vehicleFindAppDTO.setState(Vehicle.STATE_UP);
+        vehicleFindAppDTO.setIsMinPrice(SYS_TRUE);
+        PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO> pageVo = baseBiz.appSelectList(vehicleFindAppDTO);
+        if(CollUtil.isNotEmpty(pageVo.getData())) {
+            pageVo.getData().forEach(v -> {
+                v.setVehicleExtensions(extensionBiz.getTree(v.getId()));
+            });
+        }
+        return  ObjectRestResponse.succ(pageVo);
+    }
+
     @GetMapping("app/unauth/shop/headSelectList")
     @ApiModelProperty("店铺商品列表(头部输入框)")
     @IgnoreUserToken
-    public  ObjectRestResponse<PageDataVO<VehicleVO>> shopHeadSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
+    public  ObjectRestResponse<PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO>> shopHeadSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
         vehicleFindAppDTO.setState(Vehicle.STATE_UP);
         vehicleFindAppDTO.setIsMinPrice(SYS_TRUE);
         return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
@@ -723,6 +741,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     static public class VehicleVO extends Vehicle {
         private VehicleModel vehicleModel;
         private List<VehiclePlatCata> vehiclePlatCatas;
+
         private List<VehicleModelCalendarPriceDTO> priceDTOS;
         /**
          * 价格开始日期