From da045f4ac67ac3d4f55b2dd34e9a59fb7afc0c58 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 10:40:30 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 insertions(+), 19 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 de6cd97..33d39cf 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.*;
@@ -80,10 +77,17 @@
private GoodsorderMapper goodsorderMapper;
@Autowired
+ private DiscountMemberMapper discountMemberMapper;
+
+ @Autowired
+ private DiscountLogMapper discountLogMapper;
+
+ @Autowired
GoodsorderJoinMapper goodsorderJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
@Autowired
@@ -241,6 +245,8 @@
}
return PageData.from(goodsorderExportVOIPage);
}
+
+
@Override
public List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
model.setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑
@@ -288,7 +294,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");
//鏃堕棿娈电瓫閫�
@@ -317,23 +325,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
@@ -471,6 +486,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;
}
@@ -511,7 +532,11 @@
if(r != null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "璇ヨ鍗曞瓨鍦ㄩ��娆剧敵璇锋鍦ㄥ鐞嗕腑锛岃绋嶅悗鏌ョ湅璁㈠崟淇℃伅鍝");
}
- List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
+ List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());//鎵撹溅楠戣璁板綍
+ dealCloseGoodsorderBiz(goodsorder,type,memberRides);
+ }
+ @Override
+ public void dealCloseGoodsorderBiz(Goodsorder goodsorder, int type, List<MemberRides> memberRides) {
//榛樿缁撶畻涓烘娂閲戦噾棰�
BigDecimal closeMoney = new BigDecimal(0.00);
if (!CollectionUtils.isEmpty(memberRides)){
@@ -543,7 +568,8 @@
closeGoodsorderDoneNoRefund(goodsorder,type,new BigDecimal(0),null,memberRides);
}
}
- public void closeGoodsorderDoneNoRefund(Goodsorder goodsorder,int type,BigDecimal refundMoney,String closeId,List<MemberRides> 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;
@@ -570,7 +596,7 @@
}
// BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
//閫�娆句箰琛�
-// int type =Constants.formatIntegerNum(refund.getType());
+// int type =Constants.formatIntegerNum(refund.getType());
Goodsorder update = new Goodsorder();
update.setId(goodsorder.getId());
update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
@@ -786,8 +812,8 @@
return ridesDetailResponse;
}
- private List<MemberRides> getMemberRidesForClose(String id) {
-
+ @Override
+ public List<MemberRides> getMemberRidesForClose(String id) {
MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>();
wrapper.eq(MemberRides::getOrdreId,id);
wrapper.ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
@@ -798,14 +824,21 @@
wrapper.orderByDesc(BaseParam::getSortnum);
//鍙栨渶楂樿溅鍨嬩綔涓鸿浠锋柟妗�
//鏌ヨ鎵�鏈夐獞琛岃褰�
- List<MemberRides> memberRides = memberRidesJoinMapper.selectList(wrapper);
+ List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class,wrapper);
return memberRides;
}
@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(), "瀵逛笉璧凤紝璁㈠崟淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
@@ -814,7 +847,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");
@@ -822,18 +855,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+"鍏�");
}
@@ -1136,7 +1193,7 @@
@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