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

luodangjia

2024-07-22 eeebf2d723433f916ba9c33cce92431165dd64c7

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java

@@ -92,17 +92,29 @@
    @RequestMapping(value = "/direct")
    @ResponseBody
    public ResultUtil direct(String ids, Integer redId) {

        System.err.println("========="+ids+"======="+redId);
        Double money = 0D;


        SysRedPacketRecord sysRedPacketRecord = sysRedPacketRecordService.selectById(redId);
        if(null != sysRedPacketRecord){
            Integer type = sysRedPacketRecord.getType();
            if(type == 1){//固定金额
                money = Double.valueOf(String.valueOf(sysRedPacketRecord.getMoney()));
            }else{//随机金额
            }

//            else{//随机金额
//                Double startMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getStartMoney()));
//                Double endMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getEndMoney()));
//                int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
//                Random random = new Random();
//                int num = random.nextInt(i);
//                money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
//            }

        }
        String[] split = ids.split(",");
        for (String s : split) {
        if(money > 0){
            if (sysRedPacketRecord.getType()!=1){
                Double startMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getStartMoney()));
                Double endMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getEndMoney()));
                int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
@@ -110,19 +122,16 @@
                int num = random.nextInt(i);
                money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
            }

        }
        String[] split = ids.split(",");
        for (String s : split) {
        if(money > 0){
            //添加临时红包数据
            UserRedPacketRecord userRedPacketRecord = new UserRedPacketRecord();
            userRedPacketRecord.setMoney(money);
            userRedPacketRecord.setRemainingAmount(money);
            userRedPacketRecord.setInsertTime(new Date());
            userRedPacketRecord.setCompanyId(1);
            userRedPacketRecord.setState(0);
            userRedPacketRecord.setState(1);
            userRedPacketRecord.setOrderId(null);
            userRedPacketRecord.setOrderType(3);
            userRedPacketRecord.setRedPacketActivityId(redId);
//            userRedPacketRecord.setOrderType(3);
            userRedPacketRecord.setUserId(Integer.valueOf(s));
            userRedPacketRecordService.insert(userRedPacketRecord);
        }