Merge remote-tracking branch 'origin/master'

xuhy

2024-05-28 5470d21a35286abe41fafc25a7deaabefd7c55da

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/RedEnvelopeController.java

@@ -8,7 +8,9 @@
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.TravelRecordWarpper;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.transfer.server.IOrderTransferService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -46,6 +48,9 @@

    @Autowired
    private IOrderCrossCityService orderCrossCityService;

    @Autowired
    private IOrderTransferService orderTransferService;


    /**
@@ -112,8 +117,11 @@
            List<Map<String, Object>> list = orderPrivateCarService.queryRedEnvelope(uid);//专车
            List<Map<String, Object>> list1 = orderTaxiService.queryRedEnvelope(uid);//出租车
            List<Map<String, Object>> list2 = orderCrossCityService.queryRedEnvelope(uid);//跨城
            List<Map<String, Object>> list3 = orderTransferService.queryRedEnvelope(uid);//专车

            list.addAll(list1);
            list.addAll(list2);
            list.addAll(list3);

            List<TravelRecordWarpper> orderWarpper = TravelRecordWarpper.getTravelRecordWarpper(list);