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,11 +92,8 @@
    @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();
@@ -131,7 +128,7 @@
            userRedPacketRecord.setRemainingAmount(money);
            userRedPacketRecord.setInsertTime(new Date());
            userRedPacketRecord.setCompanyId(1);
            userRedPacketRecord.setState(0);
            userRedPacketRecord.setState(1);
            userRedPacketRecord.setOrderId(null);
            userRedPacketRecord.setRedPacketActivityId(redId);
//            userRedPacketRecord.setOrderType(3);