Merge remote-tracking branch 'origin/master-v2'

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

 src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java

@@ -6,10 +6,7 @@
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.dto.request.payment.OrderQueryDTO;
import com.mzl.flower.dto.response.partner.PartnerOrderDTO;
import com.mzl.flower.dto.response.payment.OrderCheckListDTO;
import com.mzl.flower.dto.response.payment.OrderDTO;
import com.mzl.flower.dto.response.payment.OrderItemListDTO;
import com.mzl.flower.dto.response.payment.OrderListDTO;
import com.mzl.flower.dto.response.payment.*;
import com.mzl.flower.entity.partner.Partner;
import com.mzl.flower.service.payment.OrderService;
import io.swagger.annotations.Api;
@@ -79,4 +76,13 @@
        dto.setPartnerId(partner.getId());
        return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckList(dto));
    }

    @PostMapping("/check/location/list")
    @ApiOperation(value = "查询订单清单列表-按库位分商品")
    public ResponseEntity<ReturnDataDTO<List<OrderCheckLocationListDTO>>> selectOrderCheckLocationList(
            @RequestBody OrderQueryDTO dto){
        Partner partner = orderService.getCurrentPartner();
        dto.setPartnerId(partner.getId());
        return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckLocationList(dto));
    }
}