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-20 18:56:06 +08:00
parent 00efed6258
commit e2fc42ab47
6 changed files with 49 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tmerclub-api/tmerclub-api-order/src/main/java/com/tmerclub/cloud/api/order/constant/OrderStatus.java
View File

@ -48,7 +48,23 @@ public enum OrderStatus {
/**
* 待付尾款
*/
WAIT_BALANCE(9, "待付尾款", "待付尾款");
WAIT_BALANCE(9, "待付尾款", "待付尾款"),
/**
* cue订单状态
*/
CUE_PENDING_AUDIT(10, "待审核",""),
CUE_AUDIT_PASS(11, "审核通过(待发货)",""),
CUE_AUDIT_FAIL(12, "审核拒绝",""),
CUE_FINISH_DELIVERY(13, "已发货",""),
CUE_FINISH_RECEIPT(14, "已收货(评估中)",""),
CUE_EVALUATION_SUCCESS(15, "评估成功(给出价格)",""),
CUE_EVALUATION_FAIL(16, "评估失败(退回)",""),
CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS(17, "评估失败用户已填写回邮地址",""),
CUE_EVALUATION_FAIL_COMPLETED(18, "评估失败(已退回)",""),
CUE_EVALUATION_SUCCESS_PAY(5, "价格满意(结束)",""),
CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT(19, "价格不满意(已填写回邮地址)",""),
CUE_EVALUATION_SUCCESS_COMPLETED(20, "价格不满意(已完成)","");
private final Integer num;
private final String deliveryName;

37
tmerclub-common/tmerclub-common-local/src/main/java/com/tmerclub/cloud/common/local/constant/CueOrderStatus.java
View File

@ -1,37 +0,0 @@
package com.tmerclub.cloud.common.local.constant;
/**
* 订单状态
*
* @author: frank
* @create: 2025-04-15
**/
public enum CueOrderStatus {
PENDING_AUDIT(0, "待审核"),
AUDIT_PASS(1, "审核通过(待发货)"),
AUDIT_FAIL(2, "审核拒绝"),
FINISH_DELIVERY(3, "已发货"),
FINISH_RECEIPT(4, "已收货(评估中)"),
EVALUATION_SUCCESS(5, "评估成功(给出价格)"),
EVALUATION_FAIL(6, "评估失败(退回)"),
EVALUATION_FAIL_FILLED_RETURN_ADDRESS(7, "评估失败用户已填写回邮地址"),
EVALUATION_FAIL_COMPLETED(8, "评估失败(已退回)"),
EVALUATION_SUCCESS_PAY(9, "价格满意(结束)"),
EVALUATION_SUCCESS_PRICE_DISCONTENT(10, "价格不满意(已填写回邮地址)"),
EVALUATION_SUCCESS_COMPLETED(11, "价格不满意(已完成)");
private final Integer num;
private final String description;
CueOrderStatus(Integer num, String description) {
this.num = num;
this.description = description;
}
public Integer value() {
return num;
}
}

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

@ -6,13 +6,13 @@ import cn.hutool.core.util.ObjectUtil;
import com.tmerclub.cloud.api.coupon.feign.CouponFeignClient;
import com.tmerclub.cloud.api.delivery.dto.CurOderReturnsDTO;
import com.tmerclub.cloud.api.delivery.feign.DeliveryFeignClient;
import com.tmerclub.cloud.api.order.constant.OrderStatus;
import com.tmerclub.cloud.api.order.dto.SaveOrderToMallDTO;
import com.tmerclub.cloud.api.order.feign.OrderAddrFeignClient;
import com.tmerclub.cloud.api.order.feign.OrderFeignClient;
import com.tmerclub.cloud.api.user.feign.UserAddrFeignClient;
import com.tmerclub.cloud.api.user.feign.UserBalanceLogFeignClient;
import com.tmerclub.cloud.common.exception.LuckException;
import com.tmerclub.cloud.common.local.constant.CueOrderStatus;
import com.tmerclub.cloud.common.order.vo.OrderAddrVO;
import com.tmerclub.cloud.common.order.vo.UserAddrVO;
import com.tmerclub.cloud.common.response.ServerResponseEntity;
@ -69,7 +69,7 @@ public class CreateOrderManager {
public Long saveOrder(CreateOrderDTO createOrderDTO) {
// 保存订单信息
CueOrder cueOrder = BeanUtil.toBean(createOrderDTO, CueOrder.class);
cueOrder.setOrderStatus(CueOrderStatus.PENDING_AUDIT.value());
cueOrder.setOrderStatus(OrderStatus.CUE_PENDING_AUDIT.value());
cueOrder.setCreateTime(DateUtil.date());
cueOrderMapper.save(cueOrder);
return cueOrder.getOrderId();
@ -129,13 +129,13 @@ public class CreateOrderManager {
throw new LuckException("订单不存在,请检查!");
}
// 判断状态是否允许修改
if (!Objects.equals(cueOrderVO.getOrderStatus(), CueOrderStatus.EVALUATION_SUCCESS.value())) {
if (!Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) {
throw new LuckException("状态已变更,请检查!");
}
CueOrder cueOrder = new CueOrder();
cueOrder.setOrderId(cueAgreeOrderDTO.getOrderId());
cueOrder.setCueOrderType(cueAgreeOrderDTO.getCueOrderType());
cueOrder.setOrderStatus(CueOrderStatus.EVALUATION_SUCCESS_PAY.value());
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_PAY.value());
cueOrder.setUpdateTime(DateUtil.date());
cueOrder.setFinallyTime(DateUtil.date());
cueOrder.setIsPayed(1);
@ -164,7 +164,7 @@ public class CreateOrderManager {
throw new LuckException("订单类型错误,请检查!");
}
cueOrderMapper.update(cueOrder);
this.updateOrderMall(cueOrderVO.getShopId(), cueOrderVO.getMallOrderId(), CueOrderStatus.EVALUATION_FAIL.value());
this.updateOrderMall(cueOrderVO.getShopId(), cueOrderVO.getMallOrderId(), OrderStatus.SUCCESS.value());
}
/**
@ -181,7 +181,7 @@ public class CreateOrderManager {
}
// 两种情况会导致退货 5不合格 6价格不满意
// 检查当前状态
if (!Objects.equals(cueOrderVO.getOrderStatus(), CueOrderStatus.EVALUATION_FAIL.value()) || !Objects.equals(cueOrderVO.getOrderStatus(), CueOrderStatus.EVALUATION_SUCCESS.value())) {
if (!Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL.value()) || !Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) {
throw new LuckException("状态已变更,请检查!");
}
@ -198,10 +198,10 @@ public class CreateOrderManager {
cueOrder.setOrderAddrId(longServerResponseEntity.getData());
}
}
if (Objects.equals(cueOrderVO.getOrderStatus(), CueOrderStatus.EVALUATION_SUCCESS.value())) {
cueOrder.setOrderStatus(CueOrderStatus.EVALUATION_SUCCESS_PRICE_DISCONTENT.value());
if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) {
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value());
} else {
cueOrder.setOrderStatus(CueOrderStatus.EVALUATION_SUCCESS_COMPLETED.value());
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value());
}
cueOrder.setUpdateTime(DateUtil.date());
@ -219,7 +219,7 @@ public class CreateOrderManager {
if (ObjectUtil.isNull(cueOrderVO)) {
throw new LuckException("订单不存在,请检查!");
}
if (!Objects.equals(cueOrderVO.getOrderStatus(), CueOrderStatus.EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value()) || !Objects.equals(cueOrderVO.getOrderStatus(), CueOrderStatus.EVALUATION_SUCCESS_PRICE_DISCONTENT.value())) {
if (!Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value()) || !Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value())) {
throw new LuckException("状态已变更,请检查!");
}
CueOrder cueOrder = new CueOrder();
@ -234,13 +234,12 @@ public class CreateOrderManager {
ServerResponseEntity<String> stringServerResponseEntity = deliveryFeignClient.curOderReturns(curOderReturnsDTO);
if (stringServerResponseEntity.isSuccess()) {
cueOrder.setBackTrackingNumber(stringServerResponseEntity.getData());
}
// 判断状态
if (Objects.equals(cueOrderVO.getOrderStatus(), CueOrderStatus.EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value())) {
cueOrder.setOrderStatus(CueOrderStatus.EVALUATION_FAIL_COMPLETED.value());
if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value())) {
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_FAIL_COMPLETED.value());
} else {
cueOrder.setOrderStatus(CueOrderStatus.EVALUATION_SUCCESS_COMPLETED.value());
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value());
}
cueOrderMapper.update(cueOrder);
}

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

@ -2,13 +2,13 @@ package com.tmerclub.cloud.cuerecycle.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.tmerclub.cloud.api.order.constant.OrderStatus;
import com.tmerclub.cloud.common.constant.Constant;
import com.tmerclub.cloud.common.constant.SendTypeEnum;
import com.tmerclub.cloud.common.database.dto.PageDTO;
import com.tmerclub.cloud.common.database.util.PageUtil;
import com.tmerclub.cloud.common.database.vo.PageVO;
import com.tmerclub.cloud.common.exception.LuckException;
import com.tmerclub.cloud.common.local.constant.CueOrderStatus;
import com.tmerclub.cloud.common.order.vo.SendNotifyBO;
import com.tmerclub.cloud.common.response.ResponseEnum;
import com.tmerclub.cloud.common.rocketmq.config.RocketMqConstant;
@ -70,7 +70,7 @@ public class CueOrderServiceImpl implements CueOrderService {
CueOrder cueOrder = new CueOrder();
cueOrder.setOrderId(cueOrderDTO.getOrderId());
cueOrder.setOrderStatus(cueOrderDTO.getOrderStatus());
if (Objects.equals(cueOrderDTO.getOrderStatus(), CueOrderStatus.AUDIT_PASS.value())) {
if (Objects.equals(cueOrderDTO.getOrderStatus(), OrderStatus.CUE_AUDIT_PASS.value())) {
cueOrder.setEstimatedAmount(cueOrderDTO.getEstimatedAmount());
}
cueOrder.setUpdateTime(DateUtil.date());
@ -84,7 +84,7 @@ public class CueOrderServiceImpl implements CueOrderService {
CueOrder cueOrder = new CueOrder();
cueOrder.setOrderId(cueOrderDTO.getOrderId());
cueOrder.setOrderStatus(cueOrderDTO.getOrderStatus());
if (Objects.equals(cueOrderDTO.getOrderStatus(), CueOrderStatus.EVALUATION_SUCCESS.value())) {
if (Objects.equals(cueOrderDTO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) {
cueOrder.setActualAmount(cueOrderDTO.getActualAmount());
// 寄售需要填写服务费和佣金
if (cueOrderDTO.getCueOrderType().equals(3)) {
@ -134,10 +134,10 @@ public class CueOrderServiceImpl implements CueOrderService {
@Override
public int saveMailing(CueSaveMailingDTO cueSaveMailingDTO) {
// 修改系统订单的状态
createOrderManager.updateOrderMall(null, cueSaveMailingDTO.getMallOrderId(), CueOrderStatus.FINISH_DELIVERY.value());
createOrderManager.updateOrderMall(null, cueSaveMailingDTO.getMallOrderId(), OrderStatus.CUE_FINISH_DELIVERY.value());
// 修改回收单状态
CueOrder cueOrder = BeanUtil.toBean(cueSaveMailingDTO, CueOrder.class);
cueOrder.setOrderStatus(CueOrderStatus.FINISH_DELIVERY.value());
cueOrder.setOrderStatus(OrderStatus.CUE_FINISH_DELIVERY.value());
cueOrder.setDeliveryTime(DateUtil.date());
return cueOrderMapper.update(cueOrder);
}

12
tmerclub-order/src/main/java/com/tmerclub/cloud/order/feign/OrderFeignController.java
View File

@ -21,7 +21,6 @@ import com.tmerclub.cloud.common.constant.Constant;
import com.tmerclub.cloud.common.exception.LuckException;
import com.tmerclub.cloud.common.i18n.LanguageEnum;
import com.tmerclub.cloud.common.leaf.manager.SegmentManager;
import com.tmerclub.cloud.common.local.constant.CueOrderStatus;
import com.tmerclub.cloud.api.order.dto.SaveOrderToMallDTO;
import com.tmerclub.cloud.common.order.bo.EsOrderBO;
import com.tmerclub.cloud.common.order.bo.OrderIdWithRefundIdBO;
@ -565,9 +564,9 @@ public class OrderFeignController implements OrderFeignClient {
// order
Order order = new Order();
order.setUserId(saveOrderToMallDTO.getUserId());
order.setTotal(saveOrderToMallDTO.getEstimatedAmount());
order.setActualTotal(saveOrderToMallDTO.getEstimatedAmount());
order.setStatus(CueOrderStatus.PENDING_AUDIT.value());
order.setTotal(-saveOrderToMallDTO.getEstimatedAmount());
order.setActualTotal(-saveOrderToMallDTO.getEstimatedAmount());
order.setStatus(OrderStatus.CUE_PENDING_AUDIT.value());
order.setAllCount(1);
order.setOrderType(OrderType.RECYCLE.value());
order.setOrderId(segmentManager.getSegmentIdWithDateTime(DistributedIdKey.tmerclub_ORDER, order.getUserId()));
@ -604,6 +603,11 @@ public class OrderFeignController implements OrderFeignClient {
order.setOrderId(mallOrderId);
order.setStatus(orderStatus);
order.setShopId(shopId);
if(orderStatus.equals(OrderStatus.CUE_EVALUATION_SUCCESS_PAY.value())){
// 订单已完成
order.setIsSettled(0);
order.setFinallyTime(new Date());
}
orderMapper.updateCueOrder(order);
}
}

6
tmerclub-order/src/main/resources/mapper/OrderMapper.xml
View File

@ -1350,6 +1350,12 @@
<if test="shopId != null">
`shop_id` = #{shopId},
</if>
<if test="isSettled != null">
`is_settled` = #{isSettled},
</if>
<if test="finallyTime != null">
`finally_time` = #{finallyTime},
</if>
</set>
where
order_id = #{orderId}