订单支付修改

2025-09-27 19:52:19 +08:00
parent ab17010291
commit 8ec3fbd1f7
2 changed files with 6 additions and 1 deletions
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
@@ -40,7 +40,7 @@ public class UShopConsumeDiscountController {
     * @return 金额
     */
    @GetMapping
-    public CzgResult<MkShopConsumeDiscountRecord> get(@RequestParam Long shopId, @RequestParam Long orderId) {
+    public CzgResult<MkShopConsumeDiscountRecord> get(@RequestParam Long shopId, @RequestParam(required = false) Long orderId) {
 //        shopConsumeDiscountRecordService.useDiscount(null, null,null,null);
        return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, StpKit.USER.getLoginIdAsLong(), orderId));
    }