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

ace-common/src/main/resources/properties/systemconfig.properties

@@ -23,8 +23,8 @@ TEMPLATECODE=SMS_204210538
 SIGNNAME=亦家房车
 #\u5FAE\u4FE1\u652F\u4ED8\u914D\u7F6E
 WINXIN_AppID=wx425608b69a34736f
-WINXIN_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533
-WINXIN_PARTNER=1539689201
+WINXIN_PARTNER_KEY=adfefead2343qwda3reda3422dw2xds4
+WINXIN_PARTNER=1603321554
 
 #邮件配置
 mail.fromMail.addr=xinxinmanager@126.com
@@ -40,9 +40,9 @@ APP_PARTNER_IOS=1492557632
 APP_PARTNER_KEY_IOS=89201002892010008920100quanzinet
 APP_TRADE_TYPE_IOS=APP
 #andoir
-APP_ID=wx9ed5e51251cf7c61
-APP_PARTNER=1539689201
-APP_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533
+APP_ID=wxf6e61f6595ee7180
+APP_PARTNER=1603321554
+APP_PARTNER_KEY=adfefead2343qwda3reda3422dw2xds4
 APP_TRADE_TYPE=APP
 #\u652F\u4ED8\u56DE\u8C03
 weixinHost=xxtest.upyuns.com

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

@@ -11,6 +11,8 @@ 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 com.xxfc.platform.campsite.entity.CampsiteShop;
+import com.xxfc.platform.campsite.feign.CampsiteFeign;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.feign.TourFeign;
 import org.apache.commons.beanutils.BeanUtils;
@@ -36,6 +38,9 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
     @Autowired
     TourFeign tourFeign;
 
+    @Autowired
+    CampsiteFeign campsiteFeign;
+
 
     //新增收藏
     public ObjectRestResponse addUserCollect(AppUserCollectDTO collectDTO)throws  Exception{
@@ -54,16 +59,28 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
         }
           AppUserCollect collect=new AppUserCollect();
           BeanUtils.copyProperties(collect,collectDTO);
-          TourGood tourGood=tourFeign.one(typeId);
-          if(tourGood!=null){
-              BeanUtils.copyProperties(collect,tourGood);
-              collect.setId(null);
-              collect.setStatus(0);
-              insertSelective(collect);
-          }
+          if (type == 2){
+              TourGood tourGood=tourFeign.one(typeId);
+              if(tourGood!=null){
+                  BeanUtils.copyProperties(collect,tourGood);
+                  collect.setId(null);
+                  collect.setStatus(0);
+                  insertSelective(collect);
+              }
+          }else if (type == 3){
+              ObjectRestResponse<CampsiteShop> info = campsiteFeign.info(typeId);
+              CampsiteShop campsiteShop = info.getData();
+              if (campsiteShop != null){
+                  collect.setName(campsiteShop.getName());
+                  collect.setCover(campsiteShop.getLogo());
+                  collect.setId(null);
+                  collect.setStatus(0);
+                  insertSelective(collect);
 
+              }
+          }
 
-         return  ObjectRestResponse.succ();
+        return  ObjectRestResponse.succ();
     }
 
     //更新收藏

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/feign/CampsiteFeign.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.sun.org.apache.regexp.internal.RE;
 import com.xxfc.platform.campsite.dto.CampsiteShopFindDTO;
+import com.xxfc.platform.campsite.entity.CampsiteShop;
 import com.xxfc.platform.campsite.vo.CampsiteShopDetailVo;
 import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
 import io.swagger.annotations.ApiOperation;
@@ -54,4 +55,9 @@ public interface CampsiteFeign {
 
     @PostMapping(value = "/app/unauth/campsites")
     ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> findCampsiteShopPageForUncc(@RequestBody CampsiteShopFindDTO campsiteShopFindDTO);
+
+
+    @ApiOperation("首页营地列表")
+    @GetMapping(value = "app/unauth/info")
+    ObjectRestResponse<CampsiteShop> info(@RequestParam(value = "id", defaultValue = "0") Integer id);
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

@@ -86,4 +86,11 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
         return ObjectRestResponse.succ(campsiteShops);
     }
 
+
+    @ApiOperation("首页营地列表")
+    @GetMapping(value = "/app/unauth/info")
+    public ObjectRestResponse<CampsiteShop> info(@RequestParam(value = "id", defaultValue = "0") Integer id) {
+        return ObjectRestResponse.succ(baseBiz.selectById(id));
+    }
+
 }
\ No newline at end of file