bug修改 全部代码提交

无关风月

2026-01-06 db5ea69bd9bfca00e72c3d8d3a80bb5db991c75d

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java

@@ -44,22 +44,23 @@
    private StoreClient storeClient;
    @Resource
    private UserPointsMerchandiseService userPointsMerchandiseService;
//    @GetMapping("/grantTicket")
//    public void grantTicket(Integer userId, Integer id) throws Exception {
//        UserPointsMerchandise userPointsMerchandise = new UserPointsMerchandise();
//        userPointsMerchandise.setPointsMerchandiseId(id);
//        userPointsMerchandise.setUserId(userId);
//        userPointsMerchandise.setStatus(1);
//        userPointsMerchandise.setInsertTime(new Date());
//     947024   userPointsMerchandise.setPayType(1);
//        userPointsMerchandise.setGoodsNumber(1);
//        userPointsMerchandise.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
//        userPointsMerchandise.setPayStatus(2);
//        userPointsMerchandise.setState(1);
//        userPointsMerchandise.setCashPayType(1);
//        userPointsMerchandise.setPaymentTime(new Date());
//        userPointsMerchandiseService.save(userPointsMerchandise);
//    }
    // 补偿接口 赠送门票
    @GetMapping("/grantTicket")
    public void grantTicket(Integer userId, Integer id) throws Exception {
        UserPointsMerchandise userPointsMerchandise = new UserPointsMerchandise();
        userPointsMerchandise.setPointsMerchandiseId(id);
        userPointsMerchandise.setUserId(userId);
        userPointsMerchandise.setStatus(1);
        userPointsMerchandise.setInsertTime(new Date());
        userPointsMerchandise.setPayType(1);
        userPointsMerchandise.setGoodsNumber(1);
        userPointsMerchandise.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
        userPointsMerchandise.setPayStatus(2);
        userPointsMerchandise.setState(1);
        userPointsMerchandise.setCashPayType(1);
        userPointsMerchandise.setPaymentTime(new Date());
        userPointsMerchandiseService.save(userPointsMerchandise);
    }
    /**
     * 硬件开门后回调 存储玩湃惠民卡使用记录
     */