cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新sql和代码规范修改

Browse Source
This commit is contained in:
moxiangrong
2024-02-18 15:26:45 +08:00
parent 6f5e6e4662
commit c132b68745
1293 changed files with 43935 additions and 18456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/api/productorder/ProductOrderApi.java
View File

@ -14,9 +14,10 @@ public interface ProductOrderApi {
/**
* 余额支付
*
* @param orderId 订单号
* @param uid 用户id
* @param uid 用户id
*/
void yuePay(String orderId,Long uid);
void yuePay(String orderId, Long uid);
}

23
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/AdminAfterOrderStatusEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -18,21 +17,19 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum AdminAfterOrderStatusEnum {
AFTER_SALES(1,"售后中"),
COMPLETED(2,"已完成");
AFTER_SALES(1, "售后中"),
COMPLETED(2, "已完成");
private Integer value;
private String desc;
private Integer value;
private String desc;
public static AdminAfterOrderStatusEnum toType(int value) {
return Stream.of(AdminAfterOrderStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
public static AdminAfterOrderStatusEnum toType(int value) {
return Stream.of(AdminAfterOrderStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
}

33
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/AdminOrderStatusEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -18,26 +17,24 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum AdminOrderStatusEnum {
STATUS_0(0,"未支付"),
STATUS_1(1,"未发货"),
STATUS_2(2,"待收货"),
STATUS_3(3,"待评价"),
STATUS_4(4,"交易完成"),
STATUS_5(5,"已退款"),
STATUS_6(6,"已删除");
STATUS_0(0, "未支付"),
STATUS_1(1, "未发货"),
STATUS_2(2, "待收货"),
STATUS_3(3, "待评价"),
STATUS_4(4, "交易完成"),
STATUS_5(5, "已退款"),
STATUS_6(6, "已删除");
private Integer value;
private String desc;
private Integer value;
private String desc;
public static AdminOrderStatusEnum toType(int value) {
return Stream.of(AdminOrderStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
public static AdminOrderStatusEnum toType(int value) {
return Stream.of(AdminOrderStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
}

12
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/AfterChangeTypeEnum.java
View File

@ -11,12 +11,12 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum AfterChangeTypeEnum {
CREATE_AFTER_SALES(0,"售后订单生成"),
AUDIT_SUCCESS(1,"后台审核成功"),
USER_SHIPMENT(2,"用户发货"),
PAYMENT(3,"打款"),
AUDIT_FAILED(4,"审核失败"),
USER_REVOCATION(5,"用户撤销");
CREATE_AFTER_SALES(0, "售后订单生成"),
AUDIT_SUCCESS(1, "后台审核成功"),
USER_SHIPMENT(2, "用户发货"),
PAYMENT(3, "打款"),
AUDIT_FAILED(4, "审核失败"),
USER_REVOCATION(5, "用户撤销");
private Integer value;
private String desc;

29
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/AfterSalesStatusEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -20,22 +19,22 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum AfterSalesStatusEnum {
PENDING_REVIEW(0,"已提交等待平台审核"),
AUDITED(1,"平台已审核,等待用户发货/退款"),
USER_SHIPPED(2,"用户已发货"),
REFUND_SUCCESS(3,"用户退款成功"),
USER_CANCELLED(4,"用户取消"),
MERCHANT_REJECTION(5,"商家拒绝");
PENDING_REVIEW(0, "已提交等待平台审核"),
AUDITED(1, "平台已审核,等待用户发货/退款"),
USER_SHIPPED(2, "用户已发货"),
REFUND_SUCCESS(3, "用户退款成功"),
USER_CANCELLED(4, "用户取消"),
MERCHANT_REJECTION(5, "商家拒绝");
private Integer value;
private String desc;
private Integer value;
private String desc;
public static AfterSalesStatusEnum toType(int value) {
return Stream.of(AfterSalesStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
public static AfterSalesStatusEnum toType(int value) {
return Stream.of(AfterSalesStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
}

6
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/AfterStatusEnum.java
View File

@ -11,9 +11,9 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum AfterStatusEnum {
STATE_0(0,"正常"),
STATE_1(1,"用户取消"),
STATE_2(2,"商家拒绝");
STATE_0(0, "正常"),
STATE_1(1, "用户取消"),
STATE_2(2, "商家拒绝");
private Integer value;
private String desc;

8
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/AfterTypeEnum.java
View File

@ -11,10 +11,10 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum AfterTypeEnum {
AGREE(1,"同意"),
REFUSE(2,"拒绝"),
REFUND_ONLY(0,"仅退款"),
RETURNS_REFUNDS(1,"退货退款");
AGREE(1, "同意"),
REFUSE(2, "拒绝"),
REFUND_ONLY(0, "仅退款"),
RETURNS_REFUNDS(1, "退货退款");
private Integer value;
private String desc;

19
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/AppFromEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -16,17 +15,17 @@ import lombok.Getter;
@AllArgsConstructor
public enum AppFromEnum {
WEIXIN_H5("weixinh5","weixinh5"),
H5("h5","H5"),
WECHAT("wechat","公众号"),
APP("app","APP"),
PC("pc","PC"),
ROUNTINE("routine","小程序"),
UNIAPPH5("uniappH5","uniappH5");
WEIXIN_H5("weixinh5", "weixinh5"),
H5("h5", "H5"),
WECHAT("wechat", "公众号"),
APP("app", "APP"),
PC("pc", "PC"),
ROUNTINE("routine", "小程序"),
UNIAPPH5("uniappH5", "uniappH5");
private String value;
private String desc;
private String value;
private String desc;
}

4
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/ErrorCodeConstants.java
View File

@ -44,8 +44,8 @@ public interface ErrorCodeConstants {
// ========== 订单电子面单记录 ==========
ErrorCode STORE_ORDER_ELECTRONICS_NOT_EXISTS = new ErrorCode(1008010000, "订单电子面单记录不存在");
// ==============支付 ======
ErrorCode STORE_ORDER_PAY_FEE_ERROR = new ErrorCode(1008011000, "订单金额与支付不一致！");
// ==============支付 ======
ErrorCode STORE_ORDER_PAY_FEE_ERROR = new ErrorCode(1008011000, "订单金额与支付不一致！");
ErrorCode STORE_ORDER_REFUND_TRANSACTION_NULL_ERROR = new ErrorCode(1008011001, "订单支付信息有误！退款失败！");

24
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/OrderDetailStateEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -18,21 +17,20 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum OrderDetailStateEnum {
NORMAL(1,"正常"),
IN_AFTER_SALES(2,"售后中"),
AFTER_SALES_COMPLETE(3,"售后完成");
NORMAL(1, "正常"),
IN_AFTER_SALES(2, "售后中"),
AFTER_SALES_COMPLETE(3, "售后完成");
private Integer value;
private String desc;
private Integer value;
private String desc;
public static OrderDetailStateEnum toType(int value) {
return Stream.of(OrderDetailStateEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
public static OrderDetailStateEnum toType(int value) {
return Stream.of(OrderDetailStateEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
}

57
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/OrderLogEnum.java
View File

@ -13,39 +13,38 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum OrderLogEnum {
PINK_ORDER_FAIL_1("ORDER_EXIST","订单生成失败，你已经参加该团了，请先支付订单"),
PINK_ORDER_FAIL_2("ORDER_EXIST","订单生成失败，你已经在该团内不能再参加了"),
REFUND_ORDER_SUCCESS("refund_price_success","退款成功"),
ORDER_EDIT("order_edit","订单改价"),
REMOVE_ORDER("remove_order","删除订单"),
EVAL_ORDER("order_eval","用户评价"),
REFUND_ORDER_APPLY("apply_refund","用户申请退款"),
TAKE_ORDER_DELIVERY("user_take_delivery","用户已收货"),
PAY_ORDER_FAIL("PAY_DEFICIENCY","余额不足"),
PAY_ORDER_SUCCESS("pay_success","用户付款成功"),
CREATE_ORDER_SUCCESS("SUCCESS","订单创建成功"),
CREATE_ORDER("yshop_create_order","订单生成"),
NONE_ORDER("NONE","订单OK"),
DELIVERY_GOODS("delivery_goods", "订单发货"),
OFFLINE_PAY("offline_pay", "线下支付"),
EXTEND_ORDER("EXTEND_ORDER","订单已生成"),
APPLY_AFTER_SALES("apply_after_sales","用户申请售后");
PINK_ORDER_FAIL_1("ORDER_EXIST", "订单生成失败，你已经参加该团了，请先支付订单"),
PINK_ORDER_FAIL_2("ORDER_EXIST", "订单生成失败，你已经在该团内不能再参加了"),
REFUND_ORDER_SUCCESS("refund_price_success", "退款成功"),
ORDER_EDIT("order_edit", "订单改价"),
REMOVE_ORDER("remove_order", "删除订单"),
EVAL_ORDER("order_eval", "用户评价"),
REFUND_ORDER_APPLY("apply_refund", "用户申请退款"),
TAKE_ORDER_DELIVERY("user_take_delivery", "用户已收货"),
PAY_ORDER_FAIL("PAY_DEFICIENCY", "余额不足"),
PAY_ORDER_SUCCESS("pay_success", "用户付款成功"),
CREATE_ORDER_SUCCESS("SUCCESS", "订单创建成功"),
CREATE_ORDER("yshop_create_order", "订单生成"),
NONE_ORDER("NONE", "订单OK"),
DELIVERY_GOODS("delivery_goods", "订单发货"),
OFFLINE_PAY("offline_pay", "线下支付"),
EXTEND_ORDER("EXTEND_ORDER", "订单已生成"),
APPLY_AFTER_SALES("apply_after_sales", "用户申请售后");
private String value;
private String desc;
private String value;
private String desc;
public static OrderLogEnum toType(String value) {
return Stream.of(OrderLogEnum.values())
.filter(p -> p.value.equals(value))
.findAny()
.orElse(null);
}
public static OrderLogEnum toType(String value) {
return Stream.of(OrderLogEnum.values())
.filter(p -> p.value.equals(value))
.findAny()
.orElse(null);
}
public static String getDesc(String value) {
return toType(value) == null ? null : toType(value).desc;
}
public static String getDesc(String value) {
return toType(value) == null ? null : toType(value).desc;
}
}

40
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/OrderStatusEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -18,29 +17,28 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum OrderStatusEnum {
STATUS_ALL(-1,"全部订单"),
STATUS_WAIT_PAY(0,"未支付"),
STATUS_WAIT_SEND(1,"未发货"),
STATUS_WAIT_RECEIVED(2,"待收货"),
STATUS_WAIT_EVALUATE(3,"待评价"),
STATUS_FINISH(4,"已完成"),
STATUS_WAIT_FOR_GROUP(5,"待成团"),
STATUS_MINUS_BEING_REFUND(-1,"退款中"),
STATUS_MINUS_REFUNDED(-2,"已退款"),
STATUS_MINUS_REFUND(-3,"退款"),
STATUS_GROUP_FAILURE(-4,"成团失败");
STATUS_ALL(-1, "全部订单"),
STATUS_WAIT_PAY(0, "未支付"),
STATUS_WAIT_SEND(1, "未发货"),
STATUS_WAIT_RECEIVED(2, "待收货"),
STATUS_WAIT_EVALUATE(3, "待评价"),
STATUS_FINISH(4, "已完成"),
STATUS_WAIT_FOR_GROUP(5, "待成团"),
STATUS_MINUS_BEING_REFUND(-1, "退款中"),
STATUS_MINUS_REFUNDED(-2, "已退款"),
STATUS_MINUS_REFUND(-3, "退款"),
STATUS_GROUP_FAILURE(-4, "成团失败");
private Integer value;
private String desc;
private Integer value;
private String desc;
public static OrderStatusEnum toType(int value) {
return Stream.of(OrderStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
public static OrderStatusEnum toType(int value) {
return Stream.of(OrderStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
}

22
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/OrderTypeEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -18,20 +17,19 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum OrderTypeEnum {
NORMAL_ORDER(1,"正常下单"),
CAMPAIGN_ORDER(2,"活动下单");
NORMAL_ORDER(1, "正常下单"),
CAMPAIGN_ORDER(2, "活动下单");
private Integer value;
private String desc;
private Integer value;
private String desc;
public static OrderTypeEnum toType(int value) {
return Stream.of(OrderTypeEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
public static OrderTypeEnum toType(int value) {
return Stream.of(OrderTypeEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
}

43
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/PayTypeEnum.java
View File

@ -1,43 +0,0 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.stream.Stream;
/**
* @author hupeng
* 支付相关枚举
*/
@Getter
@AllArgsConstructor
public enum PayTypeEnum {
ALI("alipay","支付宝支付","1"),
ALI_APP("alipay_app","支付宝APP支付","1"),
ALI_H5("alipay_h5","支付宝H5支付","1"),
WEIXIN("weixin","微信支付","6"),
WEIXIN_H5("weixin_h5","微信H5支付","4"),
WEIXIN_APPLET("weixin_applet","微信小程序支付","3"),
WEIXIN_APP("weixin_app","微信app支付","2"),
YUE("yue","余额支付","10"),
INTEGRAL("integral","积分兑换","11");
private String value;
private String desc;
private String code;
public static PayTypeEnum toType(String value) {
return Stream.of(PayTypeEnum.values())
.filter(p -> p.value.equals(value))
.findAny()
.orElse(null);
}
}

21
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/ReachargeOrderStatusEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -20,19 +19,19 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum ReachargeOrderStatusEnum {
WAIT(0,"待支付"),
SUCCESS(1,"已支付");
WAIT(0, "待支付"),
SUCCESS(1, "已支付");
private Integer value;
private Integer value;
private String name;
private String name;
public static ReachargeOrderStatusEnum toType(int value) {
return Stream.of(ReachargeOrderStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
public static ReachargeOrderStatusEnum toType(int value) {
return Stream.of(ReachargeOrderStatusEnum.values())
.filter(p -> p.value == value)
.findAny()
.orElse(null);
}
}

4
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/RechargePackageStatusEnum.java
View File

@ -9,8 +9,8 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum RechargePackageStatusEnum {
CLOSE(0,"关闭"),
OPEN(1,"开启"),
CLOSE(0, "关闭"),
OPEN(1, "开启"),
;
private Integer status;

6
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/ShippingTempEnum.java
View File

@ -11,9 +11,9 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum ShippingTempEnum {
BY_PIECE(1,"按件数"),
BY_WEIGHT(2,"按重量"),
BY_VOLUME(3,"按体积");
BY_PIECE(1, "按件数"),
BY_WEIGHT(2, "按重量"),
BY_VOLUME(3, "按体积");
private Integer value;
private String desc;

4
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/ShippingTypeEnum.java
View File

@ -11,8 +11,8 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum ShippingTypeEnum {
SHIPPING_TYPE_EXPRESS_DELIVERY(1,"快递"),
SHIPPING_TYPE_STORE(2,"门店自提"),
SHIPPING_TYPE_EXPRESS_DELIVERY(1, "快递"),
SHIPPING_TYPE_STORE(2, "门店自提"),
;
private Integer value;

13
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/UpdateOrderEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -16,14 +15,14 @@ import lombok.Getter;
@AllArgsConstructor
public enum UpdateOrderEnum {
UPDATE_ORDER("updateOrder","修改订单"),
ORDER_SEND("orderSend","订单发货"),
RMARK("remark","备注"),
SEND_INFO("sendInfo","配送信息");
UPDATE_ORDER("updateOrder", "修改订单"),
ORDER_SEND("orderSend", "订单发货"),
RMARK("remark", "备注"),
SEND_INFO("sendInfo", "配送信息");
private String value;
private String desc;
private String value;
private String desc;
}

33
yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/WxOrderResultEnum.java
View File

@ -1,7 +1,6 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.yshop.module.order.enums;
@ -19,27 +18,23 @@ import java.util.stream.Stream;
@AllArgsConstructor
public enum WxOrderResultEnum {
NOT_PAY("NOTPAY","未支付"),
TRANSACTION_ID("transaction_id","微信支付订单id"),
OUT_TRADE_NO("out_trade_no","商家订单号"),
OUT_REFUND_NO("out_refund_no","商家退款单号"),
TRADE_STATE("trade_state","订单交易装态"),
REFUND_ID("refund_id","微信退款单id");
NOT_PAY("NOTPAY", "未支付"),
TRANSACTION_ID("transaction_id", "微信支付订单id"),
OUT_TRADE_NO("out_trade_no", "商家订单号"),
OUT_REFUND_NO("out_refund_no", "商家退款单号"),
TRADE_STATE("trade_state", "订单交易装态"),
REFUND_ID("refund_id", "微信退款单id");
private String value;
private String desc;
private String value;
private String desc;
public static WxOrderResultEnum toType(String value) {
return Stream.of(WxOrderResultEnum.values())
.filter(p -> Objects.equals(p.value, value))
.findAny()
.orElse(null);
}
public static WxOrderResultEnum toType(String value) {
return Stream.of(WxOrderResultEnum.values())
.filter(p -> Objects.equals(p.value, value))
.findAny()
.orElse(null);
}
}