backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: backend:d7793cc24febfa42d14b2c113b9f9d032e6fccf7
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0
..
compare: backend:7ae10a84d37ad54c88116053e107ea73ce352982
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0

No commits in common. "d7793cc24febfa42d14b2c113b9f9d032e6fccf7" and "7ae10a84d37ad54c88116053e107ea73ce352982" have entirely different histories.
d7793cc24f ... 7ae10a84d3

1 changed files with 9 additions and 10 deletions
Show Stats Expand all files Collapse all files

19
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
View File

@ -903,15 +903,6 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
*
* @param orderId
* @param returnFlag 退货类型(ENUM): 0-不用退货;1-需要退货
* <p>
* RETURN_PROCESS_SUBMIT = 3100; //【客户】提交退单1ReturnReturn
* RETURN_PROCESS_CHECK = 3105; //退单审核1ReturnReturn
* RETURN_PROCESS_RECEIVED = 3110; //收货确认0ReturnReturn
* RETURN_PROCESS_REFUND = 3115; //退款确认0ReturnReturn
* RETURN_PROCESS_RECEIPT_CONFIRMATION = 3120; //[【客户】收款确认0 ReturnReturn
* RETURN_PROCESS_FINISH = 3125; //完成1退货退款
* RETURN_PROCESS_REFUSED = 3130; //-商家拒绝退货
* RETURN_PROCESS_CANCEL = 3135; //-买家取消退款
* @return
*/
@GlobalTransactional
@ -931,6 +922,14 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
returnFlag = CheckUtil.isEmpty(returnFlag) ? 0 : returnFlag;
// RETURN_PROCESS_SUBMIT = 3100; //【客户】提交退单1ReturnReturn
// RETURN_PROCESS_CHECK = 3105; //退单审核1ReturnReturn
// RETURN_PROCESS_RECEIVED = 3110; //收货确认0ReturnReturn
// RETURN_PROCESS_REFUND = 3115; //退款确认0ReturnReturn
// RETURN_PROCESS_RECEIPT_CONFIRMATION = 3120; //[【客户】收款确认0 ReturnReturn
// RETURN_PROCESS_FINISH = 3125; //完成1退货退款
// RETURN_PROCESS_REFUSED = 3130; //-商家拒绝退货
// RETURN_PROCESS_CANCEL = 3135; //-买家取消退款
List<String> return_ids = Collections.singletonList(shopOrderReturn.getReturn_id());
@ -1040,7 +1039,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
order_item_row.setOrder_item_return_num(order_item_row.getOrder_item_return_num() + return_item_num);
order_item_row.setOrder_item_return_subtotal(NumberUtil.add(order_item_row.getOrder_item_return_subtotal(), return_item_subtotal));
// 乐观锁
// order_item_row.setVersion(Optional.ofNullable(order_item_row.getVersion()).orElse(0) + 1);
order_item_row.setVersion(Optional.ofNullable(order_item_row.getVersion()).orElse(0) + 1);
if (!shopOrderItemService.edit(order_item_row)) {
throw new ApiException(I18nUtil._("修改订单信息失败！"));
}