From 62d15798697cc6afdb02a0e0a893baadb9e66044 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期四, 29 八月 2024 21:24:25 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 11 +++++++++--
src/main/java/com/mzl/flower/web/init/InitResource.java | 4 ++--
src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java | 20 ++++++++++++++------
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 9 ++++++---
src/main/resources/mapper/flower/FlowerParamMapper.xml | 2 +-
5 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index 41ad60b..944ca71 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -601,8 +601,9 @@
throw new ValidationException("降级金额不能为空");
}
deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
- if(deduct.doubleValue() > oi.getTotal().doubleValue()){
- throw new ValidationException("降级金额不能大于商品总金额");
+ BigDecimal dt = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
+ if(deduct.doubleValue() > dt.doubleValue()){
+ throw new ValidationException("降级金额不能大于商品处理数量金额");
}
}
@@ -639,7 +640,7 @@
}
}
- public void checkOrderItemStatus(String id){
+ public String checkOrderItemStatus(String id){
OrderItem oi = orderItemMapper.selectById(id);
List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
.eq("order_item_id", id)
@@ -670,6 +671,8 @@
deliveryOrderMapper.updateById(d);
}
}
+
+ return oi.getOrderId();
}
public void deleteCheckInfo(String itemId, String type){
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
index 3a8cc6e..c4f3079 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -88,7 +88,9 @@
String userId = SecurityUtils.getUserId();
int count = orderItemSalesMapper.selectCount(new QueryWrapper<OrderItemSales>()
- .eq("order_item_id", oi.getId()));
+ .eq("order_item_id", oi.getId())
+ .eq("status", Constants.ORDER_SALES_STATUS.AGREED.name())
+ );
if(count >= 2){
throw new ValidationException("售后申请超过限额");
}
@@ -305,6 +307,11 @@
BigDecimal totalFee = feeSupplier.add(feePartner).add(feePlatform).add(feePlatformPack)
.add(feePlatformCheck).add(feePlatformTransport);
+ BigDecimal st = oi.getPrice().multiply(new BigDecimal(sl.getNum()));//申请售后的花的金额
+ if(totalFee.doubleValue() > st.doubleValue()){
+ throw new ValidationException("退款金额不能大于商品申请数量的售价");
+ }
+
List<OrderItemSales> ls = orderItemSalesMapper.selectList(new QueryWrapper<OrderItemSales>()
.eq("order_item_id", oi.getId())
.eq("status", Constants.ORDER_SALES_STATUS.AGREED.name())
@@ -317,7 +324,7 @@
}
preFee = preFee.add(totalFee);
if(preFee.doubleValue() > oi.getTotal().doubleValue()){
- throw new ValidationException("退款金额不能大于商品总价");
+ throw new ValidationException("退款总金额不能大于商品总价");
}
sl.setRemarks(dto.getRemarks());
diff --git a/src/main/java/com/mzl/flower/web/init/InitResource.java b/src/main/java/com/mzl/flower/web/init/InitResource.java
index 75ff2dd..256b725 100644
--- a/src/main/java/com/mzl/flower/web/init/InitResource.java
+++ b/src/main/java/com/mzl/flower/web/init/InitResource.java
@@ -36,7 +36,7 @@
return returnData(R.SUCCESS.getCode(), null);
}
- @GetMapping("/callback")
+ /*@GetMapping("/callback")
public ResponseEntity<ReturnDataDTO> callback(String orderId) {
String originalXml = "";
UserPaymentDTO dto = new UserPaymentDTO();
@@ -50,5 +50,5 @@
userPaymentV3Service.saveCallbackInfo(dto, Constants.ORDER_STATUS_BACKEND.PAYMENT.name());
return returnData(R.SUCCESS.getCode(), null);
- }
+ }*/
}
diff --git a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
index 9b635a2..2af2b28 100644
--- a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
@@ -242,7 +242,8 @@
@ApiOperation(value = "降级操作")
public ResponseEntity<ReturnDataDTO> doReduceCheck(@RequestBody OrderItemCheckCommitReduceDTO dto) {
deliveryOrderService.doReduceCheck(dto);
- deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+ String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+ deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -251,7 +252,8 @@
public ResponseEntity<ReturnDataDTO> doReplaceCheck(@RequestBody OrderItemCheckCommitDTO dto) {
dto.setType(Constants.CHECK_TYPE.replace.name());
deliveryOrderService.doCheck(dto, null, null, null);
- deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+ String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+ deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -260,7 +262,8 @@
public ResponseEntity<ReturnDataDTO> doLackCheck(@RequestBody OrderItemCheckCommitDTO dto) {
dto.setType(Constants.CHECK_TYPE.lack.name());
deliveryOrderService.doCheck(dto, null, null, null);
- deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+ String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+ deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -268,7 +271,8 @@
@ApiOperation(value = "删除降级信息")
public ResponseEntity<ReturnDataDTO> deleteReduce(String orderItemId){
deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.reduce.name());
- deliveryOrderService.checkOrderItemStatus(orderItemId);
+ String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
+ deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -276,7 +280,8 @@
@ApiOperation(value = "删除补货信息")
public ResponseEntity<ReturnDataDTO> deleteReplace(String orderItemId){
deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.replace.name());
- deliveryOrderService.checkOrderItemStatus(orderItemId);
+ String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
+ deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -284,7 +289,8 @@
@ApiOperation(value = "删除缺货信息")
public ResponseEntity<ReturnDataDTO> deleteLack(String orderItemId){
deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.lack.name());
- deliveryOrderService.checkOrderItemStatus(orderItemId);
+ String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
+ deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -292,6 +298,8 @@
@ApiOperation(value = "完成商品质检")
public ResponseEntity<ReturnDataDTO> setCheckOk(String orderItemId){
deliveryOrderService.setCheckOk(orderItemId);
+ String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
+ deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
}
diff --git a/src/main/resources/mapper/flower/FlowerParamMapper.xml b/src/main/resources/mapper/flower/FlowerParamMapper.xml
index 8c289e3..b1dd03e 100644
--- a/src/main/resources/mapper/flower/FlowerParamMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerParamMapper.xml
@@ -18,7 +18,7 @@
COMMENT #{field.comment}
</if>
</foreach>
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT=#{table.label}
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=#{table.label}
</update>
<select id="selectParamList" resultType="com.mzl.flower.dto.response.flower.FlowerParamListDTO">
--
Gitblit v1.9.3