q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
longbinbin
2024-12-06 15:29:47 +08:00
parent be5811ea6e
commit 47c5f38ac8
5 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java
View File

@ -2,7 +2,7 @@ package com.ycwl.basic.controller.mobile;
import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq; import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;
import com.ycwl.basic.model.mobile.goods.GoodsReqQuery; import com.ycwl.basic.model.mobile.goods.GoodsReqQuery;
import com.ycwl.basic.model.mobile.goods.GoodsVO; import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO; import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.service.mobile.GoodsService; import com.ycwl.basic.service.mobile.GoodsService;
import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.ApiResponse;
@ -28,7 +28,7 @@ public class AppGoodsController {
@ApiOperation("商品列表") @ApiOperation("商品列表")
@PostMapping("/goodsList") @PostMapping("/goodsList")
public ApiResponse<List<GoodsVO>> goodsList(@RequestBody GoodsReqQuery query) { public ApiResponse<List<GoodsPageVO>> goodsList(@RequestBody GoodsReqQuery query) {
return goodsService.goodsList(query); return goodsService.goodsList(query);
} }

5
src/main/java/com/ycwl/basic/model/mobile/goods/GoodsVO.java → src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPageVO.java
View File

@ -1,13 +1,10 @@
package com.ycwl.basic.model.mobile.goods; package com.ycwl.basic.model.mobile.goods;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/** /**
* @Author：longbinbin * @Author：longbinbin
@ -15,7 +12,7 @@ import java.util.List;
*/ */
@Data @Data
@ApiModel("商品") @ApiModel("商品")
public class GoodsVO { public class GoodsPageVO {
@ApiModelProperty("商品名称") @ApiModelProperty("商品名称")
private String goodsName; private String goodsName;
@ApiModelProperty("景区id") @ApiModelProperty("景区id")

46
src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.ycwl.basic.mapper.pc.SourceMapper;
import com.ycwl.basic.mapper.pc.VideoMapper; import com.ycwl.basic.mapper.pc.VideoMapper;
import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq; import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;
import com.ycwl.basic.model.mobile.goods.GoodsReqQuery; import com.ycwl.basic.model.mobile.goods.GoodsReqQuery;
import com.ycwl.basic.model.mobile.goods.GoodsVO; import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO; import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.model.pc.source.req.SourceReqQuery; import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO; import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
@ -32,9 +32,9 @@ public class GoodsServiceImpl implements GoodsService {
@Autowired @Autowired
private ScenicMapper scenicMapper; private ScenicMapper scenicMapper;
public ApiResponse<List<GoodsVO>> goodsList(GoodsReqQuery query) { public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) {
//查询原素材 //查询原素材
List<GoodsVO> goodsList = new ArrayList<>(); List<GoodsPageVO> goodsList = new ArrayList<>();
VideoReqQuery videoReqQuery = new VideoReqQuery(); VideoReqQuery videoReqQuery = new VideoReqQuery();
videoReqQuery.setScenicId(query.getScenicId()); videoReqQuery.setScenicId(query.getScenicId());
@ -43,16 +43,16 @@ public class GoodsServiceImpl implements GoodsService {
//查询成片vlog //查询成片vlog
List<VideoRespVO> videoList = videoMapper.list(videoReqQuery); List<VideoRespVO> videoList = videoMapper.list(videoReqQuery);
videoList.forEach(videoRespVO -> { videoList.forEach(videoRespVO -> {
GoodsVO goodsVO = new GoodsVO(); GoodsPageVO goodsPageVO = new GoodsPageVO();
goodsVO.setGoodsName(videoRespVO.getTemplateName()); goodsPageVO.setGoodsName(videoRespVO.getTemplateName());
goodsVO.setScenicId(videoRespVO.getScenicId()); goodsPageVO.setScenicId(videoRespVO.getScenicId());
goodsVO.setScenicName(videoRespVO.getScenicName()); goodsPageVO.setScenicName(videoRespVO.getScenicName());
goodsVO.setLongitude(videoRespVO.getLongitude()); goodsPageVO.setLongitude(videoRespVO.getLongitude());
goodsVO.setLatitude(videoRespVO.getLatitude()); goodsPageVO.setLatitude(videoRespVO.getLatitude());
goodsVO.setGoodsType(1); goodsPageVO.setGoodsType(1);
goodsVO.setGoodsId(videoRespVO.getId()); goodsPageVO.setGoodsId(videoRespVO.getId());
goodsVO.setTemplateCoverUrl(videoRespVO.getTemplateCoverUrl()); goodsPageVO.setTemplateCoverUrl(videoRespVO.getTemplateCoverUrl());
goodsList.add(goodsVO); goodsList.add(goodsPageVO);
}); });
@ -63,20 +63,20 @@ public class GoodsServiceImpl implements GoodsService {
//查询源素材 //查询源素材
List<SourceRespVO> sourceList = sourceMapper.listGroupByType(sourceReqQuery); List<SourceRespVO> sourceList = sourceMapper.listGroupByType(sourceReqQuery);
sourceList.forEach(sourceRespVO -> { sourceList.forEach(sourceRespVO -> {
GoodsVO goodsVO = new GoodsVO(); GoodsPageVO goodsPageVO = new GoodsPageVO();
Integer type = sourceRespVO.getType(); Integer type = sourceRespVO.getType();
if(type==1){ if(type==1){
goodsVO.setGoodsName("原片集"); goodsPageVO.setGoodsName("原片集");
}else { }else {
goodsVO.setGoodsName("照片集"); goodsPageVO.setGoodsName("照片集");
} }
goodsVO.setScenicId(sourceRespVO.getScenicId()); goodsPageVO.setScenicId(sourceRespVO.getScenicId());
goodsVO.setScenicName(sourceRespVO.getScenicName()); goodsPageVO.setScenicName(sourceRespVO.getScenicName());
goodsVO.setLongitude(sourceRespVO.getLongitude()); goodsPageVO.setLongitude(sourceRespVO.getLongitude());
goodsVO.setLatitude(sourceRespVO.getLatitude()); goodsPageVO.setLatitude(sourceRespVO.getLatitude());
goodsVO.setGoodsType(2); goodsPageVO.setGoodsType(2);
goodsVO.setSourceType(type); goodsPageVO.setSourceType(type);
goodsList.add(goodsVO); goodsList.add(goodsPageVO);
}); });
return ApiResponse.success(goodsList); return ApiResponse.success(goodsList);

13
src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
View File

@ -95,6 +95,7 @@ public class OrderServiceImpl implements OrderService {
OrderItemEntity orderItemEntity = new OrderItemEntity(); OrderItemEntity orderItemEntity = new OrderItemEntity();
BeanUtil.copyProperties(orderItemDTO, orderItemEntity); BeanUtil.copyProperties(orderItemDTO, orderItemEntity);
orderItemEntity.setOrderId(orderId); orderItemEntity.setOrderId(orderId);
orderItems.add(orderItemEntity);
}); });
int addOrderItems = orderMapper.addOrderItems(orderItems); int addOrderItems = orderMapper.addOrderItems(orderItems);
if (addOrderItems == NumberConstant.ZERO) { if (addOrderItems == NumberConstant.ZERO) {
@ -102,8 +103,7 @@ public class OrderServiceImpl implements OrderService {
return ApiResponse.fail("订单添加失败"); return ApiResponse.fail("订单添加失败");
} }
/* 成片的时候子订单只会有一个，素材的时候 子订单多个且价格与子订单数量无关，只与子订单商品对应景区定义的价格相同*/
GoodsPriceQueryReq goodsPriceQueryReq = new GoodsPriceQueryReq();
Integer goodsType = order.getOrderItemList().get(NumberConstant.ZERO).getGoodsType(); Integer goodsType = order.getOrderItemList().get(NumberConstant.ZERO).getGoodsType();
Long goodsId = order.getOrderItemList().get(NumberConstant.ZERO).getGoodsId(); Long goodsId = order.getOrderItemList().get(NumberConstant.ZERO).getGoodsId();
@ -115,8 +115,13 @@ public class OrderServiceImpl implements OrderService {
SourceRespVO sourceRespVO = sourceMapper.getById(goodsId); SourceRespVO sourceRespVO = sourceMapper.getById(goodsId);
goodsName= SourceTypeNameEnum.getRemark( sourceRespVO.getType()); goodsName= SourceTypeNameEnum.getRemark( sourceRespVO.getType());
} }
BigDecimal price = goodsService.queryPrice(goodsPriceQueryReq.setGoodsId(goodsId)
.setGoodsType(goodsType)).getData(); /* 成片的时候子订单只会有一个，素材的时候 子订单多个且价格与子订单数量无关，只与子订单商品对应景区定义的价格相同*/
GoodsPriceQueryReq goodsPriceQueryReq = new GoodsPriceQueryReq();
goodsPriceQueryReq.setGoodsId(goodsId);
goodsPriceQueryReq.setGoodsType(goodsType);
// goodsPriceQueryReq.setScenicId(order.get)
BigDecimal price = goodsService.queryPrice(goodsPriceQueryReq).getData();
MemberRespVO memberRespVO = memberService.getUserInfo().getData(); MemberRespVO memberRespVO = memberService.getUserInfo().getData();
WXPayOrderReqVO wxPayOrderReqVO = new WXPayOrderReqVO(); WXPayOrderReqVO wxPayOrderReqVO = new WXPayOrderReqVO();

4
src/main/java/com/ycwl/basic/service/mobile/GoodsService.java
View File

@ -2,7 +2,7 @@ package com.ycwl.basic.service.mobile;
import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq; import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;
import com.ycwl.basic.model.mobile.goods.GoodsReqQuery; import com.ycwl.basic.model.mobile.goods.GoodsReqQuery;
import com.ycwl.basic.model.mobile.goods.GoodsVO; import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO; import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.ApiResponse;
@ -20,7 +20,7 @@ public interface GoodsService {
* @param query 查询条件 * @param query 查询条件
* @return * @return
*/ */
ApiResponse<List<GoodsVO>> goodsList(GoodsReqQuery query); ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query);
/** /**
* 查询源素材商品列表 * 查询源素材商品列表