Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 27b2410ba89a2c73097f7f901fb9bc1c72913a3b

Merge branch 'master' into master-v2

# Conflicts:
#	src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java

 src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java

@@ -756,7 +756,7 @@

                detail.setOrderId(oi.getOrderId());
                detail.setOrderItemId(itemId);
                detail.setPrice(oi.getMarkupPartner());
                detail.setPrice(getAmount(oi.getMarkupPartner()));
                detail.setNum(oi.getNum());
                detail.setTotalAmount(detail.getPrice().multiply(new BigDecimal(detail.getNum())));
                detail.setCheckFee(new BigDecimal(0));

 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,11 @@
        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){
        return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckLocationList(dto));
    }
}