czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

管理端 回显店铺信息

Browse Source
This commit is contained in:
wangw
2025-12-12 13:40:38 +08:00
parent 2fb8cfe878
commit 48181a0929
8 changed files with 127 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java
View File

@@ -6,7 +6,6 @@ import com.czg.log.annotation.OperationLog;
import com.czg.market.dto.MkPointsGoodsRecordDTO;
import com.czg.market.dto.MkPointsGoodsRecordQueryDTO;
import com.czg.market.service.MkPointsGoodsRecordService;
import com.czg.market.service.MkPointsGoodsService;
import com.czg.order.dto.PointGoodsRefundDTO;
import com.czg.order.service.PointsGoodPayService;
import com.czg.resp.CzgResult;
@@ -29,8 +28,6 @@ public class PointsGoodsRecordController {
@Resource
private MkPointsGoodsRecordService goodsRecordService;
@Resource
private MkPointsGoodsService pointsGoodsService;
@Resource
private PointsGoodPayService goodPayService;
/**
@@ -72,7 +69,7 @@ public class PointsGoodsRecordController {
*/
@PostMapping("/agreeRefund")
public CzgResult<Boolean> agreeRefund(@RequestBody @Validated PointGoodsRefundDTO param) {
return CzgResult.success(goodPayService.applyRefund(param, StpKit.USER.getShopId()));
return CzgResult.success(goodPayService.agreeRefund(param, StpKit.USER.getShopId()));
}
/**
@@ -80,7 +77,7 @@ public class PointsGoodsRecordController {
*/
@PostMapping("/rejectRefund")
public CzgResult<Boolean> rejectRefund(@RequestBody @Validated PointGoodsRefundDTO param) {
return CzgResult.success(pointsGoodsService.cancelRefund(param, null, StpKit.USER.getShopId()));
return CzgResult.success(goodPayService.cancelRefund(param, null, StpKit.USER.getShopId()));
}
}

6
cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
View File

@@ -68,7 +68,7 @@ public class UPointGoodsController {
*/
@PostMapping("/applyRefund")
public CzgResult<Boolean> applyRefund(@RequestBody @Validated PointGoodsRefundDTO param) {
return CzgResult.success(pointsGoodsService.applyRefund(param, StpKit.USER.getLoginIdAsLong()));
return CzgResult.success(goodPayService.applyRefund(param, StpKit.USER.getLoginIdAsLong()));
}
/**
@@ -76,7 +76,7 @@ public class UPointGoodsController {
*/
@PostMapping("/cancelRefund")
public CzgResult<Boolean> cancelRefund(@RequestBody @Validated PointGoodsRefundDTO param) {
return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong(), null));
return CzgResult.success(goodPayService.cancelRefund(param, StpKit.USER.getLoginIdAsLong(), null));
}
/**
@@ -87,7 +87,7 @@ public class UPointGoodsController {
@RequestParam(defaultValue = "10", required = false) int size,
@RequestParam(required = false) String status,
@RequestParam Long shopId) {
Page<MkPointsGoodsRecord> pages = pointsGoodsService.getGoodsRecordPage(page, size, shopId, status, StpKit.USER.getLoginIdAsLong());
Page<MkPointsGoodsRecord> pages = goodsRecordService.userGoodsRecordPage(page, size, shopId, status, StpKit.USER.getLoginIdAsLong());
return CzgResult.success(pages);
}