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

luodangjia

2024-07-17 40bc5a67fe0fa6a01711b7b7a12e38a6272510a8

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

@@ -643,7 +643,7 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());

            res.add(grantVO);
        }
        for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
            if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
@@ -659,6 +659,7 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
            res.add(grantVO);
        }
        // 查询已领取红包总额
        for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) {