diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java index c13d206..52938df 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java @@ -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.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.service.mobile.GoodsService; import com.ycwl.basic.utils.ApiResponse; @@ -28,7 +28,7 @@ public class AppGoodsController { @ApiOperation("商品列表") @PostMapping("/goodsList") - public ApiResponse> goodsList(@RequestBody GoodsReqQuery query) { + public ApiResponse> goodsList(@RequestBody GoodsReqQuery query) { return goodsService.goodsList(query); } diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsVO.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPageVO.java similarity index 88% rename from src/main/java/com/ycwl/basic/model/mobile/goods/GoodsVO.java rename to src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPageVO.java index 78128b8..ade6d5c 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPageVO.java @@ -1,13 +1,10 @@ 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.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; -import java.util.List; /** * @Author：longbinbin @@ -15,7 +12,7 @@ import java.util.List; */ @Data @ApiModel("商品") -public class GoodsVO { +public class GoodsPageVO { @ApiModelProperty("商品名称") private String goodsName; @ApiModelProperty("景区id") diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java index 400ceb9..52d2cc4 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java @@ -5,7 +5,7 @@ import com.ycwl.basic.mapper.pc.SourceMapper; import com.ycwl.basic.mapper.pc.VideoMapper; import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq; 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.source.req.SourceReqQuery; import com.ycwl.basic.model.pc.source.resp.SourceRespVO; @@ -32,9 +32,9 @@ public class GoodsServiceImpl implements GoodsService { @Autowired private ScenicMapper scenicMapper; - public ApiResponse> goodsList(GoodsReqQuery query) { + public ApiResponse> goodsList(GoodsReqQuery query) { //查询原素材 - List goodsList = new ArrayList<>(); + List goodsList = new ArrayList<>(); VideoReqQuery videoReqQuery = new VideoReqQuery(); videoReqQuery.setScenicId(query.getScenicId()); @@ -43,16 +43,16 @@ public class GoodsServiceImpl implements GoodsService { //查询成片vlog List videoList = videoMapper.list(videoReqQuery); videoList.forEach(videoRespVO -> { - GoodsVO goodsVO = new GoodsVO(); - goodsVO.setGoodsName(videoRespVO.getTemplateName()); - goodsVO.setScenicId(videoRespVO.getScenicId()); - goodsVO.setScenicName(videoRespVO.getScenicName()); - goodsVO.setLongitude(videoRespVO.getLongitude()); - goodsVO.setLatitude(videoRespVO.getLatitude()); - goodsVO.setGoodsType(1); - goodsVO.setGoodsId(videoRespVO.getId()); - goodsVO.setTemplateCoverUrl(videoRespVO.getTemplateCoverUrl()); - goodsList.add(goodsVO); + GoodsPageVO goodsPageVO = new GoodsPageVO(); + goodsPageVO.setGoodsName(videoRespVO.getTemplateName()); + goodsPageVO.setScenicId(videoRespVO.getScenicId()); + goodsPageVO.setScenicName(videoRespVO.getScenicName()); + goodsPageVO.setLongitude(videoRespVO.getLongitude()); + goodsPageVO.setLatitude(videoRespVO.getLatitude()); + goodsPageVO.setGoodsType(1); + goodsPageVO.setGoodsId(videoRespVO.getId()); + goodsPageVO.setTemplateCoverUrl(videoRespVO.getTemplateCoverUrl()); + goodsList.add(goodsPageVO); }); @@ -63,20 +63,20 @@ public class GoodsServiceImpl implements GoodsService { //查询源素材 List sourceList = sourceMapper.listGroupByType(sourceReqQuery); sourceList.forEach(sourceRespVO -> { - GoodsVO goodsVO = new GoodsVO(); + GoodsPageVO goodsPageVO = new GoodsPageVO(); Integer type = sourceRespVO.getType(); if(type==1){ - goodsVO.setGoodsName("原片集"); + goodsPageVO.setGoodsName("原片集"); }else { - goodsVO.setGoodsName("照片集"); + goodsPageVO.setGoodsName("照片集"); } - goodsVO.setScenicId(sourceRespVO.getScenicId()); - goodsVO.setScenicName(sourceRespVO.getScenicName()); - goodsVO.setLongitude(sourceRespVO.getLongitude()); - goodsVO.setLatitude(sourceRespVO.getLatitude()); - goodsVO.setGoodsType(2); - goodsVO.setSourceType(type); - goodsList.add(goodsVO); + goodsPageVO.setScenicId(sourceRespVO.getScenicId()); + goodsPageVO.setScenicName(sourceRespVO.getScenicName()); + goodsPageVO.setLongitude(sourceRespVO.getLongitude()); + goodsPageVO.setLatitude(sourceRespVO.getLatitude()); + goodsPageVO.setGoodsType(2); + goodsPageVO.setSourceType(type); + goodsList.add(goodsPageVO); }); return ApiResponse.success(goodsList); diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java index 5cad6e0..7cef9b6 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java @@ -95,6 +95,7 @@ public class OrderServiceImpl implements OrderService { OrderItemEntity orderItemEntity = new OrderItemEntity(); BeanUtil.copyProperties(orderItemDTO, orderItemEntity); orderItemEntity.setOrderId(orderId); + orderItems.add(orderItemEntity); }); int addOrderItems = orderMapper.addOrderItems(orderItems); if (addOrderItems == NumberConstant.ZERO) { @@ -102,8 +103,7 @@ public class OrderServiceImpl implements OrderService { return ApiResponse.fail("订单添加失败"); } - /* 成片的时候子订单只会有一个，素材的时候 子订单多个且价格与子订单数量无关，只与子订单商品对应景区定义的价格相同*/ - GoodsPriceQueryReq goodsPriceQueryReq = new GoodsPriceQueryReq(); + Integer goodsType = order.getOrderItemList().get(NumberConstant.ZERO).getGoodsType(); Long goodsId = order.getOrderItemList().get(NumberConstant.ZERO).getGoodsId(); @@ -115,8 +115,13 @@ public class OrderServiceImpl implements OrderService { SourceRespVO sourceRespVO = sourceMapper.getById(goodsId); 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(); WXPayOrderReqVO wxPayOrderReqVO = new WXPayOrderReqVO(); diff --git a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java index 62469d0..f7840d8 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java @@ -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.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.utils.ApiResponse; @@ -20,7 +20,7 @@ public interface GoodsService { * @param query 查询条件 * @return */ - ApiResponse> goodsList(GoodsReqQuery query); + ApiResponse> goodsList(GoodsReqQuery query); /** * 查询源素材商品列表