Merge branch 'master-tiande' into dev-tiande

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

@@ -17,10 +17,10 @@ USER_HEADER_URL_DEFAULT=https://xxtest.upyuns.com/image/app/default_%20avatar.pn
 #\u9ED8\u8BA4\u6635\u79F0
 USER_NIKENAME_DEFAULT=XX_
 #\u77ED\u4FE1\u673A
-ACCESSKEYID=LTAInxMDwHQL8yg9
-ACCESSKEYSECRET=OCKDEiwKGjePCZgPeWMEUFGwGbKYLA
-TEMPLATECODE=SMS_170070101
-SIGNNAME=\u6EF4\u623F\u8F66
+ACCESSKEYID=LTAI4GFsh2SYSzJs9PxB8dhm
+ACCESSKEYSECRET=oUb9cma3vbf359N1un5yVKiZ0buulE
+TEMPLATECODE=SMS_204210538
+SIGNNAME=亦家房车
 #\u5FAE\u4FE1\u652F\u4ED8\u914D\u7F6E
 WINXIN_AppID=wx425608b69a34736f
 WINXIN_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopPageVo.java

 package com.xxfc.platform.campsite.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.xxfc.platform.campsite.dto.CampsiteShopTagDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -111,4 +113,7 @@ public class CampsiteShopPageVo implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String imgDesc;
+
+    @ApiModelProperty("标签列表")
+    private List<CampsiteShopTagDTO>list;
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -100,6 +100,12 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         }*/
         PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = findCampsiteShopPageByTypeAndName(campsiteShopFindDTO);
 /*        campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key,JSONObject.toJSONString(campsiteShopPageDataVO));*/
+        //查询营地的标签
+        List<CampsiteShopPageVo>list = campsiteShopPageDataVO.getData();
+        for(CampsiteShopPageVo campsiteShopPageVo : list){
+            List<CampsiteShopTagDTO> tagList  = campsiteShopTagBiz.findByCampsiteShopId(campsiteShopPageVo.getId());
+            campsiteShopPageVo.setList(tagList);
+        }
         return campsiteShopPageDataVO;
     }
 
@@ -196,7 +202,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
             campsiteShopDetailVo.setHasCollection(false);
         }
 
-
+        //
 
 /*        campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));*/
         return campsiteShopDetailVo;

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourTag.java

