From bb843532217cdf2df68f0d719612e70c599ed7d5 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 九月 2024 10:13:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/flowerbackend-v2
---
src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java | 2 +-
src/main/resources/mapper/flower/FlowerMapper.xml | 2 +-
src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java | 12 ++++++++----
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java | 7 ++++---
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
index 3d630d4..e645d58 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -125,11 +125,12 @@
lackNum = num == null ? 0 : num;
lackFeeSupplier = oi.getSupplierPrice().multiply(new BigDecimal(lackNum));
- BigDecimal markupPartner = oi.getMarkupPartner() == null ? new BigDecimal(0) : oi.getMarkupPartner();
+ BigDecimal markupPartner = getAmount(oi.getMarkupPartner());
lackFeePartner = markupPartner.multiply(new BigDecimal(lackNum));
- BigDecimal markupTwo = oi.getMarkupTwo() == null ? new BigDecimal(0) : oi.getMarkupTwo();
- lackFeePlatform = oi.getMarkupOne().multiply(new BigDecimal(lackNum));
+ BigDecimal markupOne = getAmount(oi.getMarkupOne());
+ BigDecimal markupTwo = getAmount(oi.getMarkupTwo());
+ lackFeePlatform = markupOne.multiply(new BigDecimal(lackNum));
lackFeePlatform = lackFeePlatform.add(markupTwo.multiply(new BigDecimal(lackNum)));
} else if (Constants.CHECK_TYPE.replace.name().equals(type)) {
replaceNum = num == null ? 0 : num;
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
index 49100ed..02cb428 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
+++ b/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));
diff --git a/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java b/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
index 396fa80..7cbfdff 100644
--- a/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
+++ b/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));
+ }
}
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 8c60d42..3cb549a 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -328,7 +328,7 @@
</choose>
</when>
<otherwise>
- order by c.create_time desc
+ order by c.update_time desc
</otherwise>
</choose>
</select>
--
Gitblit v1.9.3