Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-02-19 c977f0e2fd86ca3e9e3ad3961f702206c41d2767

 server/web/src/main/java/com/doumee/api/web/BusinessApi.java

@@ -12,6 +12,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.BackElecBikeRequest;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
import com.doumee.dao.system.model.SystemDictData;
@@ -67,6 +68,9 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private DiscountService discountService;

    @PreventRepeat
    @LoginRequired
    @ApiOperation(value = "押金支付", notes = "小程序端")
@@ -77,6 +81,20 @@
    public ApiResponse<Object> createGoodsOrderPay() {
        return  ApiResponse.success("操作成功",goodsorderService.createGoodsOrderPay(getMemberId()));
    }

    @PreventRepeat
    @LoginRequired
    @ApiOperation(value = "套餐购买", notes = "小程序端")
    @GetMapping("/createDiscountOrderPay")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "discountId", value = "套餐主键", required = true)
    })
    public ApiResponse<Object> createDiscountOrderPay(@RequestParam String discountId) {
        return  ApiResponse.success("操作成功",goodsorderService.createDiscountOrderPay(discountId,getMemberId()));
    }



    @LoginRequired
    @ApiOperation(value = "骑行明细", notes = "小程序端")
@@ -112,6 +130,24 @@
        return ApiResponse.success(transactionsService.findPageForMini(pageWrap,getMemberId()));
    }



    @LoginRequired
    @ApiOperation(value = "热销套餐", notes = "热销套餐")
    @GetMapping("/discountPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<PageData<Discount>> discountPage (@RequestBody PageWrap<Discount> pageWrap) {
        Discount discount = new Discount();
        discount.setStatus(Constants.ZERO);
        pageWrap.setModel(discount);
        return ApiResponse.success(discountService.findPage(pageWrap));
    }




    @LoginRequired
    @ApiOperation("基础配置数据")
    @GetMapping("/baseParamList")