Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AccountBindDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/25 14:42
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AccountBindDTO {
+      private String opendId;
+      private String unionId;
+      private String nickName;
+      private String code;
+      private String type;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java

@@ -22,6 +22,8 @@ public class AppUserDetail {
 	private Integer isMember;
 	@Column(name = "wx_nickname")
 	private String wxNickname;
+	@Column(name = "qq_nickname")
+	private String qqNickname;
 	private String nickname;
 	private String realname;
 	private String headimgurl;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -20,7 +20,9 @@ public class AppUserDTO {
 	private Integer isMember;
 	private String username;
 	private String wxNickname;
+	private String qqNickname;
 	private String nickname;
+	private String aliPayNickName;
 	private String realname;
 	private String headimgurl;
 	private String email;
@@ -88,7 +90,8 @@ public class AppUserDTO {
 	private String itemImg;
 	private Integer memberNo;
 	private Long cardLeave;
-	private Integer isBind;
+	private Boolean isBindWx;
 	private Boolean isBindAliPay;
+	private Boolean isBindQQ;
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java

@@ -37,6 +37,9 @@ public class AppUserVo {
 	private Integer isMember;
 	//昵称
 	private String nickname;
+	private String wxNickname;
+	private String aliPayNickName;
+	private String qqNickname;
 	//真实姓名
 	private String realname;
 	//头像

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java

@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.entity.AppUserAlipay;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserAlipayMapper;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
@@ -65,7 +63,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
             updateSelectiveById(appUserAlipay1);
         }
     }
-   //获取支付宝列表
+    //获取支付宝列表
     public List<AppUserAlipay> getListByUserId(Integer userId){
         Example example=new Example(AppUserAlipay.class);
         example.createCriteria().andEqualTo("userId",userId).andEqualTo("isDel",0);
@@ -96,16 +94,16 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
             appUserAlipays.add(appUserAlipay);
         }
         //微信
-        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
-        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
-            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userId);
-            AppUserAlipay wxAppUser = new AppUserAlipay();
-            wxAppUser.setType(2);
-            wxAppUser.setUserId(userId);
-            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
-            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
-            appUserAlipays.add(wxAppUser);
-        }
+//        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
+//        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
+//            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userId);
+//            AppUserAlipay wxAppUser = new AppUserAlipay();
+//            wxAppUser.setType(2);
+//            wxAppUser.setUserId(userId);
+//            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
+//            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
+//            appUserAlipays.add(wxAppUser);
+//        }
         return appUserAlipays;
     }
 
@@ -162,7 +160,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
                 }
                 log.info("用户支付宝信息： {}", appUserAlipay.toString());
                 save(appUserAlipay);
-                return ObjectRestResponse.succ();
+                return ObjectRestResponse.succ(appUserAlipay.getNickname());
             } else {
                 return ObjectRestResponse.createFailedResult(Integer.parseInt(jsonObject.getJSONObject("error_response").getString("code")), jsonObject.getJSONObject("error_response").getString("sub_msg"));
             }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
 import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
@@ -149,4 +150,18 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         return mapper.getUserIdByUsername(keywords);
     }
 
