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

补充下单逻辑

Browse Source
This commit is contained in:
songmingsong
2024-12-06 14:49:42 +08:00
parent 6e343ab42e
commit fcfb46fed7
11 changed files with 120 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,11 @@
package com.ycwl.basic.service.impl.mobile;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.mapper.pc.ScenicMapper;
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.pc.order.resp.OrderItemVO;
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;
@ -96,7 +94,7 @@ public class GoodsServiceImpl implements GoodsService {
}
@Override
public ApiResponse queryPrice(GoodsPriceQueryReq queryPriceData) {
public ApiResponse<BigDecimal> queryPrice(GoodsPriceQueryReq queryPriceData) {
Integer goodsType = queryPriceData.getGoodsType();
if(goodsType==1){//成片vlog

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

@ -5,7 +5,12 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.constant.NumberConstant;
import com.ycwl.basic.enums.OrderStateEnum;
import com.ycwl.basic.enums.SourceTypeNameEnum;
import com.ycwl.basic.mapper.pc.OrderMapper;
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.pc.member.resp.MemberRespVO;
import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;
import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderItemDTO;
@ -13,14 +18,23 @@ import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO;
import com.ycwl.basic.model.pc.order.resp.OrderItemVO;
import com.ycwl.basic.model.pc.order.resp.OrderRespVO;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
import com.ycwl.basic.model.wx.WXPayOrderReqVO;
import com.ycwl.basic.model.wx.WxPayRespVO;
import com.ycwl.basic.service.mobile.AppMemberService;
import com.ycwl.basic.service.mobile.GoodsService;
import com.ycwl.basic.service.mobile.WxPayService;
import com.ycwl.basic.service.pc.OrderService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.BigDecimalUtil;
import com.ycwl.basic.utils.SnowFlakeUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -36,6 +50,17 @@ public class OrderServiceImpl implements OrderService {
@Autowired
private OrderMapper orderMapper;
@Autowired
private VideoMapper videoMapper;
@Autowired
private SourceMapper sourceMapper;
@Autowired
private WxPayService wxPayService;
@Autowired
private AppMemberService memberService;
@Autowired
private GoodsService goodsService;
@Override
public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
@ -57,7 +82,7 @@ public class OrderServiceImpl implements OrderService {
@Override
@Transactional(rollbackFor = Exception.class)
public ApiResponse<Integer> add(OrderAddOrUpdateReq order) {
public ApiResponse<WxPayRespVO> add(OrderAddOrUpdateReq order) throws Exception {
Long orderId = SnowFlakeUtil.getLongId();
order.setId(orderId);
int add = orderMapper.add(order);
@ -76,7 +101,30 @@ public class OrderServiceImpl implements OrderService {
log.error("订单明细添加失败");
return ApiResponse.fail("订单添加失败");
}
return ApiResponse.success(add);
/* 成片的时候子订单只会有一个，素材的时候 子订单多个且价格与子订单数量无关，只与子订单商品对应景区定义的价格相同*/
GoodsPriceQueryReq goodsPriceQueryReq = new GoodsPriceQueryReq();
Integer goodsType = order.getOrderItemList().get(NumberConstant.ZERO).getGoodsType();
Long goodsId = order.getOrderItemList().get(NumberConstant.ZERO).getGoodsId();
String goodsName = null;
if (goodsType == NumberConstant.ONE) {
VideoRespVO videoRespVO = videoMapper.getById(goodsId);
goodsName = videoRespVO.getTemplateName();
} else if (goodsType == NumberConstant.TWO) {
SourceRespVO sourceRespVO = sourceMapper.getById(goodsId);
goodsName= SourceTypeNameEnum.getRemark( sourceRespVO.getType());
}
BigDecimal price = goodsService.queryPrice(goodsPriceQueryReq.setGoodsId(goodsId)
.setGoodsType(goodsType)).getData();
MemberRespVO memberRespVO = memberService.getUserInfo().getData();
WXPayOrderReqVO wxPayOrderReqVO = new WXPayOrderReqVO();
wxPayOrderReqVO.setOpenId(memberRespVO.getOpenId())
.setOrderSn(orderId)
.setTotalPrice(BigDecimalUtil.convertToCents(price))
.setGoodsName(goodsName);
return ApiResponse.success(wxPayService.createOrder(wxPayOrderReqVO));
}
}

3
src/main/java/com/ycwl/basic/service/mobile/AppMemberService.java
View File

@ -49,4 +49,7 @@ public interface AppMemberService {
* @return
*/
ApiResponse<?> agreement();
}

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

@ -6,6 +6,7 @@ import com.ycwl.basic.model.mobile.goods.GoodsVO;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.utils.ApiResponse;
import java.math.BigDecimal;
import java.util.List;
/**
@ -33,5 +34,5 @@ public interface GoodsService {
* @param queryPriceData
* @return
*/
ApiResponse queryPrice(GoodsPriceQueryReq queryPriceData);
ApiResponse<BigDecimal> queryPrice(GoodsPriceQueryReq queryPriceData);
}

3
src/main/java/com/ycwl/basic/service/pc/OrderService.java
View File

@ -6,6 +6,7 @@ import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO;
import com.ycwl.basic.model.pc.order.resp.OrderRespVO;
import com.ycwl.basic.model.wx.WxPayRespVO;
import com.ycwl.basic.utils.ApiResponse;
import java.util.List;
@ -18,7 +19,7 @@ public interface OrderService {
ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query);
ApiResponse<List<OrderRespVO>> list(OrderReqQuery query);
ApiResponse<OrderRespVO> detail(Long orderId);
ApiResponse<Integer> add(OrderAddOrUpdateReq query);
ApiResponse<WxPayRespVO> add(OrderAddOrUpdateReq query) throws Exception;
ApiResponse<Integer> update(OrderAddOrUpdateReq query);