admin/tmerclub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

球杆

Browse Source
This commit is contained in:
杨旭 2025-04-19 16:15:43 +08:00
parent ebd00f134e
commit a9437b4c91
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
View File

@ -134,13 +134,13 @@ public class CreateOrderManager {
} }
CueOrder cueOrder = new CueOrder(); CueOrder cueOrder = new CueOrder();
cueOrder.setOrderId(cueAgreeOrderDTO.getOrderId()); cueOrder.setOrderId(cueAgreeOrderDTO.getOrderId());
cueOrder.setOrderType(cueAgreeOrderDTO.getOrderType()); cueOrder.setCueOrderType(cueAgreeOrderDTO.getCueOrderType());
cueOrder.setOrderStatus(CueOrderStatus.EVALUATION_SUCCESS_PAY.value()); cueOrder.setOrderStatus(CueOrderStatus.EVALUATION_SUCCESS_PAY.value());
cueOrder.setUpdateTime(DateUtil.date()); cueOrder.setUpdateTime(DateUtil.date());
cueOrder.setFinallyTime(DateUtil.date()); cueOrder.setFinallyTime(DateUtil.date());
cueOrder.setIsPayed(1); cueOrder.setIsPayed(1);
// 根据回收类型进行不同操作 // 根据回收类型进行不同操作
switch (cueAgreeOrderDTO.getOrderType()) { switch (cueAgreeOrderDTO.getCueOrderType()) {
case 1: case 1:
// 回收 // 回收
cueOrder.setPayType(1); cueOrder.setPayType(1);

2
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/CueOrder.java
View File

@ -55,7 +55,7 @@ public class CueOrder extends BaseModel implements Serializable {
/** /**
* 类型：1-回收，2-置换，3-寄售 * 类型：1-回收，2-置换，3-寄售
*/ */
private Integer orderType; private Integer cueOrderType;
/** /**
* 0-待审核，1-审核通过(待发货)，2-审核拒绝，3-待收货(已发货)，4-已收货(评估中)，5-评估失败(退回)，6-评估成功(给出价格)，7-价格不满意(退回)，8-价格满意(结束)，9-价格不满意(已退回) * 0-待审核，1-审核通过(待发货)，2-审核拒绝，3-待收货(已发货)，4-已收货(评估中)，5-评估失败(退回)，6-评估成功(给出价格)，7-价格不满意(退回)，8-价格满意(结束)，9-价格不满意(已退回)
*/ */

2
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CreateOrderDTO.java
View File

@ -44,7 +44,7 @@ public class CreateOrderDTO implements Serializable {
/** /**
* 类型：1-回收，2-置换，3-寄售 * 类型：1-回收，2-置换，3-寄售
*/ */
private Integer orderType; private Integer cueOrderType;
/** /**
* 瑕疵图片，逗号隔开 * 瑕疵图片，逗号隔开
*/ */

2
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueAgreeOrderDTO.java
View File

@ -30,5 +30,5 @@ public class CueAgreeOrderDTO implements Serializable {
* 类型：1-回收，2-置换，3-寄售 * 类型：1-回收，2-置换，3-寄售
*/ */
@NotNull(message = "类型不能为空") @NotNull(message = "类型不能为空")
private Integer orderType; private Integer cueOrderType;
} }

2
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/dto/CueOrderDTO.java
View File

@ -36,7 +36,7 @@ public class CueOrderDTO implements Serializable {
/** /**
* 类型：1-回收，2-置换，3-寄售 * 类型：1-回收，2-置换，3-寄售
*/ */
private Integer orderType; private Integer cueOrderType;
/** /**
* 状态：0-待审核，1-审核通过(待发货)，2-审核拒绝，3-待收货(已发货)，4-已收货(评估中)，5-评估失败(退回)，6-评估成功(给出价格)，7-价格不满意(退回)，8-价格满意(结束)，9-价格不满意(已退回) * 状态：0-待审核，1-审核通过(待发货)，2-审核拒绝，3-待收货(已发货)，4-已收货(评估中)，5-评估失败(退回)，6-评估成功(给出价格)，7-价格不满意(退回)，8-价格满意(结束)，9-价格不满意(已退回)
*/ */

6
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/AppCueOrderVO.java
View File

@ -50,11 +50,11 @@ public class AppCueOrderVO extends BaseVO implements Serializable {
* 类型：1-回收，2-置换，3-寄售 * 类型：1-回收，2-置换，3-寄售
*/ */
@Schema(description = "类型：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; private Integer orderStatus;
/** /**
* 预计金额 * 预计金额

2
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
View File

@ -61,7 +61,7 @@ public class CueOrderVO extends BaseVO implements Serializable {
* 类型：1-回收，2-置换，3-寄售 * 类型：1-回收，2-置换，3-寄售
*/ */
@Schema(description = "类型：1-回收，2-置换，3-寄售") @Schema(description = "类型：1-回收，2-置换，3-寄售")
private Integer orderType; private Integer cueOrderType;
/** /**
* 状态：0-待审核，1-审核通过(待发货)，2-审核拒绝，3-待收货(已发货)，4-已收货(评估中)，5-评估失败(退回)，6-评估成功(给出价格)，7-价格不满意(退回)，8-价格满意(结束)，9-价格不满意(已退回) * 状态：0-待审核，1-审核通过(待发货)，2-审核拒绝，3-待收货(已发货)，4-已收货(评估中)，5-评估失败(退回)，6-评估成功(给出价格)，7-价格不满意(退回)，8-价格满意(结束)，9-价格不满意(已退回)
*/ */

2
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/service/impl/CueOrderServiceImpl.java
View File

@ -87,7 +87,7 @@ public class CueOrderServiceImpl implements CueOrderService {
if (Objects.equals(cueOrderDTO.getOrderStatus(), CueOrderStatus.EVALUATION_SUCCESS.value())) { if (Objects.equals(cueOrderDTO.getOrderStatus(), CueOrderStatus.EVALUATION_SUCCESS.value())) {
cueOrder.setActualAmount(cueOrderDTO.getActualAmount()); cueOrder.setActualAmount(cueOrderDTO.getActualAmount());
// 寄售需要填写服务费和佣金 // 寄售需要填写服务费和佣金
if (cueOrderDTO.getOrderType().equals(3)) { if (cueOrderDTO.getCueOrderType().equals(3)) {
cueOrder.setServiceCharge(cueOrderDTO.getServiceCharge()); cueOrder.setServiceCharge(cueOrderDTO.getServiceCharge());
cueOrder.setBrokerage(cueOrderDTO.getBrokerage()); cueOrder.setBrokerage(cueOrderDTO.getBrokerage());
} else { } else {

16
tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
View File

@ -12,7 +12,7 @@
<result property="productPrice" column="product_price"/> <result property="productPrice" column="product_price"/>
<result property="userName" column="user_name"/> <result property="userName" column="user_name"/>
<result property="userPhone" column="user_phone"/> <result property="userPhone" column="user_phone"/>
<result property="orderType" column="order_type"/> <result property="cueOrderType" column="cue_order_type"/>
<result property="orderStatus" column="order_status"/> <result property="orderStatus" column="order_status"/>
<result property="flawImgUrl" column="flaw_img_url"/> <result property="flawImgUrl" column="flaw_img_url"/>
<result property="evidenceOfPayment" column="evidence_of_payment"/> <result property="evidenceOfPayment" column="evidence_of_payment"/>
@ -33,7 +33,7 @@
</resultMap> </resultMap>
<sql id="Vo_Column_List"> <sql id="Vo_Column_List">
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, 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 create_time,update_time,is_payed,pay_type,pay_time,delivery_time,finally_time,mall_order_id,send_number,order_addr_id
</sql> </sql>
@ -51,8 +51,8 @@
<if test="dto.userPhone != null and dto.userPhone != ''"> <if test="dto.userPhone != null and dto.userPhone != ''">
AND user_phone LIKE CONCAT('%', #{dto.userPhone}, '%') AND user_phone LIKE CONCAT('%', #{dto.userPhone}, '%')
</if> </if>
<if test="dto.orderType != null"> <if test="dto.cueOrderType != null">
AND order_type = #{dto.orderType} AND cue_order_type = #{dto.cueOrderType}
</if> </if>
<if test="dto.orderStatus != null"> <if test="dto.orderStatus != null">
AND order_status = #{dto.orderStatus} AND order_status = #{dto.orderStatus}
@ -87,7 +87,7 @@
<if test="productPrice != null">product_price,</if> <if test="productPrice != null">product_price,</if>
<if test="userName != null and userName != ''">user_name,</if> <if test="userName != null and userName != ''">user_name,</if>
<if test="userPhone != null and userPhone != ''">user_phone,</if> <if test="userPhone != null and userPhone != ''">user_phone,</if>
<if test="orderType != null">order_type,</if> <if test="cueOrderType != null">cue_order_type,</if>
<if test="orderStatus != null">order_status,</if> <if test="orderStatus != null">order_status,</if>
<if test="flawImgUrl != null and flawImgUrl != ''">flaw_img_url,</if> <if test="flawImgUrl != null and flawImgUrl != ''">flaw_img_url,</if>
<if test="evidenceOfPayment != null and evidenceOfPayment != ''">evidence_of_payment,</if> <if test="evidenceOfPayment != null and evidenceOfPayment != ''">evidence_of_payment,</if>
@ -110,7 +110,7 @@
<if test="productPrice != null">#{productPrice},</if> <if test="productPrice != null">#{productPrice},</if>
<if test="userName != null and userName != ''">#{userName},</if> <if test="userName != null and userName != ''">#{userName},</if>
<if test="userPhone != null and userPhone != ''">#{userPhone},</if> <if test="userPhone != null and userPhone != ''">#{userPhone},</if>
<if test="orderType != null">#{orderType},</if> <if test="cueOrderType != null">#{cueOrderType},</if>
<if test="orderStatus != null">#{orderStatus},</if> <if test="orderStatus != null">#{orderStatus},</if>
<if test="flawImgUrl != null and flawImgUrl != ''">#{flawImgUrl},</if> <if test="flawImgUrl != null and flawImgUrl != ''">#{flawImgUrl},</if>
<if test="evidenceOfPayment != null and evidenceOfPayment != ''">#{evidenceOfPayment},</if> <if test="evidenceOfPayment != null and evidenceOfPayment != ''">#{evidenceOfPayment},</if>
@ -136,8 +136,8 @@
<if test="userPhone != null and userPhone != ''"> <if test="userPhone != null and userPhone != ''">
user_phone = #{userPhone}, user_phone = #{userPhone},
</if> </if>
<if test="orderType != null"> <if test="cueOrderType != null">
order_type = #{orderType}, cue_order_type = #{cueOrderType},
</if> </if>
<if test="orderStatus != null"> <if test="orderStatus != null">
order_status = #{orderStatus}, order_status = #{orderStatus},