czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

下单用户非必填

Browse Source
This commit is contained in:
wangw
2025-02-24 18:28:25 +08:00
parent 6f35f159d9
commit 46742bbf45
11 changed files with 150 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java
View File

@@ -30,12 +30,18 @@ public class OrderInfoRefundDTO implements Serializable {
/**
* 退单总金额
* 支付后的 退款金额 (累计总金额 不可超过 （支付金额pay_amount - 已退金额refund_amount）)
* <p>
* 部分商品退款为 退单数量*单价* 订单的discount_ratio 向下取整 该全退时 为该条详情总金额 * 订单的discount_ratio 向下取整
* 整单退款 为支付金额pay_amount
* <p>
* 支付前退款为 退菜 金额为 单价*数量 如果有部分打包 优先退非打包 (退打包时 记得计算打包费)
*/
@NotNull(message = "退单金额不能为空")
private BigDecimal refundAmount;
/**
* 退款金额 默认为 退单数量*单价 的和
* 退款金额 默认为 退单数量*单价* 订单 discount_ratio
* 整单退款 为订单orderAmount
* 如果自定义退款金额 则金额不进行校验 直接退款
*/

16
cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
View File

@@ -156,18 +156,20 @@ public class OrderInfo implements Serializable {
private String payMode;
/**
* {@link com.czg.order.enums.PayEnums}
* 支付类型
* 主扫 main-scan
* 被扫 back-scan
* 微信小程序 wechat-mini
* 支付宝小程序 alipay-mini
* 会员支付 vip-pay
* 现金支付 cash-pay
* 主扫 main_scan
* 被扫 back_scan
* 微信小程序 wechat_mini
* 支付宝小程序 alipay_mini
* 会员支付 vip_pay
* 现金支付 cash_pay
* 挂账支付 credit_pay
*/
private String payType;
/**
* OrderStatusEnums 枚举类
* {@link com.czg.service.order.enums.OrderStatusEnums}
* 状态: unpaid-待支付;in-production 制作中;wait-out 待取餐;;done-订单完成;refunding-申请退单;refund-退单;part-refund 部分退单;cancelled-取消订单
*/
private String status;

1
cash-common/cash-common-service/src/main/java/com/czg/order/enums/PayEnums.java
View File

@@ -15,6 +15,7 @@ public enum PayEnums {
ALIPAY_MINI("alipay_mini", "支付宝小程序"),
VIP_PAY("vip_pay", "会员支付"),
CASH_PAY("cash_pay", "现金支付"),
CREDIT_PAY("credit_pay", "挂账支付"),
H5_PAY("h5_pay", "h5支付");

4
cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.czg.order.dto.*;
import com.czg.order.entity.OrderInfo;
import com.czg.order.enums.PayEnums;
import com.czg.order.vo.HistoryOrderVo;
import com.czg.order.vo.OrderInfoVo;
import com.czg.resp.CzgResult;
import com.mybatisflex.core.paginate.Page;
@@ -23,6 +24,7 @@ import java.time.LocalDateTime;
public interface OrderInfoService extends IService<OrderInfo> {
Page<OrderInfoVo> getOrderByPage(OrderInfoQueryDTO param);
HistoryOrderVo historyOrder(Long orderId);
OrderInfo createOrder(OrderInfoAddDTO param);
// void updateOrder(OrderInfoUpDTO upDTO);
@@ -35,5 +37,5 @@ public interface OrderInfoService extends IService<OrderInfo> {
void refundCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson);
void upOrderInfo(Long orderId, BigDecimal payAmount, LocalDateTime payTime, Long payOrderId, PayEnums payType);
void upOrderInfo(OrderInfo orderInfo, BigDecimal payAmount, LocalDateTime payTime, Long payOrderId, PayEnums payType);
}

18
cash-common/cash-common-service/src/main/java/com/czg/order/vo/HistoryOrderVo.java Normal file
View File

@@ -0,0 +1,18 @@
package com.czg.order.vo;
import com.czg.order.entity.OrderDetail;
import com.czg.order.entity.OrderInfo;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @author ww
* @description
*/
@Data
public class HistoryOrderVo {
private OrderInfo info;
private Map<Integer, List<OrderDetail>> detailMap;
}