From 7915bccb915fad88e885d54832b120cf2d36a036 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 18:26:56 +0800
Subject: [PATCH] 代码提交
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 23 ++++++-
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTDataDetailRequest.java | 15 +++++
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 3
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java | 14 ++--
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 14 +++-
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 25 ++++---
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 14 +++-
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 26 ++++----
8 files changed, 91 insertions(+), 43 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
index 91d82ef..5cec664 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -36,5 +36,6 @@
ZSZXCatalogResponse getZSZXCatalogs();
ZTBasePageResponse<ZTCusFavoritesInfoResponse> pageCusFavoriteList(ZTContentListRequest param);
- ZTBasePageResponse<ZTCusCarouselImageResponse> carouselImageList(ZTContentListRequest param);
+ List<ZTCusCarouselImageResponse> carouselImageList(ZTContentListRequest param);
+ ZTCusCarouselImageResponse carouselImageDetail(ZTDataDetailRequest param);
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTDataDetailRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTDataDetailRequest.java
new file mode 100644
index 0000000..a1c4639
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTDataDetailRequest.java
@@ -0,0 +1,15 @@
+package com.doumee.biz.zbom.model.zhongtai;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class ZTDataDetailRequest extends ZTBaseRequst {
+
+ @ApiModelProperty(value = "涓氬姟鏁版嵁涓婚敭")
+ private String id;
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java
index f49887e..aaf5bef 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java
@@ -33,25 +33,25 @@
@ApiModelProperty(value = "鍙戝竷缁勭粐")
private String publishDepartment;
- @ApiModelProperty(value = "openType")
+ @ApiModelProperty(value = "鍐呭鎵撳紑鏂瑰紡(鍐呴儴椤甸潰page銆佽棰憊ideo銆佸瘜鏂囨湰text銆佸閮ㄩ摼鎺ink)\n")
private String openType;
- @ApiModelProperty(value = "pageUrl")
+ @ApiModelProperty(value = "鍐呴儴椤甸潰鍦板潃")
private String pageUrl;
- @ApiModelProperty(value = "videoUrl")
+ @ApiModelProperty(value = "瑙嗛閾炬帴")
private String videoUrl;
- @ApiModelProperty(value = "content")
+ @ApiModelProperty(value = "瀵屾枃鏈唴瀹�")
private String content;
- @ApiModelProperty(value = "linkUrl")
+ @ApiModelProperty(value = "澶栭儴閾炬帴")
private String linkUrl;
- @ApiModelProperty(value = "coverImage")
+ @ApiModelProperty(value = "灏侀潰鍥剧墖")
private String coverImage;
- @ApiModelProperty(value = "infoProTypeName")
+ @ApiModelProperty(value = "鍏宠仈浜у搧绫诲瀷鍚嶇О")
private String infoProTypeName;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
index 8961c99..ba71000 100644
--- a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
+++ b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
@@ -1,9 +1,6 @@
package com.doumee.service.business;
-import com.doumee.biz.zbom.model.zhongtai.ZTAreaListRequest;
-import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
-import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
-import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.*;
import com.doumee.biz.zbom.model.zhongtai.response.*;
import java.util.List;
@@ -110,5 +107,12 @@
* @param ztContentListRequest
* @return
*/
- ZTBasePageResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImage(ZTContentListRequest ztContentListRequest);
+ List<ZTCusCarouselImageResponse> getZhongTaiCarouselImage(ZTContentListRequest ztContentListRequest);
+
+ /**
+ * C绔� 杞挱鍥捐鎯�
+ * @param ztDataDetailRequest
+ * @return
+ */
+ ZTCusCarouselImageResponse getZhongTaiCarouselImageDetail(ZTDataDetailRequest ztDataDetailRequest);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 53abd83..1de097f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -311,14 +311,22 @@
}
@Override
- public ZTBasePageResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImage(ZTContentListRequest ztContentListRequest){
+ public List<ZTCusCarouselImageResponse> getZhongTaiCarouselImage(ZTContentListRequest ztContentListRequest){
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
ztContentListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
- ZTBasePageResponse ztAreaTreeResponses = zbomZhongTaiService.carouselImageList(ztContentListRequest);
- return ztAreaTreeResponses;
+ List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = zbomZhongTaiService.carouselImageList(ztContentListRequest);
+ return ztCusCarouselImageResponseList;
}
+ @Override
+ public ZTCusCarouselImageResponse getZhongTaiCarouselImageDetail(ZTDataDetailRequest ztDataDetailRequest){
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztDataDetailRequest.getUserId()),ztDataDetailRequest.getUserType());
+ ztDataDetailRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztDataDetailRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTCusCarouselImageResponse ztCusCarouselImageResponse = zbomZhongTaiService.carouselImageDetail(ztDataDetailRequest);
+ return ztCusCarouselImageResponse;
+ }
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 508af68..4d3cbf2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -277,14 +277,14 @@
@Override
public AccountResponse wxLogin(String code){
-// try {
- //鑾峰彇寰俊鏁忔劅鏁版嵁
-// WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
-// String openId = session.getOpenid();
-// if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
-// }
- String openId = code;
+ try {
+// 鑾峰彇寰俊鏁忔劅鏁版嵁
+ WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
+ String openId = session.getOpenid();
+ if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
+ }
+// String openId = code;
Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
if (member == null) {
member = new Member();
@@ -316,13 +316,13 @@
String token = JwtTokenUtil.generateToken(payLoad);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
-// accountResponse.setSessionKey(session.getSessionKey());
+ accountResponse.setSessionKey(session.getSessionKey());
accountResponse.setMember(member);
return accountResponse;
-// } catch (WxErrorException e) {
-// e.printStackTrace();
-// }
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+ } catch (WxErrorException e) {
+ e.printStackTrace();
+ }
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
@Override
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index a7813f5..2c79efd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -897,20 +897,23 @@
@Override
public PageData<Shop> queryShopByLL(PageWrap<Shop> pageWrap) {
- if(Objects.isNull(pageWrap.getModel())
- || Objects.isNull(pageWrap.getModel().getLatitude())
- || Objects.isNull(pageWrap.getModel().getLongitude())){
- return null;
- }
+// if(Objects.isNull(pageWrap.getModel())
+// || Objects.isNull(pageWrap.getModel().getLatitude())
+// || Objects.isNull(pageWrap.getModel().getLongitude())){
+// return null;
+// }
IPage<Shop> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Shop> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE," +
- " CONVERT (ST_Distance_Sphere (point ("+pageWrap.getModel().getLongitude()+", "+pageWrap.getModel().getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ")
+// queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE" +
+// " ,CONVERT (ST_Distance_Sphere (point ("+pageWrap.getModel().getLongitude()+", "+pageWrap.getModel().getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ")
+ queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE ")
.eq("isdeleted",Constants.ZERO)
- .isNotNull("LATITUDE")
- .isNotNull("LONGITUDE")
- .eq("ATTRIBUTE",Constants.ONE)
- .orderByAsc(" distance ");
+// .isNotNull("LATITUDE")
+// .isNotNull("LONGITUDE")
+ .eq("TYPE",Constants.TWO)
+ .eq("SECOND_TYPE",Constants.THREE)
+ .eq("STATUS",Constants.ONE);
+// .orderByAsc(" distance ")
Utils.MP.blankToNull(pageWrap.getModel());
PageData<Shop> pageData = PageData.from(shopMapper.selectPage(page, queryWrapper));
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index 9649463..cf30f0d 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -4,6 +4,7 @@
import com.doumee.biz.zbom.ZbomCRMService;
import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.ZTDataDetailRequest;
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
@@ -457,11 +458,27 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<ZTBasePageResponse<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ public ApiResponse<List<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
ztContentListRequest.setUserType(Constants.CUSTOMER);
- ZTBasePageResponse<ZTCusCarouselImageResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
- return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
+ List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
+ return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponseList);
}
+
+
+ @LoginRequired
+ @ApiOperation(value = "杞挱鍥捐鎯�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiCarouselImageDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImageDetail(@RequestBody ZTDataDetailRequest ztDataDetailRequest) {
+ ztDataDetailRequest.setUserId(getMemberId()+"");
+ ztDataDetailRequest.setUserType(Constants.CUSTOMER);
+ ZTCusCarouselImageResponse ztCusCarouselImageResponse = getZhongTaiDataService.getZhongTaiCarouselImageDetail(ztDataDetailRequest);
+ return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponse);
+ }
+
+
}
--
Gitblit v1.9.3