From 0683b116ec62b4dff8570dba196b0ad749581a8a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 二月 2025 09:57:58 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 331 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 257 insertions(+), 74 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 f02ddd4..67e8f95 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
@@ -30,10 +30,7 @@
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
-import com.doumee.dao.business.web.request.BikeRepairDTO;
-import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
-import com.doumee.dao.business.web.request.MemberRidesQuery;
-import com.doumee.dao.business.web.request.RefundDTO;
+import com.doumee.dao.business.web.request.*;
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
@@ -45,6 +42,7 @@
import com.wechat.pay.java.service.partnerpayments.jsapi.JsapiServiceExtension;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.*;
import com.wechat.pay.java.service.refund.model.RefundNotification;
+import com.wechat.pay.java.service.refund.model.Status;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -79,6 +77,12 @@
private GoodsorderMapper goodsorderMapper;
@Autowired
+ private DiscountMemberMapper discountMemberMapper;
+
+ @Autowired
+ private DiscountLogMapper discountLogMapper;
+
+ @Autowired
GoodsorderJoinMapper goodsorderJoinMapper;
@Autowired
@@ -89,9 +93,9 @@
private MemberMapper memberMapper;
@Autowired
private BaseParamMapper baseParamMapper;
-
@Autowired
private RefundMapper refundMapper;
+
@Autowired
private RefundJoinMapper refundJoinMapper;
@@ -240,6 +244,8 @@
}
return PageData.from(goodsorderExportVOIPage);
}
+
+
@Override
public List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
model.setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑
@@ -287,7 +293,9 @@
MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Goodsorder.class);
queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
+ queryWrapper.selectAs(DiscountMember::getName, Goodsorder::getDiscountName);
queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
+ queryWrapper.leftJoin(DiscountMember.class, DiscountMember::getId ,Goodsorder::getObjId);
queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id and r.status=2 ) as refund_date");
queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status=2) as refund_money");
//鏃堕棿娈电瓫閫�
@@ -316,23 +324,30 @@
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
queryWrapper.orderByDesc(Goodsorder::getPayDate);
- queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Goodsorder::getType,pageWrap.getModel().getType());
+ queryWrapper.select("(select sum(er.discount_price) from member_rides er where er.ordre_id=t.id and er.isdeleted=0) as discountMoney," +
+ "(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
}
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ONE)){
queryWrapper.eq(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
}
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDiscountName()),Goodsorder::getDiscountName,pageWrap.getModel().getDiscountName());
IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
goodsorderIPage.getRecords().forEach(s->{
s.setMoney(Constants.translateMoney(s.getMoney()));
s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
+ s.setDiscountMoney(Constants.translateMoney(s.getDiscountMoney()));
});
}
return PageData.from(goodsorderIPage);
}
+
+
+
@Override
@@ -375,41 +390,55 @@
.eq("member_id",memberId)
.eq("status",Constants.goodsorderStatus.pay)
.last(" limit 1 "));
- if(!Objects.isNull(goodsorder)&&goodsorder.getStatus().equals(Constants.goodsorderStatus.pay)){
- homeResponse.setDepositStatus(Constants.goodsorderStatus.pay);
- homeResponse.setGoodsOrderId(goodsorder.getId());
- //鏌ヨ褰撳墠楠戣鐘舵��
- MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda()
- .eq(MemberRides::getMemberId, memberId)
- .eq(MemberRides::getOrdreId,goodsorder.getId())
- .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
- .orderByDesc(MemberRides::getCreateDate)
- .last(" limit 1 "));
- if (!Objects.isNull(memberRides)) {
- homeResponse.setRideStatus(memberRides.getStatus());
- MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
- BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
- if(!Objects.isNull(baseParam)){
- memberRidesResponse.setBikeType(baseParam.getName());
+ homeResponse.setDepositStatus(Constants.ZERO);
+ if(goodsorder!=null){
+ Refund r = this.refundMapper.selectOne(new QueryWrapper<Refund>().lambda()
+ .eq(Refund::getObjId,goodsorder.getId())
+ .eq(Refund::getIsdeleted,Constants.ZERO)
+ .eq(Refund::getStatus,Constants.ZERO)
+ .last("limit 1" ));
+ if(r!=null){
+ homeResponse.setDepositStatus(Constants.TWO);
+ }else{
+ homeResponse.setDepositStatus(Constants.ONE);
+ }
+ if( goodsorder.getStatus().equals(Constants.goodsorderStatus.pay)){
+ homeResponse.setGoodsOrderId(goodsorder.getId());
+ //鏌ヨ褰撳墠楠戣鐘舵��
+ MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda()
+ .eq(MemberRides::getMemberId, memberId)
+ .eq(MemberRides::getOrdreId,goodsorder.getId())
+ .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
+ .orderByDesc(MemberRides::getCreateDate)
+ .last(" limit 1 "));
+ if (!Objects.isNull(memberRides)) {
+ homeResponse.setRideStatus(memberRides.getStatus());
+ MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
+ BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
+ if(!Objects.isNull(baseParam)){
+ memberRidesResponse.setBikeType(baseParam.getName());
+ }
+ memberRidesResponse.setRideId(memberRides.getId());
+ memberRidesResponse.setRideStartTime(memberRides.getRentDate());
+ memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
+ memberRidesResponse.setRideEndTime(memberRides.getBackDate());
+ memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
+ memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
+ memberRidesResponse.setBikeCode(memberRides.getBikeCode());
+ memberRidesResponse.setBasePrice(memberRides.getBasePrice());
+ memberRidesResponse.setBaseTime(memberRides.getBaseTime());
+ memberRidesResponse.setUnitTime(memberRides.getUnitTime());
+ memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
+ memberRidesResponse.setPriceRole(PricingDetailServiceImpl.getRoleNameByParam(
+ memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
+ memberRidesResponse.getUnitPrice()
+ ,memberRidesResponse.getUnitTime()));
+ homeResponse.setMemberRidesResponse(memberRidesResponse);
}
- memberRidesResponse.setRideId(memberRides.getId());
- memberRidesResponse.setRideStartTime(memberRides.getRentDate());
- memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
- memberRidesResponse.setRideEndTime(memberRides.getBackDate());
- memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
- memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
- memberRidesResponse.setBikeCode(memberRides.getBikeCode());
- memberRidesResponse.setBasePrice(memberRides.getBasePrice());
- memberRidesResponse.setBaseTime(memberRides.getBaseTime());
- memberRidesResponse.setUnitTime(memberRides.getUnitTime());
- memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
- memberRidesResponse.setPriceRole(PricingDetailServiceImpl.getRoleNameByParam(
- memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
- memberRidesResponse.getUnitPrice()
- ,memberRidesResponse.getUnitTime()));
- homeResponse.setMemberRidesResponse(memberRidesResponse);
}
}
+
+
return homeResponse;
}
@@ -456,6 +485,12 @@
GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO();
goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);//浜ゆ槗鏄庣粏
goodsorderDetailDTO.setMemberRidesList(memberRides);//楠戣璁板綍
+ if(memberRides!=null){
+ for(BikeLogDTO dd: memberRides){
+ goodsorder.setDiscountMoney(Constants.formatDecimalNum(goodsorder.getDiscountMoney()).add(Constants.formatDecimalNum(dd.getDiscountPrice())));
+ }
+ goodsorder.setDiscountMoney(Constants.translateMoney(goodsorder.getDiscountMoney()));
+ }
goodsorderDetailDTO.setModel(goodsorder);//璁㈠崟瀵硅薄
return goodsorderDetailDTO;
}
@@ -501,23 +536,101 @@
BigDecimal closeMoney = new BigDecimal(0.00);
if (!CollectionUtils.isEmpty(memberRides)){
//楠戣鎬绘椂闀�
- closeMoney = getCloseMoneyByRides(memberRides,true,goodsorder.getMoney()).getAmount();
+ //棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
+ int freeTime = 0;
+ try {
+ freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
+ }catch (Exception e){
+ }
+ closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney()).getAmount();
//瀹為檯缁撶畻浠锋牸锛岃褰曞湪鏈�楂樿溅鍨嬭褰曚笂
- memberRides.get(0).setActualPrice(closeMoney);
+// memberRides.get(0).setActualPrice(closeMoney);
}
int refundMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(closeMoney)).intValue();//璁＄畻浠锋牸
- RefundDTO refundDTO = new RefundDTO();
- refundDTO.setOrderId(goodsorder.getId());
- refundDTO.setCanBalance(goodsorder.getMoney());
- refundDTO.setRefundAmount(new BigDecimal(refundMoney));
- refundDTO.setTotalAmount(goodsorder.getMoney());
- refundDTO.setMemberId(goodsorder.getMemberId());
- refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
- refundDTO.setCreator(goodsorder.getEditor());
- refundDTO.setType(type);
- wxMiniUtilService.wxRefund(refundDTO);
+ if(refundMoney>0){
+ RefundDTO refundDTO = new RefundDTO();
+ refundDTO.setOrderId(goodsorder.getId());
+ refundDTO.setCanBalance(goodsorder.getMoney());
+ refundDTO.setRefundAmount(new BigDecimal(refundMoney));
+ refundDTO.setTotalAmount(goodsorder.getMoney());
+ refundDTO.setMemberId(goodsorder.getMemberId());
+ refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
+ refundDTO.setCreator(goodsorder.getEditor());
+ refundDTO.setType(type);
+ boolean res = wxMiniUtilService.wxRefund(refundDTO);
+ }else{
+ //鏃犻��娆剧粨绠�
+ closeGoodsorderDoneNoRefund(goodsorder,type,new BigDecimal(0),null,memberRides);
+ }
}
-
+ public void closeGoodsorderDoneNoRefund(Goodsorder goodsorder,int type,BigDecimal refundMoney,String closeId,List<MemberRides> memberRides ) {
+ log.error("========================================"+JSONObject.toJSONString(goodsorder));
+ if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
+ return;
+ }
+ BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
+ //杩涜璁㈠崟缁撶畻涓氬姟澶勭悊
+ if(memberRides == null){
+ memberRides = getMemberRidesForClose(goodsorder.getId());
+ }
+ //榛樿缁撶畻涓烘娂閲戦噾棰�
+ if (!CollectionUtils.isEmpty(memberRides)){
+ //楠戣鎬绘椂闀�
+ for(MemberRides model :memberRides){
+ MemberRides up = new MemberRides();
+ up.setId(model.getId());
+ up.setActualPrice(model.getActualPrice());
+ up.setCloseDate(goodsorder.getEditDate());
+ up.setCloseStatus(Constants.ONE);
+ up.setEditor(goodsorder.getEditor());
+ up.setEditDate(goodsorder.getEditDate());
+ //鏇存柊楠戣璁板綍鐨勮绠楅噾棰濆拰鐘舵��
+ memberRidesJoinMapper.updateById(up);
+ }
+ }
+// BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
+ //閫�娆句箰琛�
+// int type =Constants.formatIntegerNum(refund.getType());
+ Goodsorder update = new Goodsorder();
+ update.setId(goodsorder.getId());
+ update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
+ update.setCloseMoney(closeMoney);
+ update.setCloseStatus(Constants.ONE);
+ update.setCloseDate(new Date());
+ update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
+ update.setCloseUserId(goodsorder.getEditor());
+ if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
+ //濡傛灉鏄己鍒剁粨绠�
+ update.setCloseType(Constants.ONE);
+// LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+// update.setEditor(principal.getId());
+ }else if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
+ //濡傛灉鏄嚜琛岀祼绠�
+ update.setCloseType(Constants.ZERO);
+ }else{
+ //濡傛灉鏄钩鍙拌嚜鍔ㄧ粨绠�
+ update.setCloseType(Constants.TWO);
+ }
+ update.setCloseId(closeId);
+ //瀛樺偍 娑堣垂浜ゆ槗娴佹按
+ Transactions transactions = new Transactions();
+ transactions.setId(Constants.getUUID());
+ transactions.setMemberId(goodsorder.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(goodsorder.getId());
+ transactions.setMoney(closeMoney);
+ transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
+ transactions.setDoneDate(new Date());
+ transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
+ transactions.setContent(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getInfo());
+ transactions.setBalance(BigDecimal.ZERO);
+ transactions.setObjId(goodsorder.getId());
+ transactions.setObjType(Constants.ONE);
+ transactionsMapper.insert(transactions);
+ //淇敼璁㈠崟淇℃伅
+ goodsorderMapper.updateById(update);
+ }
/**
* 閫�娆炬垚鍔熷洖璋�
*/
@@ -543,9 +656,12 @@
}
refund.setOnlineOrderid(param.getTransactionId());
doRefundTransactions(refund);
-
+ //閫�娆句箰琛�
+ int type =Constants.formatIntegerNum(refund.getType());
Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
- if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getCloseStatus()) != Constants.ZERO){
+ closeGoodsorderDoneNoRefund(goodsorder,refund.getType(),refund.getMoney(),refund.getId(),null);
+ /* log.error("========================================"+JSONObject.toJSONString(goodsorder));
+ if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
return;
}
//杩涜璁㈠崟缁撶畻涓氬姟澶勭悊
@@ -565,21 +681,20 @@
memberRidesJoinMapper.updateById(up);
}
}
- BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
- //閫�娆句箰琛�
- int type =Constants.formatIntegerNum(refund.getType());
+
Goodsorder update = new Goodsorder();
update.setId(goodsorder.getId());
update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
update.setCloseMoney(closeMoney);
+ update.setCloseStatus(Constants.ONE);
update.setCloseDate(new Date());
update.setCloseInfo(Constants.REFUND_TYPE.get(refund.getType()).getInfo());
update.setCloseUserId(goodsorder.getEditor());
if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
//濡傛灉鏄己鍒剁粨绠�
update.setCloseType(Constants.ONE);
- LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- update.setEditor(principal.getId());
+// LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+// update.setEditor(principal.getId());
}else if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
//濡傛灉鏄嚜琛岀祼绠�
update.setCloseType(Constants.ZERO);
@@ -605,7 +720,7 @@
transactions.setObjType(Constants.ONE);
transactionsMapper.insert(transactions);
//淇敼璁㈠崟淇℃伅
- goodsorderMapper.updateById(update);
+ goodsorderMapper.updateById(update);*/
}
private void doRefundTransactions(Refund refund ) {
@@ -648,23 +763,26 @@
transactionsMapper.insert(transactions);
}
- private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose,BigDecimal yjMoney) {
+ private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney) {
RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
BigDecimal closeMoney = new BigDecimal(0.00);
int durationSum = 0;
- MemberRides topRides =memberRides.get(0);
+ MemberRides topRides =null;
//鍙栨渶楂樿溅鍨嬭绠楁柟妗堢粨绠楄鍗�
for(MemberRides rides : memberRides){
if ( isClose && Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璁㈠崟鏈夋湭瀹屾垚鐨勯獞琛岋紝鏃犳硶寮哄埗缁撶畻");
}
durationSum += Constants.formatIntegerNum(rides.getDuration());//绱楠戣锛堣璐癸級鏃堕暱
- if(Constants.formatIntegerNum(topRides.getSortnum())<Constants.formatIntegerNum(rides.getSortnum())){
- topRides = rides;
+ if(durationSum-freeTime > 0 ){//鍙畻瓒呭嚭鍏嶈垂鏃堕暱鐨勬暟鎹�
+ if(topRides == null ||( Constants.formatIntegerNum(topRides.getSortnum())<Constants.formatIntegerNum(rides.getSortnum())
+ && Constants.formatIntegerNum(rides.getDuration())>0)){
+ topRides = rides;
+ }
}
}
// MemberRides topRides =memberRides.get(0);
- if(durationSum > 0 && topRides != null){
+ if( topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
//濡傛灉鏄竴鍙ｄ环鏂瑰紡锛屼环鏍肩洿鎺ヤ负涓�鍙ｄ环baseMoney,濡傛灉涓嶆槸璁＄畻姝ｅ父浠锋牸
@@ -676,6 +794,7 @@
closeMoney = closeMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
}
}
+ topRides.setActualPrice(closeMoney);
}
//濡傛灉璁㈠崟浠锋牸灏侀《浜嗭紝鍙栬鍗� 浠锋牸
if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
@@ -683,7 +802,7 @@
}
ridesDetailResponse.setDuration(durationSum);
ridesDetailResponse.setAmount(closeMoney);
- ridesDetailResponse.setBikeType(topRides.getParamName());
+ ridesDetailResponse.setBikeType(topRides!=null?topRides.getParamName():"-");
return ridesDetailResponse;
}
@@ -704,9 +823,16 @@
}
@Override
- public void backGoodsorder(String orderId, BigDecimal money,String reason) {
+ public void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO) {
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
+ if(Objects.isNull(goodsorderBackDTO)
+ || StringUtils.isBlank(goodsorderBackDTO.getOrderId())
+ || StringUtils.isBlank(goodsorderBackDTO.getReason())
+ || Objects.isNull(goodsorderBackDTO.getBackType())
+ || Objects.isNull(goodsorderBackDTO.getMoney())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Goodsorder goodsorder = goodsorderMapper.selectById(goodsorderBackDTO.getOrderId());
if(goodsorder == null){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璁㈠崟淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
@@ -715,7 +841,7 @@
}
QueryWrapper<Refund> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(Refund::getObjId,orderId)
+ .eq(Refund::getObjId,goodsorderBackDTO.getOrderId())
.eq(Refund::getStatus,Constants.TWO)
.eq(Refund::getIsdeleted,Constants.ZERO) ;
wrapper.select("sum(money) as money").last(" limit 1");
@@ -723,18 +849,42 @@
BigDecimal refundMoney = total == null?new BigDecimal(0):Constants.formatDecimalNum(total.getMoney());
//鍙��鍓╀綑 鍗曚綅鍏�
BigDecimal canBalance =Constants.translateMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
- if(canBalance.compareTo(money) >= Constants.ZERO){
+ if(canBalance.compareTo(goodsorderBackDTO.getMoney()) >= Constants.ZERO){
RefundDTO refundDTO = new RefundDTO();
- refundDTO.setOrderId(orderId);
+ refundDTO.setOrderId(goodsorderBackDTO.getOrderId());
refundDTO.setCanBalance(canBalance.multiply(new BigDecimal(100)));
- refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
+ refundDTO.setRefundAmount(goodsorderBackDTO.getMoney().multiply(new BigDecimal(100)));
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
refundDTO.setCreator(principal.getId());
- refundDTO.setReason(reason);
+ refundDTO.setReason(goodsorderBackDTO.getReason());
refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
+ //閫�璐ч��娆� 鏌ョ湅濂楅璁㈠崟鐘舵�� 鏇存柊璁㈠崟淇℃伅
+ if(Constants.equalsInteger(goodsorderBackDTO.getBackType(),Constants.ZERO)&&Constants.equalsInteger(goodsorder.getType(),Constants.ONE)){
+ DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
+ if(Objects.isNull(discountMember)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌濂楅鍗′俊鎭�");
+ }
+ if(Constants.equalsInteger(discountMember.getStatus(),Constants.ZERO)){
+ discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda()
+ .set(DiscountMember::getStatus,Constants.ONE)
+ .eq(DiscountMember::getId,discountMember.getId())
+ );
+ //鎿嶄綔鏃ュ織
+ DiscountLog discountLog = new DiscountLog();
+ discountLog.setIsdeleted(Constants.ZERO);
+ discountLog.setCreator(principal.getId());
+ discountLog.setCreateDate(new Date());
+ discountLog.setDiscountMemberId(discountMember.getId());
+ discountLog.setType(Constants.ONE);
+ discountLog.setEditInfo("閫�璐ч��鍗�");
+ discountLog.setGoodsorderId(goodsorderBackDTO.getOrderId());
+ discountLogMapper.insert(discountLog);
+ }
+ }
//鍙戣捣閫�娆剧敵璇�
wxMiniUtilService.wxRefund(refundDTO);
+
}else {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝閫�娆鹃噾棰濅笉鍏佽瓒呰繃"+canBalance+"鍏�");
}
@@ -877,7 +1027,7 @@
return memberRidesResponse;
}).collect(Collectors.toList());
//绱鍜岄绠楃粨绠楅噾棰�
- RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false,goodsorder.getMoney());
+ RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney());
if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
//濡傛灉闈炲凡鏀粯浣嗘湭缁撶畻锛屼娇鐢ㄨ鍗曢噾棰�
ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -1001,10 +1151,43 @@
}
+ @Override
+ public void autoCancelRefunOrder(){
+ Date date = new Date(System.currentTimeMillis()-5*60L*1000L);
+ List<Refund> list = refundMapper.selectList(new QueryWrapper<Refund>().lambda()
+ .eq(Refund::getStatus,Constants.ZERO)
+ .lt(Refund::getCreateDate,date));
+ if(list !=null && list.size()>0){
+ List<String> cancelIds = new ArrayList<>();
+ for(Refund r:list){
+ com.wechat.pay.java.service.refund.model.Refund res =wxMiniUtilService.isSuucessRefund(r.getId());
+ if(res !=null){
+ //濡傛灉閫�娆炬垚鍔�
+ RefundNotification param = new RefundNotification();
+ param.setRefundStatus(Status.SUCCESS);
+ param.setOutRefundNo(r.getId());
+ param.setTransactionId(res.getTransactionId());
+ //鎵ц鍏抽棴璁㈠崟涓氬姟
+ closeGoodsorderDone(param);
+ }else{
+ //鏀惧叆鍙栨秷闆嗗悎涓�
+ cancelIds.add(r.getId());
+ }
+ }
+ if(cancelIds.size()>0){
+ refundMapper.update(null, new UpdateWrapper<Refund>().lambda()
+ .in(Refund::getId,cancelIds)
+ .set(Refund::getStatus,Constants.ONE)
+ .set(Refund::getEditDate,new Date())
+ .set(Refund::getInfo,"瓒呮椂鏈洖璋冿紝鑷姩鍙栨秷")
+ );
+ }
+ }
+ }
@Override
public void autoCloseOrder( ) {
- Goodsorder goodsorder = new Goodsorder();
+ Goodsorder goodsorder = new Goodsorder();
goodsorder.setIsdeleted(Constants.ZERO);
goodsorder.setStatus(Constants.goodsorderStatus.pay);
List<Goodsorder> list = findList(goodsorder);
--
Gitblit v1.9.3