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

修改bug

Browse Source
This commit is contained in:
longbinbin 2024-12-11 14:35:42 +08:00
parent e0ee413f65
commit 18f7f8a943
8 changed files with 98 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java
View File

@ -1,12 +1,10 @@
package com.ycwl.basic.controller.mobile;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.annotation.IgnoreToken;
import com.ycwl.basic.constant.BaseContextHandler;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
import com.ycwl.basic.model.mobile.order.RefundOrderReq;
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.req.OrderAddReq;
import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO;
import com.ycwl.basic.model.wx.WxPayRespVO;
import com.ycwl.basic.service.pc.OrderService;
@ -44,7 +42,7 @@ public class AppOrderController {
@ApiOperation("用户端订单新增")
@PostMapping("/addOrder")
public ApiResponse<WxPayRespVO> addOrder(@RequestBody OrderAddOrUpdateReq orderAddReq) throws Exception {
public ApiResponse<WxPayRespVO> addOrder(@RequestBody OrderAddReq orderAddReq) throws Exception {
return orderService.add(orderAddReq);
}

7
src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java
View File

@ -2,7 +2,8 @@ package com.ycwl.basic.mapper.pc;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
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.OrderUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderAddReq;
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;
@ -19,9 +20,9 @@ import java.util.List;
public interface OrderMapper {
List<OrderRespVO> list(OrderReqQuery orderReqQuery);
OrderRespVO getById(Long id);
int add(OrderAddOrUpdateReq order);
int add(OrderAddReq order);
// int deleteById(Long id);
int update(OrderAddOrUpdateReq order);
int update(OrderUpdateReq order);
/**
* 添加订单明细

61
src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java Normal file
View File

@ -0,0 +1,61 @@
package com.ycwl.basic.model.pc.order.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
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
* @Date：2024/12/3 14:17
*/
@Data
@ApiModel("订单的新增或修改请求参数")
public class OrderAddReq {
@ApiModelProperty(value = "订单id",hidden = true)
private Long id;
@ApiModelProperty(value = "用户id",hidden = true)
private Long memberId;
/**
* 微信openId
*/
@ApiModelProperty(value = "微信openId", hidden = true)
private Long openId;
@ApiModelProperty("景区id")
private Long scenicId;
/**
* 价格
*/
@ApiModelProperty(value = "价格", hidden = true)
private BigDecimal price;
/**
* 实际支付价格
*/
@ApiModelProperty(value = "实际支付价格",hidden = true)
private BigDecimal payPrice;
/**
* 备注
*/
@ApiModelProperty("备注")
private String remark;
// /**
// * 推客id
// */
// @ApiModelProperty("推客id")
// private Long brokerId;
// /**
// * 推客优惠码
// */
// @ApiModelProperty("推客优惠码")
// private String promoCode;
@ApiModelProperty("订单商品类型 1成片，2源素材")
private Integer goodsType;
@ApiModelProperty("订单商品明细")
private List<GoodsDetailVO> goodsItemList;
}

13
src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddOrUpdateReq.java → src/main/java/com/ycwl/basic/model/pc/order/req/OrderUpdateReq.java
View File

@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.order.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;
import com.ycwl.basic.model.pc.order.resp.OrderItemVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -18,26 +16,27 @@ import java.util.List;
*/
@Data
@ApiModel("订单的新增或修改请求参数")
public class OrderAddOrUpdateReq {
public class OrderUpdateReq {
@ApiModelProperty(value = "订单id",hidden = true)
private Long id;
@ApiModelProperty("用户id")
@ApiModelProperty(value = "用户id",hidden = true)
private Long memberId;
/**
* 微信openId
*/
@ApiModelProperty("微信openId")
@ApiModelProperty(value = "微信openId", hidden = true)
private Long openId;
@ApiModelProperty("景区id")
private Long scenicId;
/**
* 价格
*/
@ApiModelProperty("价格")
@ApiModelProperty(value = "价格", hidden = true)
private BigDecimal price;
/**
* 实际支付价格
*/
@ApiModelProperty("实际支付价格")
@ApiModelProperty(value = "实际支付价格",hidden = true)
private BigDecimal payPrice;
/**
* 备注

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

@ -1,6 +1,5 @@
package com.ycwl.basic.service.impl.pc;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.constant.BaseContextHandler;
@ -21,17 +20,15 @@ import com.ycwl.basic.model.mobile.order.RefundOrderReq;
import com.ycwl.basic.model.pc.member.resp.MemberRespVO;
import com.ycwl.basic.model.pc.order.entity.OrderEntity;
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;
import com.ycwl.basic.model.pc.order.req.OrderUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderAddReq;
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.orderOp.entity.OrderOperationEntity;
import com.ycwl.basic.model.pc.source.entity.SourceEntity;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.model.pc.video.entity.VideoEntity;
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;
@ -96,7 +93,7 @@ public class OrderServiceImpl implements OrderService {
@Override
@Transactional(rollbackFor = Exception.class)
public ApiResponse<WxPayRespVO> add(OrderAddOrUpdateReq order) throws Exception {
public ApiResponse<WxPayRespVO> add(OrderAddReq order) throws Exception {
Long orderId = SnowFlakeUtil.getLongId();
order.setId(orderId);
int add = orderMapper.add(order);
@ -179,7 +176,7 @@ public class OrderServiceImpl implements OrderService {
}
@Override
public ApiResponse<Integer> update(OrderAddOrUpdateReq query) {
public ApiResponse<Integer> update(OrderUpdateReq query) {
int update = orderMapper.update(query);
if (update == NumberConstant.ZERO) {
return ApiResponse.fail("订单更新失败");
@ -194,22 +191,22 @@ public class OrderServiceImpl implements OrderService {
*/
@Override
public void updateOrderState(Long orderSn, OrderStateEnum orderStateEnum, String reason) {
OrderAddOrUpdateReq orderAddOrUpdateReq = new OrderAddOrUpdateReq();
orderAddOrUpdateReq.setId(orderSn);
OrderUpdateReq orderUpdateReq = new OrderUpdateReq();
orderUpdateReq.setId(orderSn);
if (orderStateEnum.getType() == NumberConstant.ONE) {
orderAddOrUpdateReq.setRefundStatus(orderStateEnum.getState());
orderAddOrUpdateReq.setRefundAt(new Date());
orderUpdateReq.setRefundStatus(orderStateEnum.getState());
orderUpdateReq.setRefundAt(new Date());
if (orderStateEnum.getState() == OrderStateEnum.PASSED.getState()) {
orderAddOrUpdateReq.setRemark(reason);
orderUpdateReq.setRemark(reason);
} else if (Objects.nonNull(reason)) {
orderAddOrUpdateReq.setRefundReason(reason);
orderUpdateReq.setRefundReason(reason);
}
} else if (orderStateEnum.getType() == NumberConstant.TWO) {
int state = orderStateEnum.getState();
orderAddOrUpdateReq.setPayAt(new Date());
orderAddOrUpdateReq.setStatus(orderStateEnum.getState());
orderUpdateReq.setPayAt(new Date());
orderUpdateReq.setStatus(orderStateEnum.getState());
if (state == OrderStateEnum.CANCELED.getState()) {
orderAddOrUpdateReq.setCancelAt(new Date());
orderUpdateReq.setCancelAt(new Date());
}
//如果订单未支付就把商品状态更改成未购买
if (state != OrderStateEnum.PAID.getState()) {
@ -250,7 +247,7 @@ public class OrderServiceImpl implements OrderService {
});
}
}
orderMapper.update(orderAddOrUpdateReq);
orderMapper.update(orderUpdateReq);
}
@Override
@ -312,7 +309,7 @@ public class OrderServiceImpl implements OrderService {
@Override
public void remarkOrder(Long orderId, OrderEntity query) {
OrderAddOrUpdateReq updateOrder = new OrderAddOrUpdateReq();
OrderUpdateReq updateOrder = new OrderUpdateReq();
updateOrder.setId(orderId);
updateOrder.setRemark(query.getRemark());
orderMapper.update(updateOrder);

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

@ -5,7 +5,8 @@ import com.ycwl.basic.enums.OrderStateEnum;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
import com.ycwl.basic.model.mobile.order.RefundOrderReq;
import com.ycwl.basic.model.pc.order.entity.OrderEntity;
import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderAddReq;
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;
@ -25,9 +26,9 @@ public interface OrderService {
ApiResponse<OrderRespVO> detail(Long orderId);
ApiResponse<WxPayRespVO> add(OrderAddOrUpdateReq query) throws Exception;
ApiResponse<WxPayRespVO> add(OrderAddReq query) throws Exception;
ApiResponse<Integer> update(OrderAddOrUpdateReq query);
ApiResponse<Integer> update(OrderUpdateReq query);
void updateOrderState(Long orderSn, OrderStateEnum orderStateEnum, String refundReason);

3
src/main/java/com/ycwl/basic/utils/JwtAnalysisUtil.java
View File

@ -74,7 +74,8 @@ public class JwtAnalysisUtil {
}
Long userId = null;
if (body.get("userId")!=null) {
userId= (Long) body.get("userId");
String strUserId = StringUtil.a(body.get("userId"));
userId= Long.parseLong(strUserId);
}
return new JwtInfo(StringUtil.a(body.get("name")),
userId,

7
src/main/resources/mapper/pc/ScenicMapper.xml
View File

@ -83,7 +83,7 @@
select s.id, `name`, `phone`, introduction, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time,
c.start_time, c.end_time,
(select scenic_account.account from scenic_account where scenic_account.scenic_id = s.id and scenic_account.is_super = 1 limit 1) as account,
c.is_default, c.create_time
c.is_default, c.create_time createTime2,s.price
from scenic s
left join scenic_config c on s.id = c.id
<where>
@ -112,7 +112,7 @@
</select>
<select id="getById" resultMap="scenicAndConfig">
select s.id, `name`, `phone`, introduction, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time,
c.start_time, c.end_time, c.is_default, c.create_time,s.price
c.start_time, c.end_time, c.is_default, c.create_time createTime2,s.price
from scenic s
left join scenic_config c on s.id = c.id
where s.id = #{id}
@ -186,6 +186,7 @@
<result property="area" column="area"/>
<result property="address" column="address"/>
<result property="status" column="status"/>
<result property="price" column="price"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<association property="scenicConfig" javaType="com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity">
@ -194,7 +195,7 @@
<result property="startTime" column="c.start_time"/>
<result property="endTime" column="c.end_time"/>
<result property="isDefault" column="c.is_default"/>
<result property="createTime" column="c.create_time"/>
<result property="createTime" column="createTime2"/>
</association>
</resultMap>
</mapper>