xuhy
2025-04-22 c0be2dfc249f99c2dd411a0da24b1aa70356a5c5
2.0迭代
2个文件已修改
28 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Prize.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Prize.java
@@ -38,5 +38,7 @@
    @ApiModelProperty("中奖概率")
    @TableField("probability")
    private Double probability;
    @ApiModelProperty("类型 1=补贴金 2=奖品")
    @TableField("prize_type")
    private Integer prizeType;
}
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java
@@ -187,6 +187,30 @@
        return R.ok(orderClient.supplementAllowance(orderId, prizeMoney).getData());
    }
    /**
     * 分享获取津贴
     *
     * @return 奖品列表
     */
    @GetMapping("/shareAllowanceMoney")
    @ApiOperation(value = "分享获取津贴", tags = {"用户端-订单"})
    public R<Object> shareAllowanceMoney(@RequestParam("orderId") String orderId, @RequestParam("prizeId") String prizeId) {
        Prize data = adminClient.prizeDetail(prizeId).getData();
        if (null == data) {
            return R.fail(adminClient.prizeDetail(prizeId).getMsg());
        }
        if(Objects.isNull(data.getPrizeType()) || data.getPrizeType() == 2){
            return R.fail("该津贴为非补贴金类型");
        }
        String prizeMoney;
        if (data.getPrizeType()==1) {
            prizeMoney = data.getPrizeName().substring(Constants.ONE);
        } else {
            prizeMoney = "0";
        }
        return R.ok(orderClient.supplementAllowance(orderId, prizeMoney).getData());
    }
    @PostMapping("/orderEstimate")
    @ApiOperation(value = "下单评估,生成预订单信息", tags = {"用户端-订单"})
    public R<String> orderEstimate(@RequestBody OrderRequest orderRequest) {