From 65ad99e0a5e47c2cfcfd9ceade7dc6f2b83bcbd2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 11 十月 2023 16:38:54 +0800
Subject: [PATCH] #pgsql 订单退款 结算退款 未消费结算
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 134 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 109 insertions(+), 25 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 7b24ac9..0c8f1e1 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -34,6 +34,7 @@
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
import com.doumee.service.business.PricingRuleService;
+import com.doumee.service.business.RefundService;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
@@ -100,6 +101,9 @@
@Autowired
PricingRuleService pricingRuleService;
+
+ @Autowired
+ RefundService refundService;
@Override
public String create(Goodsorder goodsorder) {
@@ -326,15 +330,16 @@
return goodsorderDetailDTO;
}
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
- public void closerGoodsorder(String id) {
+ public void closerGoodsorder(String orderId) {
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Goodsorder goodsorder = goodsorderMapper.selectById(id);
+ Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(MemberRides::getOrdreId,id);
+ .eq(MemberRides::getOrdreId,orderId);
List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
if (!CollectionUtils.isEmpty(memberRides)){
boolean exitUnBack = memberRides.stream().anyMatch(s -> !Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey().equals(s.getStatus()));
@@ -361,8 +366,10 @@
Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
if (durationSum > pricingRule.getMemberRides().getBaseTime()){
+ BigDecimal bigDecimal = new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime()));
BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
- BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())));
+ BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice()
+ .multiply(bigDecimal.divide(pricingRule.getMemberRides().getUnitPrice(),BigDecimal.ROUND_UP));
ridesDetailResponse.setAmount(basePrice.add(multiply));
}else {
ridesDetailResponse.setAmount(pricingRule.getMemberRides().getBasePrice());
@@ -371,36 +378,114 @@
ridesDetailResponse.setDuration(durationSum);
ridesDetailResponse.setMemberRidesResponseList(collect);
+ if(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())>Constants.ZERO){
- Refund refund = new Refund();
- refund.setCreateDate(new Date());
- refund.setCreator(principal.getId());
- refund.setEditDate(new Date());
- refund.setEditor(principal.getId());
- refund.setIsdeleted(Constants.ZERO);
- refund.setInfo("绯荤粺缁撶畻鍚庤鍗曡嚜鍔ㄥ畬缁�");
-// refund.setCode();
- refund.setMemberId(goodsorder.getMemberId());
- refund.setMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
-// refund.setStatus();
-// refund.setPreOrderid();
-// refund.setOnlineOrderid();
- refund.setPayWay(goodsorder.getPayWay());
- refund.setDoneDate(new Date());
- refund.setType(Constants.ONE);
- refund.setObjId(goodsorder.getId());
- refund.setReason("纭畾寮哄埗缁撶畻鍚楋紵缁撶畻鍚庤鍗曡嚜鍔ㄥ畬缁�");
- refundMapper.insert(refund);
+ RefundDTO refundDTO = new RefundDTO();
+ refundDTO.setOrderId(orderId);
+ refundDTO.setCanBalance(goodsorder.getMoney());
+ refundDTO.setRefundAmount(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
+ refundDTO.setTotalAmount(goodsorder.getMoney());
+ refundDTO.setMemberId(goodsorder.getMemberId());
+ refundDTO.setReason("骞冲彴寮哄埗缁撶畻閫�娆�");
+ refundDTO.setType(Constants.REFUND_TYPE.PLAT_AUTO.getKey());
+ Refund refund = wxMiniUtilService.wxRefund(refundDTO);
+
+ //瀛樺偍 娑堣垂浜ゆ槗娴佹按
+ Transactions transactions = new Transactions();
+ transactions.setMemberId(goodsorder.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(orderId);
+ transactions.setMoney(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())<=Constants.ZERO?goodsorder.getMoney():ridesDetailResponse.getAmount());
+ transactions.setType(Constants.transactionsType.consumption);
+ transactions.setDoneDate(new Date());
+ transactions.setTitle("娑堣垂缁撶畻");
+ transactions.setContent("缁撶畻瀹為檯娑堣垂");
+ transactions.setBalance(BigDecimal.ZERO);
+ transactions.setObjId(orderId);
+ transactions.setObjType(Constants.ONE);
+ transactionsMapper.insert(transactions);
+
+ Goodsorder update = new Goodsorder();
+ update.setId(goodsorder.getId());
+ update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
+ update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
+ update.setCloseId(refund.getId());
+ update.setCloseDate(refund.getDoneDate());
+ update.setCloseInfo(refund.getInfo());
+ update.setCloseUserId(principal.getId());
+ update.setCloseType(Constants.ONE);
+ goodsorderMapper.updateById(update);
+ }
+ }else {
+
+ RefundDTO refundDTO = new RefundDTO();
+ refundDTO.setOrderId(orderId);
+ refundDTO.setCanBalance(goodsorder.getMoney());
+ refundDTO.setRefundAmount(goodsorder.getMoney());
+ refundDTO.setTotalAmount(goodsorder.getMoney());
+ refundDTO.setMemberId(goodsorder.getMemberId());
+ refundDTO.setReason("骞冲彴寮哄埗缁撶畻閫�娆�");
+ refundDTO.setType(Constants.REFUND_TYPE.PLAT_FORCE.getKey());
+ Refund refund = wxMiniUtilService.wxRefund(refundDTO);
+
+ //瀛樺偍 娑堣垂浜ゆ槗娴佹按
+ Transactions transactions = new Transactions();
+ transactions.setMemberId(goodsorder.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(orderId);
+ transactions.setMoney(goodsorder.getMoney());
+ transactions.setType(Constants.transactionsType.consumption);
+ transactions.setDoneDate(new Date());
+ transactions.setTitle("娑堣垂缁撶畻");
+ transactions.setContent("缁撶畻瀹為檯娑堣垂");
+ transactions.setBalance(BigDecimal.ZERO);
+ transactions.setObjId(orderId);
+ transactions.setObjType(Constants.ONE);
+ transactionsMapper.insert(transactions);
+
Goodsorder update = new Goodsorder();
update.setId(goodsorder.getId());
update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
- update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
+ update.setCloseMoney(goodsorder.getMoney());
update.setCloseId(refund.getId());
update.setCloseDate(refund.getDoneDate());
update.setCloseInfo(refund.getInfo());
update.setCloseUserId(principal.getId());
update.setCloseType(Constants.ONE);
goodsorderMapper.updateById(update);
+
+ }
+
+
+ }
+
+ @Override
+ public void backGoodsorder(String orderId, BigDecimal money) {
+
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
+ QueryWrapper<Refund> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Refund::getObjId,orderId)
+ .orderByDesc(Refund::getCreateDate)
+ .last("limit 1");
+ Refund lastRefund = refundMapper.selectOne(wrapper);
+ if (Objects.isNull(lastRefund)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏀硅鍗曡缁撶畻鍚庡湪閫�娆�");
+ }
+ BigDecimal canBalance = lastRefund.getCanBalance();
+ if(canBalance.compareTo(money) > Constants.ZERO){
+ RefundDTO refundDTO = new RefundDTO();
+ refundDTO.setOrderId(orderId);
+ refundDTO.setCanBalance(lastRefund.getCanBalance().subtract(lastRefund.getMoney()));
+ refundDTO.setRefundAmount(money);
+ refundDTO.setTotalAmount(goodsorder.getMoney());
+ refundDTO.setMemberId(goodsorder.getMemberId());
+ refundDTO.setReason("骞冲彴閫�娆�");
+ refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
+ Refund refund = wxMiniUtilService.wxRefund(refundDTO);
}
}
@@ -611,7 +696,6 @@
Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
if (durationSum > pricingRule.getMemberRides().getBaseTime()){
BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
- //TODO 鍙栬瘉
BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())).divide(new BigDecimal(pricingRule.getMemberRides().getUnitTime())).setScale(0,BigDecimal.ROUND_CEILING));
ridesDetailResponse.setAmount(basePrice.add(multiply));
}else {
--
Gitblit v1.9.3