+    public void updateByUserId(AccountBindDTO accountBindDTO,Integer userId) {
+
+        AppUserDetail appUserDetail = new AppUserDetail();
+        if (accountBindDTO.getType().equals("wx")){
+            appUserDetail.setWxNickname(accountBindDTO.getNickName());
+        }
+        if(accountBindDTO.getType().equals("q")){
+            appUserDetail.setQqNickname(accountBindDTO.getNickName());
+        }
+        Example example = new Example(AppUserDetail.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("userid",userId);
+        mapper.updateByExample(appUserDetail,example);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java

@@ -2,21 +2,19 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSONObject;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.constant.UserConstant;
-import com.google.common.collect.Lists;
-import com.xxfc.platform.im.utils.StringUtil;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -24,6 +22,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
@@ -45,6 +44,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     private static final String WX_TYPE = "wx";
     private static final String QQ_TYPE = "q";
+    private static final String ALIPAY_TYPE = "aliPay";
 
     @Autowired
     ThirdFeign thirdFeign;
@@ -54,6 +54,9 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     @Autowired
     AppUserDetailBiz appUserDetailBiz;
 
+    @Autowired
+    private AppUserAlipayBiz appUserAlipayBiz;
+
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     @Override
     public void insertSelective(AppUserLogin entity) {
@@ -321,9 +324,73 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     }
 
     public List<AppUserLogin> getUserByUsernameAndRealName(String username, String realName) {
-       
-        return mapper.getUserByUsernameAndRealName(username,realName);
 
+        return mapper.getUserByUsernameAndRealName(username, realName);
+
+
+    }
+
+    @CacheClear(pre = "user{2}")
+    public ObjectRestResponse bindAccount(AccountBindDTO accountBindDTO, Integer userId, HttpServletRequest request) {
+        switch (accountBindDTO.getType()) {
+            case WX_TYPE:
+                wxBinding(accountBindDTO, userId);
+                break;
+            case QQ_TYPE:
+                qqBinding(accountBindDTO, userId);
+                break;
+            case ALIPAY_TYPE:
+                return appUserAlipayBiz.getUserInfo(accountBindDTO.getCode(), request);
+            default:
+                break;
+        }
+        return ObjectRestResponse.succ();
+    }
+
+    /**
+     * 微信绑定
+     *
+     * @param accountBindDTO
+     */
+    private void wxBinding(AccountBindDTO accountBindDTO, Integer userId) {
+        //检查微信是否绑定
+        Example example = new Example(AppUserLogin.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("id", userId);
+        criteria.andEqualTo("wxOpenid", accountBindDTO.getOpendId());
+        List<AppUserLogin> appUserLogins = mapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(appUserLogins)) {
+            throw new BaseException("该微信已经绑定过了");
+        }
+
+        AppUserLogin appUserLogin = new AppUserLogin();
+        appUserLogin.setId(userId);
+        appUserLogin.setWxOpenid(accountBindDTO.getOpendId());
+        appUserLogin.setUnionid(accountBindDTO.getUnionId());
+        mapper.updateByPrimaryKey(appUserLogin);
+        appUserDetailBiz.updateByUserId(accountBindDTO, userId);
+    }
 
+    /**
+     * QQ绑定
+     *
+     * @param accountBindDTO
+     */
+    private void qqBinding(AccountBindDTO accountBindDTO, Integer userId) {
+        //检查qq是否绑定
+        Example example = new Example(AppUserLogin.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("id", userId);
+        criteria.andEqualTo("openid", accountBindDTO.getOpendId());
+        List<AppUserLogin> appUserLogins = mapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(appUserLogins)) {
+            throw new BaseException("该微信已经绑定过了");
+        }
+        AppUserLogin appUserLogin = new AppUserLogin();
+        appUserLogin.setId(userId);
+        appUserLogin.setWxOpenid(accountBindDTO.getOpendId());
+        appUserLogin.setUnionid(accountBindDTO.getUnionId());
+        mapper.updateByPrimaryKey(appUserLogin);
+        appUserDetailBiz.updateByUserId(accountBindDTO, userId);
     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.*;
+import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
@@ -22,7 +23,6 @@ import com.xxfc.platform.order.feign.OrderFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -145,7 +145,7 @@ public class AppUserController extends CommonBaseController{
             throw new Exception();
         }
         Integer id= userVo.getId();
-       Integer positionId=userVo.getPositionId();
+        Integer positionId=userVo.getPositionId();
         BeanUtils.copyProperties(userDTO,userVo);
         if(userVo.getIsMember()!=null&&userVo.getIsMember()>0){
             //获取用户会员信息
@@ -158,8 +158,6 @@ public class AppUserController extends CommonBaseController{
                 if (memberLevel!=null){
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
-                    userDTO.setBigIcon(memberLevel.getBigIcon());
-                    userDTO.setItemImg(memberLevel.getItemImg());
                 }
             }
         }
@@ -171,6 +169,10 @@ public class AppUserController extends CommonBaseController{
         long count = appUserAlipays.stream().filter(appUserAlipay -> appUserAlipay.getType() == 1).count();
         userDTO.setIsBindAliPay(count>0);
         userDTO.setId(id);
+        userDTO.setAliPayNickName(userDTO.getIsBindAliPay()?appUserAlipays.get(0).getNickname():"");
+        AppUserLogin appUserLogin = appUserLoginBiz.selectById(userid);
+        userDTO.setIsBindWx(StringUtils.isEmpty(appUserLogin.getWxOpenid()));
+        userDTO.setIsBindQQ(StringUtils.isEmpty(appUserLogin.getOpenid()));
         return ObjectRestResponse.succ(userDTO);
     }
 
@@ -224,10 +226,9 @@ public class AppUserController extends CommonBaseController{
             appUserLoginBiz.bindOpenid(appUserLogin);
             //支付宝绑定
             if (StringUtils.isNotEmpty(userVo.getAliCode()) && userVo.getAliCode().trim().length()>0){
-                appUserAlipayBiz.getUserInfo(userVo.getAliCode(),request);
+               appUserAlipayBiz.getUserInfo(userVo.getAliCode(),request);
             }
         }
-
         return ObjectRestResponse.succ();
     }
 
@@ -304,7 +305,7 @@ public class AppUserController extends CommonBaseController{
     }
     @GetMapping("/findusersByIds")
     public Map<Integer,AppUserLogin> findAppUsersByUserIds(@RequestParam(value = "userIds") List<Integer> userIds){
-     return appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(userIds);
+        return appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(userIds);
     }
 
     @GetMapping("/finduserIdsByphones")
@@ -316,8 +317,8 @@ public class AppUserController extends CommonBaseController{
     @IgnoreUserToken
     @IgnoreClientToken
     public ObjectRestResponse<AppUserInfoVo> findUserInfoByCode(@PathVariable("code") String code){
-         AppUserInfoVo appUserInfoVo = userDetailBiz.findUserInfoByCode(code);
-         return ObjectRestResponse.succ(appUserInfoVo);
+        AppUserInfoVo appUserInfoVo = userDetailBiz.findUserInfoByCode(code);
+        return ObjectRestResponse.succ(appUserInfoVo);
     }
 
     @GetMapping("/app/unauth/getUserIdByUsername")
@@ -334,4 +335,14 @@ public class AppUserController extends CommonBaseController{
     public Object test() {
         return appUserLoginBiz.test();
     }
+
+    @PostMapping("/bind")
+    private ObjectRestResponse accountBinding(AccountBindDTO accountBindDTO, HttpServletRequest request){
+         try {
+             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            return appUserLoginBiz.bindAccount(accountBindDTO, Integer.valueOf(infoFromToken.getId()), request);
+         }catch (Exception ex){
+             throw new BaseException(ex);
+         }
+    }
 }

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

@@ -14,6 +14,8 @@
         <result column="certification_status" property="certificationStatus"/>
         <result column="is_member" property="isMember"/>
         <result column="nickname" property="nickname"/>
+        <result column="wx_nickname" property="wxNickname"/>
+        <result column="qq_nickname" property="qqNickname"/>
         <result column="realname" property="realname"/>
         <result column="headimgurl" property="headimgurl"/>
         <result column="birthday" property="birthday"/>

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;
+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 java.util.List;
+
 /**
  * @author libin
  * @version 1.0
@@ -48,24 +60,74 @@ public class SearchController {
                 vehicleModelQueryCondition.setPage(page);
                 vehicleModelQueryCondition.setLimit(limit);
                 vehicleModelQueryCondition.setVehicleName(keyWord);
-                return vehicleModelController.findVehicleModelPageUnauthfind(vehicleModelQueryCondition);
+                ObjectRestResponse<PageDataVO<VehicleModelVo>> vehicleResult =vehicleModelController.findVehicleModelPageUnauthfind(vehicleModelQueryCondition);
+                List<VehicleModelVo> vehicleModelVoList = vehicleResult.getData().getData();
+                Long vehicleTotalCount = vehicleResult.getData().getTotalCount();
+                ServiceResultVo<VehicleModelVo> vehicleModelVoServiceResultVo = new ServiceResultVo<>();
+                vehicleModelVoServiceResultVo.setData(vehicleModelVoList);
+                vehicleModelVoServiceResultVo.setTotalCount(vehicleTotalCount);
+                SearchResultVo searchResultVo = new SearchResultVo();
+                searchResultVo.put(ServiceConstant.VEHICLE,vehicleModelVoServiceResultVo);
+                return  ObjectRestResponse.succ(searchResultVo);
+
             case ServiceConstant.BRANCH_COMPANY:
                 BranchCompanyFindDTO branchCompanyFindDTO = new BranchCompanyFindDTO();
                 branchCompanyFindDTO.setPage(page);
                 branchCompanyFindDTO.setLimit(limit);
                 branchCompanyFindDTO.setName(keyWord);
-                return branchCompanyController.listBranchCompanyWithPage(branchCompanyFindDTO);
+                ObjectRestResponse<PageDataVO>  branchResult = branchCompanyController.listBranchCompanyWithPage(branchCompanyFindDTO);
+                List branchCompanyList = branchResult.getData().getData();
+                Long branchCompanyTotalCount = branchResult.getData().getTotalCount();
+                ServiceResultVo<BranchCompanyListVO> companyServiceResultVo = new ServiceResultVo<>();
+                companyServiceResultVo.setData(branchCompanyList);
+                companyServiceResultVo.setTotalCount(branchCompanyTotalCount);
+                SearchResultVo branchCompanyResultVo = new SearchResultVo();
+                branchCompanyResultVo.put(ServiceConstant.BRANCH_COMPANY,companyServiceResultVo);
+                return ObjectRestResponse.succ(branchCompanyResultVo);
             case ServiceConstant.TROUR:
-                return gwTourController.getGoodList(page, limit, null, keyWord);
+                ObjectRestResponse goodresult = gwTourController.getGoodList(page, limit, null, keyWord);
+                PageDataVO<TourGood> data = (PageDataVO<TourGood>)goodresult.getData();
+                List<TourGood> tourGoodList = data.getData();
+                Long tourGoodTotalCount = data.getTotalCount();
+                ServiceResultVo<TourGood> tourGoodServiceResultVo = new ServiceResultVo<>();
+                tourGoodServiceResultVo.setData(tourGoodList);
+                tourGoodServiceResultVo.setTotalCount(tourGoodTotalCount);
+                SearchResultVo tourGoodSearchResult =  new SearchResultVo();
+                tourGoodSearchResult.put(ServiceConstant.TROUR,tourGoodServiceResultVo);
+                return ObjectRestResponse.succ(tourGoodSearchResult);
             case ServiceConstant.CAMPSITE:
-                return campsiteUccnController.findCampsiteShopPageByType(null, page, limit, keyWord);
+                ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> campsiteResult = campsiteUccnController.findCampsiteShopPageByType(null, page, limit, keyWord);
+                List<CampsiteShopPageVo> campsiteShopPageVoList = campsiteResult.getData().getData();
+                Long campsiteTotalCount = campsiteResult.getData().getTotalCount();
+                ServiceResultVo<CampsiteShopPageVo> campsiteShopPageVoServiceResultVo = new ServiceResultVo<>();
+                campsiteShopPageVoServiceResultVo.setData(campsiteShopPageVoList);
+                campsiteShopPageVoServiceResultVo.setTotalCount(campsiteTotalCount);
+                SearchResultVo campsiteSearchResultVo = new SearchResultVo();
+                campsiteSearchResultVo.put(ServiceConstant.CAMPSITE,campsiteShopPageVoServiceResultVo);
+                return ObjectRestResponse.succ(campsiteSearchResultVo);
             case ServiceConstant.NEWS:
-                return articleController.getArticleList(page, limit, null, keyWord);
+                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:
-                return summitActivityController.findSummitActivityWithPage(page, limit, null, keyWord);
+                ObjectRestResponse<PageDataVO<SummitActivityVo>> summitActivityWithPage = summitActivityController.findSummitActivityWithPage(page, limit, null, keyWord);
+                List<SummitActivityVo> summitActivityVos = summitActivityWithPage.getData().getData();
+                Long summitTotalCount = summitActivityWithPage.getData().getTotalCount();
+                ServiceResultVo<SummitActivityVo> summitActivityVoServiceResultVo = new ServiceResultVo<>();
+                summitActivityVoServiceResultVo.setData(summitActivityVos);
+                summitActivityVoServiceResultVo.setTotalCount(summitTotalCount);
+                SearchResultVo summitActivitySearchResult = new SearchResultVo();
+                summitActivitySearchResult.put(ServiceConstant.ACTIVITY,summitActivityVoServiceResultVo);
+                return ObjectRestResponse.succ(summitActivitySearchResult);
             default:
-                SearchResultVo searchResultVo = searchBiz.searchWithKeyWords(keyWord);
-                return ObjectRestResponse.succ(searchResultVo);
+                return ObjectRestResponse.succ(searchBiz.searchWithKeyWords(keyWord));
         }
     }
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -417,12 +417,12 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         try {
             response = alipayClient.execute(request);
         } catch (AlipayApiException e) {
-             throw new BaseException("支付宝转账api调用错误",e);
+            throw new BaseException("支付宝转账api调用错误",e);
         }
         if (response.isSuccess()) {
             return fundPayVo.getOutBizNo();
         } else {
-             throw  new BaseException(response.getSubMsg(),response.getSubCode());
+            throw  new BaseException(response.getSubMsg(),response.getSubCode());
         }
     }
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UserInfoController.java

@@ -5,10 +5,12 @@ package com.xxfc.platform.universal.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayApiException;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.UserAgentUtil;
 import com.xxfc.platform.universal.biz.OrderPayBiz;
+import com.xxfc.platform.universal.biz.OrderPayBiz;
 import com.xxfc.platform.universal.biz.WeixinService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

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

@@ -53,16 +53,28 @@ public class VehicleModelCalendarPriceController {
         return ObjectRestResponse.succ(vehicleModelCalendarPriceVos);
     }
 
-    @GetMapping(value = "/price",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @GetMapping(value = "/price", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> findVehicleModelCalendarPriceByDate(@RequestParam(value = "startDate") Long startDate,
-                                                                                       @RequestParam(value = "endDate") Long endDate,
-                                                                                       @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
-                                                                                       @RequestParam(value = "userId") Integer userId) {
+                                                                                                      @RequestParam(value = "endDate") Long endDate,
+                                                                                                      @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
+                                                                                                      @RequestParam(value = "userId") Integer userId) {
 
         Date startDateDay = DateUtil.beginOfDay(DateUtil.date(startDate));
-                //Date.from(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        //Date.from(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
         Date endDateDay = DateUtil.beginOfDay(DateUtil.date(endDate));
-                //Date.from(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        //Date.from(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
         return ObjectRestResponse.succ(vehicleModelCalendarPriceBiz.findVehicleModelCalendarPriceByDateAndVehilceIdAndUserId(startDateDay, endDateDay, vehicleModelId, userId));
     }
+
+    @GetMapping(value = "/app/price", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> findVehicleModelCalendarPriceByDateForApp(@RequestParam(value = "startDate") Long startDate,
+                                                                                                            @RequestParam(value = "endDate") Long endDate,
+                                                                                                            @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
+                                                                                                            AppUserDTO appUserDTO) {
+
+        Date startDateDay = DateUtil.beginOfDay(DateUtil.date(startDate));
+        Date endDateDay = DateUtil.beginOfDay(DateUtil.date(endDate));
+        return ObjectRestResponse.succ(vehicleModelCalendarPriceBiz.findVehicleModelCalendarPriceByDateAndVehilceIdAndUserId(startDateDay, endDateDay, vehicleModelId, appUserDTO.getUserid()));
+    }
+
 }