diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
index f22b14a..ffaa21a 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
@@ -134,13 +134,13 @@ public class CreateOrderManager {
}
CueOrder cueOrder = new CueOrder();
cueOrder.setOrderId(cueAgreeOrderDTO.getOrderId());
- cueOrder.setOrderType(cueAgreeOrderDTO.getOrderType());
+ cueOrder.setCueOrderType(cueAgreeOrderDTO.getCueOrderType());
cueOrder.setOrderStatus(CueOrderStatus.EVALUATION_SUCCESS_PAY.value());
cueOrder.setUpdateTime(DateUtil.date());
cueOrder.setFinallyTime(DateUtil.date());
cueOrder.setIsPayed(1);
// 根据回收类型进行不同操作
- switch (cueAgreeOrderDTO.getOrderType()) {
+ switch (cueAgreeOrderDTO.getCueOrderType()) {
case 1:
// 回收
cueOrder.setPayType(1);
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/CueOrder.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/CueOrder.java
index 596a59b..9982e69 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/CueOrder.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/CueOrder.java
@@ -55,7 +55,7 @@ public class CueOrder extends BaseModel implements Serializable {
/**
* 类型:1-回收,2-置换,3-寄售
*/
- private Integer orderType;
+ private Integer cueOrderType;
/**
* 0-待审核,1-审核通过(待发货),2-审核拒绝,3-待收货(已发货),4-已收货(评估中),5-评估失败(退回),6-评估成功(给出价格),7-价格不满意(退回),8-价格满意(结束),9-价格不满意(已退回)
*/
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CreateOrderDTO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CreateOrderDTO.java
index f5019df..43ca41e 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CreateOrderDTO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CreateOrderDTO.java
@@ -44,7 +44,7 @@ public class CreateOrderDTO implements Serializable {
/**
* 类型:1-回收,2-置换,3-寄售
*/
- private Integer orderType;
+ private Integer cueOrderType;
/**
* 瑕疵图片,逗号隔开
*/
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java
index 02461e2..cab535f 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java
@@ -30,5 +30,5 @@ public class CueAgreeOrderDTO implements Serializable {
* 类型:1-回收,2-置换,3-寄售
*/
@NotNull(message = "类型不能为空")
- private Integer orderType;
+ private Integer cueOrderType;
}
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueOrderDTO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueOrderDTO.java
index 4d3af7a..f04afc6 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueOrderDTO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueOrderDTO.java
@@ -36,7 +36,7 @@ public class CueOrderDTO implements Serializable {
/**
* 类型:1-回收,2-置换,3-寄售
*/
- private Integer orderType;
+ private Integer cueOrderType;
/**
* 状态:0-待审核,1-审核通过(待发货),2-审核拒绝,3-待收货(已发货),4-已收货(评估中),5-评估失败(退回),6-评估成功(给出价格),7-价格不满意(退回),8-价格满意(结束),9-价格不满意(已退回)
*/
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/AppCueOrderVO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/AppCueOrderVO.java
index 79ff947..e322648 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/AppCueOrderVO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/AppCueOrderVO.java
@@ -50,11 +50,11 @@ public class AppCueOrderVO extends BaseVO implements Serializable {
* 类型:1-回收,2-置换,3-寄售
*/
@Schema(description = "类型:1-回收,2-置换,3-寄售")
- private Integer orderType;
+ private Integer cueOrderType;
/**
- * 状态:0-待审核,1-审核通过(待发货),2-审核拒绝,3-待收货(已发货),4-已收货(评估中),5-评估失败(退回),6-评估成功(给出价格),7-价格不满意(退回),8-价格满意(结束),9-价格不满意(已退回)
+ * 订单状态
*/
- @Schema(description = "0-待审核,1-审核通过(待发货),2-审核拒绝,3-待收货(已发货),4-已收货(评估中),5-评估失败(退回),6-评估成功(给出价格),7-价格不满意(退回),8-价格满意(结束),9-价格不满意(已退回)")
+ @Schema(description = "订单状态")
private Integer orderStatus;
/**
* 预计金额
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
index c8da01f..e46c92f 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
@@ -61,7 +61,7 @@ public class CueOrderVO extends BaseVO implements Serializable {
* 类型:1-回收,2-置换,3-寄售
*/
@Schema(description = "类型:1-回收,2-置换,3-寄售")
- private Integer orderType;
+ private Integer cueOrderType;
/**
* 状态:0-待审核,1-审核通过(待发货),2-审核拒绝,3-待收货(已发货),4-已收货(评估中),5-评估失败(退回),6-评估成功(给出价格),7-价格不满意(退回),8-价格满意(结束),9-价格不满意(已退回)
*/
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/service/impl/CueOrderServiceImpl.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/service/impl/CueOrderServiceImpl.java
index 6ab052e..ff6b0c0 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/service/impl/CueOrderServiceImpl.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/service/impl/CueOrderServiceImpl.java
@@ -87,7 +87,7 @@ public class CueOrderServiceImpl implements CueOrderService {
if (Objects.equals(cueOrderDTO.getOrderStatus(), CueOrderStatus.EVALUATION_SUCCESS.value())) {
cueOrder.setActualAmount(cueOrderDTO.getActualAmount());
// 寄售需要填写服务费和佣金
- if (cueOrderDTO.getOrderType().equals(3)) {
+ if (cueOrderDTO.getCueOrderType().equals(3)) {
cueOrder.setServiceCharge(cueOrderDTO.getServiceCharge());
cueOrder.setBrokerage(cueOrderDTO.getBrokerage());
} else {
diff --git a/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml b/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
index c26256c..807581e 100644
--- a/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
+++ b/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
@@ -12,7 +12,7 @@
-
+
@@ -33,7 +33,7 @@
- order_id,product_id,product_name,product_images,product_price,user_id,user_name,user_phone,order_type,
+ order_id,product_id,product_name,product_images,product_price,user_id,user_name,user_phone,cue_order_type,
order_status,flaw_img_url,evidence_of_payment,order_remark,estimated_amount,actual_amount,voucher_amount,deleted,
create_time,update_time,is_payed,pay_type,pay_time,delivery_time,finally_time,mall_order_id,send_number,order_addr_id
@@ -51,8 +51,8 @@
AND user_phone LIKE CONCAT('%', #{dto.userPhone}, '%')
-
- AND order_type = #{dto.orderType}
+
+ AND cue_order_type = #{dto.cueOrderType}
AND order_status = #{dto.orderStatus}
@@ -87,7 +87,7 @@
product_price,
user_name,
user_phone,
- order_type,
+ cue_order_type,
order_status,
flaw_img_url,
evidence_of_payment,
@@ -110,7 +110,7 @@
#{productPrice},
#{userName},
#{userPhone},
- #{orderType},
+ #{cueOrderType},
#{orderStatus},
#{flawImgUrl},
#{evidenceOfPayment},
@@ -136,8 +136,8 @@
user_phone = #{userPhone},
-
- order_type = #{orderType},
+
+ cue_order_type = #{cueOrderType},
order_status = #{orderStatus},