添加收藏

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

@@ -38,7 +38,7 @@ public class AppUserCollectDTO {
     private BigDecimal price;
 
     @ApiModelProperty("单位")
-    private BigDecimal unit;
+    private String unit;
 
     @ApiModelProperty("是否删除；0-正常；1-删除")
     private Integer isDel;

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

@@ -45,7 +45,7 @@ public class AppUserCollect {
 
     @ApiModelProperty("单位")
     @Column(name = "unit")
-    private BigDecimal unit;
+    private String unit;
 
 
 

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

@@ -10,7 +10,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import org.springframework.beans.BeanUtils;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
@@ -29,7 +29,7 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
 
 
     //新增收藏
-    public ObjectRestResponse addUserCollect(AppUserCollectDTO collectDTO){
+    public ObjectRestResponse addUserCollect(AppUserCollectDTO collectDTO)throws  Exception{
           if(collectDTO==null){
               return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
           }
@@ -40,7 +40,7 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
     }
 
     //更新收藏
-    public ObjectRestResponse upUserCollect(AppUserCollectDTO collectDTO){
+    public ObjectRestResponse upUserCollect(AppUserCollectDTO collectDTO)throws  Exception{
         if(collectDTO==null){
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
@@ -53,7 +53,7 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
     public ObjectRestResponse checkUserCollect(Integer id,Integer userId){
         Example example = new Example(AppUserCollect.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("user_id",userId).andEqualTo("type_id",id).andEqualTo("is_del",0);
+        criteria.andEqualTo("userId",userId).andEqualTo("typeId",id).andEqualTo("isDel",0);
        int count=selectCountByExample(example);
        boolean falg=count>0?false:true;
         return  ObjectRestResponse.succ(falg);
@@ -62,7 +62,7 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
     public ObjectRestResponse getCollectList(Integer userId,int page,int limit){
         Example example = new Example(AppUserCollect.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("user_id",userId).andEqualTo("is_del",0);
+        criteria.andEqualTo("userId",userId).andEqualTo("isDel",0);
         example.setOrderByClause("`id` desc");
         List<AppUserCollect> list=selectByExample(example);
         PageHelper.startPage(page,limit);

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.tour.common;
 
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
@@ -25,4 +26,8 @@ public class TourBaseController<Biz extends BaseBiz> extends CommonBaseControlle
     public Biz getBaseBiz() {
         return baseBiz;
     }
+
+    public UserDTO userinfoByToken(){
+        return userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+    }
 }