hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-15 10:41:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

Browse Source 
# Conflicts:
#	sql/mysql/mall.sql
This commit is contained in:
owen
2023-10-17 23:29:11 +08:00
parent 0612a13cce 5842a361e2
commit 0c4713b7e0
24 changed files with 811 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
View File

@@ -143,7 +143,7 @@ public class TradeOrderController {
@Parameter(name = "id", description = "交易订单编号")
@PreAuthorize("@ss.hasPermission('trade:order:pick-up')")
public CommonResult<Boolean> pickUpOrderById(@RequestParam("id") Long id) {
tradeOrderUpdateService.pickUpOrderByMember(id);
tradeOrderUpdateService.pickUpOrderByAdmin(id);
return success(true);
}

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
View File

@@ -122,7 +122,7 @@ public interface TradeOrderUpdateService {
*
* @param id 订单编号
*/
void pickUpOrderByMember(Long id);
void pickUpOrderByAdmin(Long id);
/**
* 【管理员】核销订单

4
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
View File

@@ -669,8 +669,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
}
@Override
@TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_PICK_UP_RECEIVE)
public void pickUpOrderByMember(Long id) {
@TradeOrderLog(operateType = TradeOrderOperateTypeEnum.ADMIN_PICK_UP_RECEIVE)
public void pickUpOrderByAdmin(Long id) {
getSelf().pickUpOrder(tradeOrderMapper.selectById(id));
}