czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单状态统一

This commit is contained in:
SongZhang 2024-10-29 17:21:50 +08:00
parent fe7e8d4ed9
commit d2e1174646
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java
View File

@ -10,7 +10,7 @@ public interface TableConstant {
@Getter @Getter
enum Status { enum Status {
REFUNDING("refunding"), REFUND("refund"), CLOSED("closed"), CREATE("create"), REFUNDING("refunding"), REFUND("refund"), CLOSED("closed"), CREATE("create"),
UNPAID("unpaid"), PAYING("paying"), RETURN("return"), CANCEL("cancel"); UNPAID("unpaid"), PAYING("paying"), RETURN("return"), CANCELLED("cancelled");
private final String value; private final String value;
Status(String value) { Status(String value) {
this.value = value; this.value = value;

6
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -518,10 +518,10 @@ public class OrderService {
// 检查购物车商品是否已经全部退款 // 检查购物车商品是否已经全部退款
if (!returnCashierCarts.isEmpty() && returnCashierCarts.size() == list.size()) { if (!returnCashierCarts.isEmpty() && returnCashierCarts.size() == list.size()) {
List<Integer> cartIds = returnCashierCarts.stream().map(TbCashierCart::getId).collect(Collectors.toList()); List<Integer> cartIds = returnCashierCarts.stream().map(TbCashierCart::getId).collect(Collectors.toList());
mpCashierCartService.updateStateByIds(Integer.valueOf(shopId), cartIds, TableConstant.Status.CANCEL); mpCashierCartService.updateStateByIds(Integer.valueOf(shopId), cartIds, TableConstant.Status.CLOSED);
mpOrderDetailService.updateStateByCartIds(Integer.valueOf(shopId), cartIds, TableConstant.Status.CANCEL); mpOrderDetailService.updateStateByCartIds(Integer.valueOf(shopId), cartIds, TableConstant.Status.CLOSED);
if (StrUtil.isNotBlank(orderId)) { if (StrUtil.isNotBlank(orderId)) {
mpOrderInfoService.updateStateById(Integer.valueOf(shopId), Integer.valueOf(orderId), TableConstant.Status.CANCEL); mpOrderInfoService.updateStateById(Integer.valueOf(shopId), Integer.valueOf(orderId), TableConstant.Status.CANCELLED);
} }
String finalMasterId = masterId; String finalMasterId = masterId;