@@ -104,4 +104,7 @@ public class TourTag implements Serializable {
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除:0-正常；1-删除")
     private Integer isDel;
+
+    @Transient
+	private List<TourGood> list;
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java

 package com.xxfc.platform.tour.biz;
 
+import cn.hutool.db.handler.HandleHelper;
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -7,6 +8,8 @@ import com.xxfc.platform.tour.comstnt.RedisKey;
 import com.xxfc.platform.tour.dto.TourTagAndBannerDTO;
 import com.xxfc.platform.tour.dto.TourTagBannerDTO;
 import com.xxfc.platform.tour.dto.TourTagDTO;
+import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.mapper.TourGoodMapper;
 import com.xxfc.platform.tour.mapper.TourTagMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -19,10 +22,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -40,6 +40,9 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
      @Autowired
      private TourTagBannerBiz tourTagBannerBiz;
 
+     @Autowired
+     private TourGoodMapper tourGoodMapper;
+
 //    @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
     public List<TourTag> getHotTag() {
 
@@ -49,6 +52,22 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
         return mapper.findHotListTag(tag);
     }
 
+    public List<TourTag> getHotTagAndGoods() {
+        TourTag tag = new TourTag();
+        tag.setIsDel(0);
+        tag.setIsHot(1);
+        List<TourTag>list = mapper.findHotListTag(tag);
+        Map<String,Object>map = new HashMap<String,Object>();
+        //增加两条线路例子
+        for(TourTag tourTag :list){
+            map.put("tagId",tourTag.getId());
+            PageDataVO<TourGood> dataVO = PageDataVO.pageInfo(1, 2, () -> tourGoodMapper.getGoodList(map));
+            List<TourGood> pageDataVO = dataVO.getData();
+            tourTag.setList(pageDataVO);
+        }
+        return list;
+    }
+
     public List<TourTag> getTagList(Integer isHot) {
         TourTag tag = new TourTag();
         tag.setIsDel(0);

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourTagController.java

@@ -45,6 +45,29 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> {
 
     }
 
+    /**
+     * 标签带两条线路
+     * @param dto
+     * @return
+     */
+    @GetMapping("/app/unauth/getTagListAndGoods")
+    public ObjectRestResponse getTagListAndGoods(pageDTO dto){
+
+        if (dto==null) {
+            return ObjectRestResponse.createDefaultFail();
+        }
+
+        Integer hot = dto.getHot();
+
+        if (hot==1){
+            List<TourTag> hotTag = tagBiz.getHotTagAndGoods();
+            return ObjectRestResponse.succ(hotTag);
+        }
+
+        PageDataVO<TourTag> all = tagBiz.findPage(BeanUtil.beanToMap(dto));
+        return ObjectRestResponse.succ(all);
+
+    }
 
     @Override
     @ApiOperation("修改")

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

@@ -11,15 +11,15 @@ import org.springframework.stereotype.Service;
 public class AliYunSmsBiz {
 
     //租车订单通知(普通用户)1
-    public static final String TEMPLATE_ID_ORDER = "SMS_173247815";
+    public static final String TEMPLATE_ID_ORDER = "SMS_204415111";
     //租车订单短信(会员权益)2
-    public static final String TEMPLATE_ID_ORDER_MEMBER = "SMS_173252767";
+    public static final String TEMPLATE_ID_ORDER_MEMBER = "SMS_204415113";
     //旅游订单短信3
-    public static final String TEMPLATE_ID_ORDER_TOUR = "SMS_173247826";
+    public static final String TEMPLATE_ID_ORDER_TOUR = "SMS_204415115";
     //加入会员通知4
-    public static final String TEMPLATE_ID_MEMBER = "SMS_173247829";
+    public static final String TEMPLATE_ID_MEMBER = "SMS_204297476";
     //租/还车公司相同（订单支付后立即发送给相关负责人）5
-    public static final String TEMPLATE_ID_TAAKE_CAR = "SMS_173247836";
+    public static final String TEMPLATE_ID_TAAKE_CAR = "SMS_204287516";
     //租/还车公司不同（发给租车公司负责人，订单支付后发送）6
     public static final String TEMPLATE_ID_DIFFERENT_TAAKE_CAR = "458621";
     // 租/还车公司不同（发给还车公司负责人，订单出车后发））(相同不发)7
@@ -30,60 +30,60 @@ public class AliYunSmsBiz {
 
     //租车（通用）10
     //public static final String TEMPLATE_ID_PAY_A = "460759";
-    public static final String TEMPLATE_ID_PAY_A = "SMS_171112286";
+    public static final String TEMPLATE_ID_PAY_A = "SMS_204415121";
     //租车（使用会员权益）11
     //public static final String TEMPLATE_ID_PAY_B = "460760";
-    public static final String TEMPLATE_ID_PAY_B = "SMS_173340577";
+    public static final String TEMPLATE_ID_PAY_B = "SMS_204415118";
     //租车内部通知（客服）12
     //public static final String TEMPLATE_ID_PAY_C = "460763";
-    public static final String TEMPLATE_ID_PAY_C = "SMS_173345572";
+    public static final String TEMPLATE_ID_PAY_C = "SMS_204287525";
     //租车内部通知（出车人）13
     //public static final String TEMPLATE_ID_PAY_D = "460762";
-    public static final String TEMPLATE_ID_PAY_D = "SMS_173340609";
+    public static final String TEMPLATE_ID_PAY_D = "SMS_204277598";
     //租车内部通知（收车人）14
     //public static final String TEMPLATE_ID_PAY_E = "460764";
-    public static final String TEMPLATE_ID_PAY_E = "SMS_173345589";
+    public static final String TEMPLATE_ID_PAY_E = "SMS_204277599";
     //旅游（通用）15
     //public static final String TEMPLATE_ID_PAY_F = "460765";
-    public static final String TEMPLATE_ID_PAY_F = "SMS_173345597";
+    public static final String TEMPLATE_ID_PAY_F = "SMS_204297493";
     //会员购买（通用）16
     //public static final String TEMPLATE_ID_PAY_G = "460766";
-    public static final String TEMPLATE_ID_PAY_G = "SMS_173340637";
+    public static final String TEMPLATE_ID_PAY_G = "SMS_204277603";
 
     //取消租车（通用）17
     //public static final String TEMPLATE_ID_CANCEL_A= "460767";
-    public static final String TEMPLATE_ID_CANCEL_A= "SMS_173345633";
+    public static final String TEMPLATE_ID_CANCEL_A= "SMS_204415129";
     //取消租车（使用会员权益）18
     //public static final String TEMPLATE_ID_CANCEL_B = "460768";
-    public static final String TEMPLATE_ID_CANCEL_B = "SMS_173340658";
+    public static final String TEMPLATE_ID_CANCEL_B = "SMS_204277607";
     //取消租车（通用扣违约金）19
     //public static final String TEMPLATE_ID_CANCEL_C = "460769";
-    public static final String TEMPLATE_ID_CANCEL_C = "SMS_173345646";
+    public static final String TEMPLATE_ID_CANCEL_C = "SMS_204277608";
     //取消租车（会员权益&扣违 20
     //public static final String TEMPLATE_ID_CANCEL_D = "460770";
-    public static final String TEMPLATE_ID_CANCEL_D = "SMS_173340671";
+    public static final String TEMPLATE_ID_CANCEL_D = "SMS_204287539";
     //取消租车（出车人）21
     //public static final String TEMPLATE_ID_CANCEL_E = "460771";
-    public static final String TEMPLATE_ID_CANCEL_E = "SMS_173345667";
+    public static final String TEMPLATE_ID_CANCEL_E = "SMS_204277611";
     //租车押金退还 22
     //public static final String TEMPLATE_ID_FINISH_A = "460772";
-    public static final String TEMPLATE_ID_FINISH_A = "SMS_175240587";
+    public static final String TEMPLATE_ID_FINISH_A = "SMS_204297503";
     //违章押金退还 23
     //public static final String TEMPLATE_ID_FINISH_B = "460773";
-    public static final String TEMPLATE_ID_FINISH_B = "SMS_173340712";
+    public static final String TEMPLATE_ID_FINISH_B = "SMS_204277616";
     //旅游内部通知（客服）24
     //public static final String TEMPLATE_ID_PAY_H = "461421";
-    public static final String TEMPLATE_ID_PAY_H = "SMS_173340630";
+    public static final String TEMPLATE_ID_PAY_H = "SMS_204287547";
     //取消旅游订单（客服）25
     //public static final String TEMPLATE_ID_CANCEL_F = "461424";
-    public static final String TEMPLATE_ID_CANCEL_F = "SMS_173340695";
+    public static final String TEMPLATE_ID_CANCEL_F = "SMS_204277618";
     //租车（取车提醒）26
-    public static final String TEMPLATE_ID_PAY_I= "SMS_173345539";
+    public static final String TEMPLATE_ID_PAY_I= "SMS_204415136";
     //旅游（上车通知）27
-    public static final String TEMPLATE_ID_PAY_J= "SMS_173345606";
+    public static final String TEMPLATE_ID_PAY_J= "SMS_204287550";
 
     //旅游（上车通知）27
-    public static final String PWD= "SMS_174990497";
+    public static final String PWD= "SMS_204415140";