Skip to content

C
cloud-platform
Commit 7b1be07e authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'master-tiande' into dev-tiande

parents f801100d a9492a4c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 530 additions and 474 deletions
ace-common/src/main/resources/properties/systemconfig.properties
View file @ 7b1be07e
...@@ -17,10 +17,10 @@ USER_HEADER_URL_DEFAULT=https://xxtest.upyuns.com/image/app/default_%20avatar.pn ...@@ -17,10 +17,10 @@ USER_HEADER_URL_DEFAULT=https://xxtest.upyuns.com/image/app/default_%20avatar.pn
#\u9ED8\u8BA4\u6635\u79F0 #\u9ED8\u8BA4\u6635\u79F0
USER_NIKENAME_DEFAULT=XX_ USER_NIKENAME_DEFAULT=XX_
#\u77ED\u4FE1\u673A #\u77ED\u4FE1\u673A
ACCESSKEYID=LTAInxMDwHQL8yg9 ACCESSKEYID=LTAI4GFsh2SYSzJs9PxB8dhm
ACCESSKEYSECRET=OCKDEiwKGjePCZgPeWMEUFGwGbKYLA ACCESSKEYSECRET=oUb9cma3vbf359N1un5yVKiZ0buulE
TEMPLATECODE=SMS_170070101 TEMPLATECODE=SMS_204210538
SIGNNAME=\u6EF4\u623F\u8F66 SIGNNAME=亦家房车
#\u5FAE\u4FE1\u652F\u4ED8\u914D\u7F6E #\u5FAE\u4FE1\u652F\u4ED8\u914D\u7F6E
WINXIN_AppID=wx425608b69a34736f WINXIN_AppID=wx425608b69a34736f
WINXIN_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533 WINXIN_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533
......
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopPageVo.java
View file @ 7b1be07e
package com.xxfc.platform.campsite.vo; package com.xxfc.platform.campsite.vo;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.xxfc.platform.campsite.dto.CampsiteShopTagDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -9,6 +10,7 @@ import lombok.Data; ...@@ -9,6 +10,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
...@@ -111,4 +113,7 @@ public class CampsiteShopPageVo implements Serializable { ...@@ -111,4 +113,7 @@ public class CampsiteShopPageVo implements Serializable {
@ApiModelProperty("seo*html标签优化") @ApiModelProperty("seo*html标签优化")
private String imgDesc; private String imgDesc;
@ApiModelProperty("标签列表")
private List<CampsiteShopTagDTO>list;
} }
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java
View file @ 7b1be07e
...@@ -100,6 +100,12 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> { ...@@ -100,6 +100,12 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
}*/ }*/
PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = findCampsiteShopPageByTypeAndName(campsiteShopFindDTO); PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = findCampsiteShopPageByTypeAndName(campsiteShopFindDTO);
/* campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key,JSONObject.toJSONString(campsiteShopPageDataVO));*/ /* 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; return campsiteShopPageDataVO;
} }
...@@ -196,7 +202,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> { ...@@ -196,7 +202,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
campsiteShopDetailVo.setHasCollection(false); campsiteShopDetailVo.setHasCollection(false);
} }
//
/* campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));*/ /* campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));*/
return campsiteShopDetailVo; return campsiteShopDetailVo;
......
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourTag.java
View file @ 7b1be07e
package com.xxfc.platform.tour.entity; package com.xxfc.platform.tour.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.*; import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* 旅游路线标签 * 旅游路线标签
* *
* @author zjw * @author zjw
* @email nishijjo@qq.com * @email nishijjo@qq.com
* @date 2019-06-06 11:41:51 * @date 2019-06-06 11:41:51
*/ */
@Data @Data
@Table(name = "tour_tag") @Table(name = "tour_tag")
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class TourTag implements Serializable { public class TourTag implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 主键id * 主键id
*/ */
@Id @Id
@GeneratedValue(generator = "JDBC") @GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键id") @ApiModelProperty("主键id")
private Integer id; private Integer id;
/** /**
* 名称 * 名称
*/ */
@Column(name = "name") @Column(name = "name")
@ApiModelProperty(value = "名称") @ApiModelProperty(value = "名称")
private String name; private String name;
/** /**
* 图片 * 图片
*/ */
@Column(name = "img") @Column(name = "img")
@ApiModelProperty(value = "图片") @ApiModelProperty(value = "图片")
private String img; private String img;
/** /**
* 描述 * 描述
*/ */
@Column(name = "describe") @Column(name = "describe")
@ApiModelProperty(value = "描述") @ApiModelProperty(value = "描述")
private String describe; private String describe;
/** /**
* 链接 * 链接
*/ */
@Column(name = "link") @Column(name = "link")
@ApiModelProperty(value = "链接") @ApiModelProperty(value = "链接")
private String link; private String link;
/** /**
* 是否热门：0-否；1-是 * 是否热门：0-否；1-是
*/ */
@Column(name = "is_hot") @Column(name = "is_hot")
@ApiModelProperty(value = "是否热门：0-否；1-是") @ApiModelProperty(value = "是否热门：0-否；1-是")
private Integer isHot; private Integer isHot;
/** /**
* 成单量 * 成单量
*/ */
@Column(name = "count") @Column(name = "count")
@ApiModelProperty(value = "成单量") @ApiModelProperty(value = "成单量")
private Integer count; private Integer count;
/** /**
* 排序 * 排序
*/ */
@Column(name = "rank") @Column(name = "rank")
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private Integer rank; private Integer rank;
/** /**
* 创建时间 * 创建时间
*/ */
@Column(name = "ctr_time") @Column(name = "ctr_time")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Long ctrTime; private Long ctrTime;
/** /**
* 更新时间 * 更新时间
*/ */
@Column(name = "upd_time") @Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true ) @ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime; private Long updTime;
/** /**
* 是否删除:0-正常；1-删除 * 是否删除:0-正常；1-删除
*/ */
@Column(name = "is_del") @Column(name = "is_del")
@ApiModelProperty(value = "是否删除:0-正常；1-删除") @ApiModelProperty(value = "是否删除:0-正常；1-删除")
private Integer isDel; private Integer isDel;
}
@Transient
private List<TourGood> list;
}
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourTagController.java
View file @ 7b1be07e
package com.xxfc.platform.tour.rest; package com.xxfc.platform.tour.rest;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO; import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController; import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageParam; import com.github.wxiaoqi.security.common.vo.PageParam;
import com.xxfc.platform.tour.biz.TourTagBiz; import com.xxfc.platform.tour.biz.TourTagBiz;
import com.xxfc.platform.tour.entity.TourTag; import com.xxfc.platform.tour.entity.TourTag;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.Data; import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@RestController @RestController
@RequestMapping("tourTag") @RequestMapping("tourTag")
public class TourTagController extends BaseController<TourTagBiz,TourTag> { public class TourTagController extends BaseController<TourTagBiz,TourTag> {
@Autowired @Autowired
private TourTagBiz tagBiz; private TourTagBiz tagBiz;
@GetMapping("/app/unauth/getTagList") @GetMapping("/app/unauth/getTagList")
public ObjectRestResponse getTagList(pageDTO dto){ public ObjectRestResponse getTagList(pageDTO dto){
if (dto==null) { if (dto==null) {
return ObjectRestResponse.createDefaultFail(); return ObjectRestResponse.createDefaultFail();
} }
Integer hot = dto.getHot(); Integer hot = dto.getHot();
if (hot==1){ if (hot==1){
List<TourTag> hotTag = tagBiz.getHotTag(); List<TourTag> hotTag = tagBiz.getHotTag();
return ObjectRestResponse.succ(hotTag); return ObjectRestResponse.succ(hotTag);
} }
PageDataVO<TourTag> all = tagBiz.findPage(BeanUtil.beanToMap(dto)); PageDataVO<TourTag> all = tagBiz.findPage(BeanUtil.beanToMap(dto));
return ObjectRestResponse.succ(all); return ObjectRestResponse.succ(all);
} }
/**
@Override * 标签带两条线路
@ApiOperation("修改") * @param dto
@RequestMapping(value = "/{id}",method = RequestMethod.PUT) * @return
public ObjectRestResponse<TourTag> update(@RequestBody TourTag tag){ */
tagBiz.update(tag); @GetMapping("/app/unauth/getTagListAndGoods")
return new ObjectRestResponse<TourTag>(); public ObjectRestResponse getTagListAndGoods(pageDTO dto){
}
if (dto==null) {
return ObjectRestResponse.createDefaultFail();
}
@Override
@ApiOperation("删除") Integer hot = dto.getHot();
@RequestMapping(value = "/{id}",method = RequestMethod.DELETE)
public ObjectRestResponse<TourTag> remove(@PathVariable int id){ if (hot==1){
tagBiz.remove(id); List<TourTag> hotTag = tagBiz.getHotTagAndGoods();
return new ObjectRestResponse<TourTag>(); return ObjectRestResponse.succ(hotTag);
} }
PageDataVO<TourTag> all = tagBiz.findPage(BeanUtil.beanToMap(dto));
@Data return ObjectRestResponse.succ(all);
public class pageDTO extends PageParam {
@ApiModelProperty("是否热门") }
Integer hot;
} @Override
@ApiOperation("修改")
@RequestMapping(value = "/{id}",method = RequestMethod.PUT)
@GetMapping("/token") public ObjectRestResponse<TourTag> update(@RequestBody TourTag tag){
public ObjectRestResponse apptoken(AppUserDTO appUserDTO){ tagBiz.update(tag);
return new ObjectRestResponse<TourTag>();
return ObjectRestResponse.succ(appUserDTO); }
}
@Override
@ApiOperation("删除")
@RequestMapping(value = "/{id}",method = RequestMethod.DELETE)
public ObjectRestResponse<TourTag> remove(@PathVariable int id){
tagBiz.remove(id);
return new ObjectRestResponse<TourTag>();
}
@Data
public class pageDTO extends PageParam {
@ApiModelProperty("是否热门")
Integer hot;
}
@GetMapping("/token")
public ObjectRestResponse apptoken(AppUserDTO appUserDTO){
return ObjectRestResponse.succ(appUserDTO);
}
} }
\ No newline at end of file
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/AliYunSmsBiz.java
View file @ 7b1be07e
...@@ -11,15 +11,15 @@ import org.springframework.stereotype.Service; ...@@ -11,15 +11,15 @@ import org.springframework.stereotype.Service;
public class AliYunSmsBiz { public class AliYunSmsBiz {
//租车订单通知(普通用户)1 //租车订单通知(普通用户)1
public static final String TEMPLATE_ID_ORDER = "SMS_173247815"; public static final String TEMPLATE_ID_ORDER = "SMS_204415111";
//租车订单短信(会员权益)2 //租车订单短信(会员权益)2
public static final String TEMPLATE_ID_ORDER_MEMBER = "SMS_173252767"; public static final String TEMPLATE_ID_ORDER_MEMBER = "SMS_204415113";
//旅游订单短信3 //旅游订单短信3
public static final String TEMPLATE_ID_ORDER_TOUR = "SMS_173247826"; public static final String TEMPLATE_ID_ORDER_TOUR = "SMS_204415115";
//加入会员通知4 //加入会员通知4
public static final String TEMPLATE_ID_MEMBER = "SMS_173247829"; public static final String TEMPLATE_ID_MEMBER = "SMS_204297476";
//租/还车公司相同（订单支付后立即发送给相关负责人）5 //租/还车公司相同（订单支付后立即发送给相关负责人）5
public static final String TEMPLATE_ID_TAAKE_CAR = "SMS_173247836"; public static final String TEMPLATE_ID_TAAKE_CAR = "SMS_204287516";
//租/还车公司不同（发给租车公司负责人，订单支付后发送）6 //租/还车公司不同（发给租车公司负责人，订单支付后发送）6
public static final String TEMPLATE_ID_DIFFERENT_TAAKE_CAR = "458621"; public static final String TEMPLATE_ID_DIFFERENT_TAAKE_CAR = "458621";
// 租/还车公司不同（发给还车公司负责人，订单出车后发））(相同不发)7 // 租/还车公司不同（发给还车公司负责人，订单出车后发））(相同不发)7
...@@ -30,60 +30,60 @@ public class AliYunSmsBiz { ...@@ -30,60 +30,60 @@ public class AliYunSmsBiz {
//租车（通用）10 //租车（通用）10
//public static final String TEMPLATE_ID_PAY_A = "460759"; //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 //租车（使用会员权益）11
//public static final String TEMPLATE_ID_PAY_B = "460760"; //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 //租车内部通知（客服）12
//public static final String TEMPLATE_ID_PAY_C = "460763"; //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 //租车内部通知（出车人）13
//public static final String TEMPLATE_ID_PAY_D = "460762"; //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 //租车内部通知（收车人）14
//public static final String TEMPLATE_ID_PAY_E = "460764"; //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 //旅游（通用）15
//public static final String TEMPLATE_ID_PAY_F = "460765"; //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 //会员购买（通用）16
//public static final String TEMPLATE_ID_PAY_G = "460766"; //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 //取消租车（通用）17
//public static final String TEMPLATE_ID_CANCEL_A= "460767"; //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 //取消租车（使用会员权益）18
//public static final String TEMPLATE_ID_CANCEL_B = "460768"; //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 //取消租车（通用扣违约金）19
//public static final String TEMPLATE_ID_CANCEL_C = "460769"; //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 //取消租车（会员权益&扣违 20
//public static final String TEMPLATE_ID_CANCEL_D = "460770"; //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 //取消租车（出车人）21
//public static final String TEMPLATE_ID_CANCEL_E = "460771"; //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 //租车押金退还 22
//public static final String TEMPLATE_ID_FINISH_A = "460772"; //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 //违章押金退还 23
//public static final String TEMPLATE_ID_FINISH_B = "460773"; //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 //旅游内部通知（客服）24
//public static final String TEMPLATE_ID_PAY_H = "461421"; //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 //取消旅游订单（客服）25
//public static final String TEMPLATE_ID_CANCEL_F = "461424"; //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 //租车（取车提醒）26
public static final String TEMPLATE_ID_PAY_I= "SMS_173345539"; public static final String TEMPLATE_ID_PAY_I= "SMS_204415136";
//旅游（上车通知）27 //旅游（上车通知）27
public static final String TEMPLATE_ID_PAY_J= "SMS_173345606"; public static final String TEMPLATE_ID_PAY_J= "SMS_204287550";
//旅游（上车通知）27 //旅游（上车通知）27
public static final String PWD= "SMS_174990497"; public static final String PWD= "SMS_204415140";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment