From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 725 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 554 insertions(+), 171 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 0b87604..eeef052 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
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,15 +19,18 @@
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.core.wx.WxMiniUtilService;
+import com.doumee.core.wx.WxPayProperties;
import com.doumee.dao.business.*;
import com.doumee.dao.business.MemberRidesMapper;
import com.doumee.dao.business.join.GoodsorderJoinMapper;
+import com.doumee.dao.business.join.RefundJoinMapper;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
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;
@@ -36,14 +41,16 @@
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;
-import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+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;
import org.checkerframework.checker.units.qual.A;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -61,8 +68,10 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Service
+@Slf4j
public class GoodsorderServiceImpl implements GoodsorderService {
@@ -84,6 +93,8 @@
@Autowired
private RefundMapper refundMapper;
+ @Autowired
+ private RefundJoinMapper refundJoinMapper;
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
@@ -168,35 +179,113 @@
public PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
pageWrap.getModel().setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑
- MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
- return PageData.from(goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class,queryWrapper));
+ Goodsorder model = pageWrap.getModel();
+ Utils.MP.blankToNull(model);
+ IPage<GoodsorderExportVO> goodsorderExportVOIPage = null;
+ if (Constants.formatIntegerNum(model.getType())==Constants.ZERO){
+ MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Goodsorder.class);
+ queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
+ queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
+ 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");
+ //鏃堕棿娈电瓫閫�
+ if (Objects.nonNull(model.getStartDate())){
+ queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(model.getStartDate()));
+ }
+ if (Objects.nonNull(model.getEndDate())){
+ queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
+ }
+
+// queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
+// queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
+// queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
+// queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
+// queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
+// queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
+ queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
+ queryWrapper.orderByAsc(Goodsorder::getPayDate);
+ goodsorderExportVOIPage = goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class, queryWrapper);
+ }else{
+ MPJLambdaWrapper<Refund> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAs(Refund::getMoney,GoodsorderExportVO::getRefundMoney);
+ queryWrapper.selectAs(Refund::getDoneDate,GoodsorderExportVO::getRefundDate);
+ queryWrapper.selectAs(Goodsorder::getCloseMoney,GoodsorderExportVO::getCloseMoney);
+ queryWrapper.selectAs(Goodsorder::getMoney,GoodsorderExportVO::getMoney);
+ queryWrapper.selectAs(Goodsorder::getId,GoodsorderExportVO::getId);
+ queryWrapper.selectAs(Goodsorder::getCode,GoodsorderExportVO::getCode);
+ queryWrapper.selectAs(Goodsorder::getPayDate,GoodsorderExportVO::getPayDate);
+ queryWrapper.selectAs(Member::getOpenid, GoodsorderExportVO::getOpenid);
+ queryWrapper.leftJoin(Goodsorder.class, Goodsorder::getId ,Refund::getObjId);
+ queryWrapper.leftJoin(Goodsorder.class, Goodsorder::getId ,Refund::getObjId);
+ queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
+ //鏃堕棿娈电瓫閫�
+ if (Objects.nonNull(model.getStartDate())){
+ queryWrapper.ge(Refund::getDoneDate, Utils.Date.getStart(model.getStartDate()));
+ }
+ if (Objects.nonNull(model.getEndDate())){
+ queryWrapper.le( Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
+ }
+ queryWrapper.eq(Refund::getStatus,Constants.TWO);//閫�娆惧畬鎴�
+ queryWrapper.orderByAsc(Refund::getDoneDate);
+ goodsorderExportVOIPage = refundJoinMapper.selectJoinPage(page, GoodsorderExportVO.class, queryWrapper);
+ }
+
+ if (!CollectionUtils.isEmpty(goodsorderExportVOIPage.getRecords())){
+ goodsorderExportVOIPage.getRecords().forEach(s->{
+ s.setMoney(Constants.translateMoney(s.getMoney()));
+ s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
+ s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney()));
+ });
+ }
+ return PageData.from(goodsorderExportVOIPage);
}
@Override
public List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
model.setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑
- MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
- List<GoodsorderExportVO> goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
- /* List<GoodsorderExportVO> list = new ArrayList<>();
- if(goodsorderList!=null){
- for(Goodsorder order : goodsorderList){
- GoodsorderExportVO vo = new GoodsorderExportVO();
- vo.setId(order.getId());
- vo.setCode(order.getCode());
- vo.setOpenid(order.getMemberOpenid());
- vo.setPayDate(order.getPayDate());
- vo.setCloseDate(order.getCloseDate());
- vo.setMoney(Constants.translateMoney(order.getMoney()));
- vo.setCloseMoney(Constants.translateMoney(order.getCloseMoney()));
- vo.setRefundDate(order.getRefundDate());
- vo.setRefundMoney(Constants.translateMoney(order.getRefundMoney()));
- list.add(vo);
+ List<GoodsorderExportVO> goodsorderList = null;
+ if(Constants.formatIntegerNum(model.getType())==Constants.ZERO){
+ MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
+ queryWrapper.orderByAsc(Goodsorder::getPayDate);
+ goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
+
+ }else{
+ MPJLambdaWrapper<Refund> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAs(Refund::getMoney,GoodsorderExportVO::getRefundMoney);
+ queryWrapper.selectAs(Refund::getDoneDate,GoodsorderExportVO::getRefundDate);
+ queryWrapper.selectAs(Goodsorder::getCode,GoodsorderExportVO::getCode);
+ queryWrapper.selectAs(Goodsorder::getId,GoodsorderExportVO::getId);
+ queryWrapper.selectAs(Goodsorder::getPayDate,GoodsorderExportVO::getPayDate);
+ queryWrapper.selectAs(Goodsorder::getCloseMoney,GoodsorderExportVO::getCloseMoney);
+ queryWrapper.selectAs(Goodsorder::getMoney,GoodsorderExportVO::getMoney);
+ queryWrapper.selectAs(Member::getOpenid, GoodsorderExportVO::getOpenid);
+ queryWrapper.leftJoin(Goodsorder.class, Goodsorder::getId ,Refund::getObjId);
+ queryWrapper.leftJoin(Goodsorder.class, Goodsorder::getId ,Refund::getObjId);
+ queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
+ //鏃堕棿娈电瓫閫�
+ if (Objects.nonNull(model.getStartDate())){
+ queryWrapper.ge(Refund::getDoneDate, Utils.Date.getStart(model.getStartDate()));
}
- }*/
+ if (Objects.nonNull(model.getEndDate())){
+ queryWrapper.le( Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
+ }
+ queryWrapper.eq(Refund::getStatus,Constants.TWO);//閫�娆惧畬鎴�
+ queryWrapper.orderByAsc(Refund::getDoneDate);;
+ goodsorderList = refundJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
+ }
+ if (!CollectionUtils.isEmpty(goodsorderList)){
+ goodsorderList.forEach(s->{
+ s.setMoney(Constants.translateMoney(s.getMoney()));
+ s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney()));
+ s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
+ });
+ }
return goodsorderList;
}
private MPJLambdaWrapper<Goodsorder> initQueryParamByModel(Goodsorder model) {
- MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(model);
+ MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Goodsorder.class);
queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
@@ -209,6 +298,7 @@
if (Objects.nonNull(model.getEndDate())){
queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
}
+
queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
@@ -217,7 +307,7 @@
queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
- queryWrapper.orderByDesc(Goodsorder::getPayDate);
+
return queryWrapper;
}
@@ -226,7 +316,23 @@
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
- return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
+ 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");
+ 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());
+ }
+ 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()));
+ });
+ }
+ return PageData.from(goodsorderIPage);
}
@@ -245,11 +351,11 @@
systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
homeResponse.setParkName(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PROJECT_NAME).getCode());
homeResponse.setServerPhone(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.SERVER_PHONE).getCode());
- homeResponse.setLeaseNoticeUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
+ homeResponse.setLeaseNoticeUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
homeResponse.setLeaseNotice(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE).getCode());
- homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
- homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
- homeResponse.setLeaseVideoUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
+ homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(BigDecimal.valueOf(100)));
+ homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_NOTICE).getCode());
+ homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
homeResponse.setIsBusiness(this.checkBusiness()?0:1);
@@ -257,7 +363,7 @@
homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
.eq("isdeleted",Constants.ZERO)
.eq("status",Constants.ZERO)
- .orderByDesc("create_date")
+ .orderByAsc("sortnum")
));;
if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){
homeResponse.getAdList().forEach(i->{
@@ -270,40 +376,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())
- .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;
}
@@ -334,12 +455,13 @@
if (!CollectionUtils.isEmpty(refunds)){
refunds.forEach(s->{
PayOrderDTO refundOrderDTO = new PayOrderDTO();
- refundOrderDTO.setOrderCode(s.getCode());
+ refundOrderDTO.setOrderCode(s.getObjId());
refundOrderDTO.setId(s.getId());
refundOrderDTO.setPayWay(s.getPayWay());
refundOrderDTO.setRefundType(s.getType());
refundOrderDTO.setMoney(Constants.translateMoney(s.getMoney()));
refundOrderDTO.setPayDate(s.getDoneDate());
+ refundOrderDTO.setOnlineorderId(s.getOnlineOrderid());
payOrderDTOList.add(refundOrderDTO);
});
}
@@ -373,17 +495,59 @@
closeGoodsorder( goodsorder,Constants.REFUND_TYPE.PLAT_FORCE.getKey());
}
+ /**
+ * 鍙戣捣閫�娆剧敵璇�
+ * @param goodsorder
+ * @param type
+ */
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
public void closeGoodsorder( Goodsorder goodsorder ,int type ) {
+ Refund r = 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){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "璇ヨ鍗曞瓨鍦ㄩ��娆剧敵璇锋鍦ㄥ鐞嗕腑锛岃绋嶅悗鏌ョ湅璁㈠崟淇℃伅鍝");
+ }
List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
//榛樿缁撶畻涓烘娂閲戦噾棰�
BigDecimal closeMoney = new BigDecimal(0.00);
if (!CollectionUtils.isEmpty(memberRides)){
//楠戣鎬绘椂闀�
- closeMoney = getCloseMoneyByRides(memberRides,true).getAmount();
+ closeMoney = getCloseMoneyByRides(memberRides,true,goodsorder.getMoney()).getAmount();
//瀹為檯缁撶畻浠锋牸锛岃褰曞湪鏈�楂樿溅鍨嬭褰曚笂
memberRides.get(0).setActualPrice(closeMoney);
+ }
+ int refundMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(closeMoney)).intValue();//璁＄畻浠锋牸
+ 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);
+ }
+ }
+ public void closeGoodsorderDoneNoRefund(Goodsorder goodsorder,int type,BigDecimal refundMoney,String closeId) {
+ 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));
+ //杩涜璁㈠崟缁撶畻涓氬姟澶勭悊
+ List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
+ //榛樿缁撶畻涓烘娂閲戦噾棰�
+ if (!CollectionUtils.isEmpty(memberRides)){
+ //楠戣鎬绘椂闀�
for(MemberRides model :memberRides){
MemberRides up = new MemberRides();
up.setId(model.getId());
@@ -396,16 +560,22 @@
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(goodsorder.getMoney());
- update.setCloseDate(goodsorder.getEndDate());
+ 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);
@@ -413,52 +583,174 @@
//濡傛灉鏄钩鍙拌嚜鍔ㄧ粨绠�
update.setCloseType(Constants.TWO);
}
- int refundMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(closeMoney)).intValue();//璁＄畻浠锋牸
- 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.setType(type);
- Refund refund = wxMiniUtilService.wxRefund(refundDTO);
- update.setCloseId(refund.getId());
- //瀛樺偍 娑堣垂浜ゆ槗娴佹按
- 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(goodsorder.getMoney().subtract(new BigDecimal(refundMoney)));
- 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);
- }
+ 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);
}
+ /**
+ * 閫�娆炬垚鍔熷洖璋�
+ */
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ @Override
+ public void closeGoodsorderDone(RefundNotification param) {
+ //鏌ヨ閫�娆剧敵璇疯鍗�
+ Refund refund = refundMapper.selectById(param.getOutRefundNo());
+ if(refund == null
+ || Constants.formatIntegerNum(refund.getIsdeleted()) == Constants.ONE
+ || Constants.formatIntegerNum(refund.getStatus()) == Constants.TWO){
+ return;
+ }
+ if (!"SUCCESS".equals(param.getRefundStatus().name())) {
+ // 濡傛灉閫�娆剧姸鎬佷笉姝ｇ‘锛屼慨鏀归��娆惧崟鐘舵��
+ refund.setStatus(Constants.ONE);
+ refund.setEditDate(new Date());
+ refund.setOnlineOrderid(param.getTransactionId());
+ refund.setDoneDate(refund.getEditDate());
+ //鏇存柊閫�娆惧崟鐘舵��
+ refundMapper.updateById(refund);
+ return;
+ }
+ refund.setOnlineOrderid(param.getTransactionId());
+ doRefundTransactions(refund);
+ //閫�娆句箰琛�
+ int type =Constants.formatIntegerNum(refund.getType());
+ Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
+ closeGoodsorderDoneNoRefund(goodsorder,refund.getType(),refund.getMoney(),refund.getId());
+ /* log.error("========================================"+JSONObject.toJSONString(goodsorder));
+ if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
+ return;
+ }
+ //杩涜璁㈠崟缁撶畻涓氬姟澶勭悊
+ List<MemberRides> memberRides = getMemberRidesForClose(refund.getObjId());
+ //榛樿缁撶畻涓烘娂閲戦噾棰�
+ 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);
+ }
+ }
- private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose) {
+ 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());
+ }else if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
+ //濡傛灉鏄嚜琛岀祼绠�
+ update.setCloseType(Constants.ZERO);
+ }else{
+ //濡傛灉鏄钩鍙拌嚜鍔ㄧ粨绠�
+ update.setCloseType(Constants.TWO);
+ }
+ update.setCloseId(refund.getId());
+ //瀛樺偍 娑堣垂浜ゆ槗娴佹按
+ 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(goodsorder.getMoney().subtract(Constants.formatDecimalNum(refund.getMoney())));
+ 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);*/
+ }
+
+ private void doRefundTransactions(Refund refund ) {
+ //瀛樺偍浜ゆ槗娴佹按琛�
+ refund.setStatus(Constants.TWO);
+ refund.setEditDate(new Date());
+ refund.setDoneDate(refund.getEditDate());
+ //鏇存柊閫�娆惧崟鐘舵��
+ refundMapper.updateById(refund);
+
+ Transactions transactions = new Transactions();
+ transactions.setId(Constants.getUUID());
+ transactions.setMemberId(refund.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(refund.getObjId());
+ transactions.setMoney(refund.getMoney());
+ transactions.setPreOrderid(refund.getObjId());
+ transactions.setOnlineOrderid(refund.getId());
+ transactions.setDoneDate(new Date());
+ if(refund.getType().equals(Constants.REFUND_TYPE.PLAT_AUTO.getKey())||refund.getType().equals(Constants.REFUND_TYPE.PLAT_FORCE.getKey())){
+ //骞冲彴鑷姩閫�娆� 鎴� 寮哄埗閫�娆�
+ transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
+ transactions.setTitle(Constants.REFUND_TYPE.PLAT_AUTO.getInfo());
+ transactions.setContent(Constants.REFUND_TYPE.PLAT_AUTO.getInfo());
+ }else if(refund.getType().equals(Constants.REFUND_TYPE.NORMAL.getKey())){
+ //鐢ㄦ埛涓诲姩閫�娆�
+ transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
+ transactions.setTitle(Constants.REFUND_TYPE.NORMAL.getInfo());
+ transactions.setContent(Constants.REFUND_TYPE.NORMAL.getInfo());
+ }else if(refund.getType().equals(Constants.REFUND_TYPE.BACK.getKey())){
+ //缁撶畻鍚庨��娆�
+ transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
+ transactions.setTitle(Constants.REFUND_TYPE.BACK.getInfo());
+ transactions.setContent(Constants.REFUND_TYPE.BACK.getInfo());
+ }
+ transactions.setBalance(BigDecimal.ZERO);
+ transactions.setObjId(refund.getId());
+ transactions.setObjType(Constants.ONE);
+ transactionsMapper.insert(transactions);
+ }
+
+ private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose,BigDecimal yjMoney) {
RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
BigDecimal closeMoney = new BigDecimal(0.00);
int durationSum = 0;
+ MemberRides topRides =memberRides.get(0);
//鍙栨渶楂樿溅鍨嬭绠楁柟妗堢粨绠楄鍗�
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;
+ }
}
- MemberRides topRides =memberRides.get(0);
+// MemberRides topRides =memberRides.get(0);
if(durationSum > 0 && topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
@@ -472,6 +764,10 @@
}
}
}
+ //濡傛灉璁㈠崟浠锋牸灏侀《浜嗭紝鍙栬鍗� 浠锋牸
+ if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
+ closeMoney = yjMoney;
+ }
ridesDetailResponse.setDuration(durationSum);
ridesDetailResponse.setAmount(closeMoney);
ridesDetailResponse.setBikeType(topRides.getParamName());
@@ -482,9 +778,13 @@
MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>();
wrapper.eq(MemberRides::getOrdreId,id);
- wrapper.selectAll(MemberRides.class).selectAs(BaseParam::getName, MemberRides::getParamName);
+ wrapper.ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+ wrapper.selectAll(MemberRides.class)
+ .selectAs(BaseParam::getSortnum, MemberRides::getSortnum)
+ .selectAs(BaseParam::getName, MemberRides::getParamName);
wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
- wrapper.orderByDesc(BaseParam::getSortnum);//鍙栨渶楂樿溅鍨嬩綔涓鸿浠锋柟妗�
+ wrapper.orderByDesc(BaseParam::getSortnum);
+ //鍙栨渶楂樿溅鍨嬩綔涓鸿浠锋柟妗�
//鏌ヨ鎵�鏈夐獞琛岃褰�
List<MemberRides> memberRides = memberRidesJoinMapper.selectList(wrapper);
return memberRides;
@@ -494,28 +794,36 @@
public void backGoodsorder(String orderId, BigDecimal money,String reason) {
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
+ if(goodsorder == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璁㈠崟淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }
+ if (Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.CLOSE.getKey()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヨ鍗曡缁撶畻鍚庡啀閫�娆緙");
+ }
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){
+ .eq(Refund::getStatus,Constants.TWO)
+ .eq(Refund::getIsdeleted,Constants.ZERO) ;
+ wrapper.select("sum(money) as money").last(" limit 1");
+ Refund total = refundMapper.selectOne(wrapper);
+ 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){
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderId(orderId);
- refundDTO.setCanBalance(lastRefund.getCanBalance().subtract(lastRefund.getMoney()));
- refundDTO.setRefundAmount(money);
+ refundDTO.setCanBalance(canBalance.multiply(new BigDecimal(100)));
+ refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
+ refundDTO.setCreator(principal.getId());
refundDTO.setReason(reason);
refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
- Refund refund = wxMiniUtilService.wxRefund(refundDTO);
+ //鍙戣捣閫�娆剧敵璇�
+ wxMiniUtilService.wxRefund(refundDTO);
}else {
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閫�娆鹃噾棰濅笉鍏佽瓒呰繃"+canBalance);
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝閫�娆鹃噾棰濅笉鍏佽瓒呰繃"+canBalance+"鍏�");
}
}
@@ -529,20 +837,18 @@
QueryWrapper<Refund> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Refund::getObjId,orderId)
- .orderByDesc(Refund::getCreateDate);
- List<Refund> refunds = refundMapper.selectList(wrapper);
+ .eq(Refund::getStatus,Constants.TWO)
+ .eq(Refund::getIsdeleted,Constants.ZERO) ;
+ wrapper.select("sum(money) as money").last(" limit 1");
+ Refund total = refundMapper.selectOne(wrapper);
GoodsorderCanBanlanceDTO goodsorderCanBanlanceDTO = new GoodsorderCanBanlanceDTO();
- goodsorderCanBanlanceDTO.setGoodsorderMoney(goodsorder.getMoney());
- goodsorderCanBanlanceDTO.setCloseMoney(goodsorder.getCloseMoney());
- if (!CollectionUtils.isEmpty(refunds)){
- BigDecimal reduce = refunds.stream().map(s -> s.getMoney()).reduce(new BigDecimal("0"), (a, b) -> b.add(a));
- Refund refund = refunds.stream().findFirst().orElse(null);
- goodsorderCanBanlanceDTO.setHasRefundMoney(reduce);
- goodsorderCanBanlanceDTO.setCanBanlanceMoney(refund.getCanBalance().subtract(refund.getMoney()));
- }else {
- goodsorderCanBanlanceDTO.setHasRefundMoney(new BigDecimal("0"));
- goodsorderCanBanlanceDTO.setCanBanlanceMoney(goodsorder.getMoney());
- }
+ goodsorderCanBanlanceDTO.setGoodsorderMoney( Constants.translateMoney(goodsorder.getMoney()));
+ goodsorderCanBanlanceDTO.setCloseMoney(Constants.translateMoney(goodsorder.getCloseMoney()));
+ BigDecimal reduce = total!=null?Constants.formatDecimalNum(total.getMoney()):new BigDecimal(0);
+ goodsorderCanBanlanceDTO.setHasRefundMoney(Constants.translateMoney(reduce));
+
+ BigDecimal subtract = Constants.translateMoney(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney());
+ goodsorderCanBanlanceDTO.setCanBanlanceMoney(subtract.compareTo(new BigDecimal("0")) > 0 ? subtract : new BigDecimal("0"));
return goodsorderCanBanlanceDTO;
}
@@ -559,35 +865,44 @@
model.setPayNum(0);
model.setRefundNum(0);
QueryWrapper<Goodsorder> queryWrapper = new QueryWrapper<>();
- queryWrapper.lambda().ge(param.getStartDate() !=null,Goodsorder::getPayDate,DateUtil.getShortDateStr(param.getStartDate()));
- queryWrapper.lambda().le(param.getEndDate() !=null,Goodsorder::getPayDate,DateUtil.getShortDateStr(param.getEndDate()));
+ if(Objects.nonNull(param.getStartDate())){
+ queryWrapper.lambda().ge(param.getStartDate() !=null,Goodsorder::getPayDate, Utils.Date.getStart(param.getStartDate()));
+ }
+ if(Objects.nonNull(param.getEndDate())) {
+ queryWrapper.lambda().le(param.getEndDate() != null, Goodsorder::getPayDate, Utils.Date.getEnd(param.getEndDate()));
+ }
queryWrapper.lambda().eq(Goodsorder::getPayStatus, Constants.ONE);//宸叉敮浠�
queryWrapper.lambda().eq(Goodsorder::getIsdeleted, Constants.ZERO);
queryWrapper.lambda().groupBy(Goodsorder::getStatus);
- queryWrapper.select( "count(id) as count_num"
- ,"sum(money) as money" );
+ queryWrapper.select( "status ","count(id) as count_num"
+ ,"sum(money) as money","sum(close_money) as close_money" );
//鎸夎鍗曠姸鎬佸垎缁勭粺璁�
List<Goodsorder> detailList = goodsorderMapper.selectList(queryWrapper);
for(Goodsorder goodsorder : detailList){
if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.CLOSE.getKey()){
//宸茬粨绠�
model.setClosedNum(model.getClosedNum()+goodsorder.getCountNum());
- model.setClosedMoney(model.getClosedMoney().add(Constants.formatDecimalNum(goodsorder.getCloseMoney())));
+ //淇敼bug 缁撶畻鏀跺叆 = 鏀粯閲戦-閫�娆�-鏈粨绠�
+// model.setClosedMoney(model.getClosedMoney().add(Constants.translateMoney(goodsorder.getCloseMoney())));
model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
- model.setPayMoney(model.getPayMoney().add(Constants.formatDecimalNum(goodsorder.getMoney())));
+ model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
}else if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
//宸叉敮浠樻湭缁撶畻
model.setUnClosedNum(model.getUnClosedNum()+goodsorder.getCountNum());
- model.setUnClosedMoney(model.getUnClosedMoney().add(Constants.formatDecimalNum(goodsorder.getMoney())));
+ model.setUnClosedMoney(model.getUnClosedMoney().add(Constants.translateMoney(goodsorder.getMoney())));
model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
- model.setPayMoney(model.getPayMoney().add(Constants.formatDecimalNum(goodsorder.getMoney())));
+ model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
}
}
QueryWrapper<Refund> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.lambda().ge(param.getStartDate() !=null,Refund::getDoneDate,DateUtil.getShortDateStr(param.getStartDate()));
- queryWrapper2.lambda().le(param.getEndDate() !=null,Refund::getDoneDate,DateUtil.getShortDateStr(param.getEndDate()));
+ if(Objects.nonNull(param.getStartDate())) {
+ queryWrapper2.lambda().ge(Refund::getDoneDate, Utils.Date.getStart(param.getStartDate()));
+ }
+ if(Objects.nonNull(param.getEndDate())) {
+ queryWrapper2.lambda().le(Refund::getDoneDate, Utils.Date.getEnd(param.getEndDate()));
+ }
queryWrapper2.lambda().eq(Refund::getIsdeleted, Constants.ZERO);
queryWrapper2.select( "count(id) as count_num"
,"sum(money) as money" );
@@ -595,8 +910,9 @@
Refund refund = refundMapper.selectOne(queryWrapper2.last("limit 1"));
if(refund !=null){
model.setRefundNum(Constants.formatIntegerNum(refund.getCountNum()));
- model.setRefundMoney( Constants.formatDecimalNum(refund.getMoney()));
+ model.setRefundMoney(Constants.translateMoney(Constants.formatDecimalNum(refund.getMoney())));
}
+ model.setClosedMoney(model.getPayMoney().subtract(model.getRefundMoney()).subtract(model.getUnClosedMoney()));
return model;
}
@Override
@@ -605,7 +921,15 @@
if(goodsorder ==null){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- List<MemberRides> memberRides = getMemberRidesForClose(id);
+
+ List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class,new MPJLambdaWrapper<MemberRides>()
+ .selectAll(MemberRides.class)
+ .selectAs(BaseParam::getName,MemberRides::getParamName)
+ .selectAs(BaseParam::getSortnum,MemberRides::getSortnum)
+ .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .eq(MemberRides::getOrdreId,id)
+ .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())
+ .orderByDesc(MemberRides::getCreateDate));
if (!CollectionUtils.isEmpty(memberRides)){
//棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
int freeTime = 0;
@@ -621,7 +945,11 @@
memberRidesResponse.setRideStartTime(s.getRentDate());
memberRidesResponse.setRideEndTime(endTime);
memberRidesResponse.setRideTime(rideTime);
- memberRidesResponse.setDuration(s.getDuration());
+ if(!s.getStatus().equals(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())){
+ memberRidesResponse.setDuration(finalFreeTime >= rideTime?0:rideTime);
+ }else{
+ memberRidesResponse.setDuration(s.getDuration());
+ }
memberRidesResponse.setBikeType(s.getParamName());
memberRidesResponse.setBikeCode(s.getBikeCode());
memberRidesResponse.setBasePrice(s.getBasePrice());
@@ -630,13 +958,13 @@
memberRidesResponse.setUnitTime(s.getUnitTime());
if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){
//濡傛灉鏄獞琛屼腑
- s.setDuration(rideTime> finalFreeTime ?(rideTime- finalFreeTime):0);
+ s.setDuration(rideTime> finalFreeTime ?(rideTime):0);
}
s.setRideTime(rideTime);
return memberRidesResponse;
}).collect(Collectors.toList());
//绱鍜岄绠楃粨绠楅噾棰�
- RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false);;
+ RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false,goodsorder.getMoney());
if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
//濡傛灉闈炲凡鏀粯浣嗘湭缁撶畻锛屼娇鐢ㄨ鍗曢噾棰�
ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -673,32 +1001,52 @@
goodsorder.setId(Constants.getUUID());
goodsorder.setCreateDate(new Date());
goodsorder.setIsdeleted(Constants.ZERO);
+ goodsorder.setCode(goodsorder.getId());
goodsorder.setMemberId(memberId);
- goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
+ goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(new BigDecimal(100)));
goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
goodsorder.setPreOrderid(goodsorder.getId());
goodsorder.setPayStatus(Constants.goodsorderPayStatus.waitPay);
goodsorder.setPayWay(Constants.ZERO);
this.goodsorderMapper.insert(goodsorder);
//璋冭捣鏀粯
+ Object response = null;
try {
- Object response = null;
- WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
- request.setBody("鏀粯鎶奸噾");
- request.setAttach("createGoodsOrder");
- request.setOutTradeNo(goodsorder.getId());
- request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
-// request.setTotalFee(1);
- request.setSpbillCreateIp(this.getIpAddr());
- request.setTimeStart(DateUtil.DateToString(new Date(), "yyyyMMddHHmmss"));
- request.setOpenid(member.getOpenid());
- response = WxMiniConfig.wxPayService.createOrder(request);
- return response;
- } catch (WxPayException e) {
- e.printStackTrace();
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),e.getMessage());
+ response = getWxPayResponse(goodsorder,member.getOpenid());
+ } catch (Exception e) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍙戣捣鏀粯澶辫触~");
}
+
+ return response;
}
+
+ private Object getWxPayResponse(Goodsorder goodsorder,String openid) throws Exception {
+ //璋冭捣鏀粯
+ Object response = null;
+ PrepayRequest request = new PrepayRequest();
+ request.setAttach("createGoodsOrder");
+ request.setDescription("妫灄鍏洯鑷杞﹂獞琛屾娂閲戞敮浠�");
+ request.setSpMchid(WxMiniConfig.wxProperties.getMchId());
+ request.setSpAppid(WxMiniConfig.wxProperties.getAppId());
+ request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
+ request.setSubAppid(WxMiniConfig.wxProperties.getSubAppId());
+ Payer payer = new Payer();
+ payer.setSubOpenid(openid);
+ request.setPayer(payer);
+ request.setOutTradeNo(goodsorder.getId());
+ request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//杩欎釜鍥炶皟url蹇呴』鏄痟ttps寮�澶寸殑
+ Amount amount = new Amount();
+ amount.setTotal(goodsorder.getMoney().intValue());
+ request.setAmount(amount);
+// PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
+ // 璺熶箣鍓嶄笅鍗曠ず渚嬩竴鏍凤紝濉厖棰勪笅鍗曞弬鏁�
+ PrepayWithRequestPaymentResponse resParam = WxMiniConfig.jsapiExtService.prepayWithRequestPayment(request,WxMiniConfig.wxProperties.getSubAppId());
+ response =resParam;
+
+ return response;
+
+ }
+
/**
* 楠岃瘉钀ヤ笟鏃堕棿
@@ -710,8 +1058,12 @@
LocalTime currentTime = LocalTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
String nowTime = currentTime.format(formatter);
- if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
- ||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
+ try {
+ if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
+ ||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
+ return true;
+ }
+ }catch (Exception e){
return true;
}
return false;
@@ -722,7 +1074,7 @@
*/
@Override
public Boolean checkTemporaryStop(){
- if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE)){
+ if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE.toString())){
String stopServeStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_STARTTIME).getCode();
String stopServeEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_ENDTIME).getCode();
//鏌ヨ褰撳墠鏃堕棿鏄惁鍦ㄥ仠姝腑
@@ -736,10 +1088,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);
@@ -750,10 +1135,8 @@
s.setEditDate(date);
s.setEditor(null);
s.setCloseDate(date);
-
closeGoodsorder(s,Constants.REFUND_TYPE.PLAT_AUTO.getKey());
}catch (BusinessException e){
-
}catch (Exception e){
}
@@ -762,13 +1145,13 @@
}
@Override
- public void goodsOrderSettlement(String orderId) {
- if(StringUtils.isBlank(orderId)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST );
- }
- Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
- if(goodsorder == null ){
- throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ public void goodsOrderSettlement(String memberId) {
+ Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
+ .eq("member_id",memberId)
+ .eq("status",Constants.goodsorderStatus.pay)
+ .last(" limit 1 "));
+ if(Objects.isNull(goodsorder)){
+ throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"鏃犻獞琛岃鍗曡褰�");
}
if(Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey() ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ鍗曞綋鍓嶇姸鎬佷笉鏀寔缁撶畻鎿嶄綔锛岃灏濊瘯鍒锋柊鍒楄〃閲嶈瘯锛�" );
@@ -785,7 +1168,7 @@
public String payNotify(String preOrderId,String paymentNo){
Goodsorder goodsorder = this.goodsorderMapper.selectById(preOrderId);
if(goodsorder.getStatus()==Constants.goodsorderStatus.pay){
- return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
+ return ("澶勭悊鎴愬姛!");
}
goodsorder.setOnlineOrderid(paymentNo);
goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
@@ -810,7 +1193,7 @@
transactions.setObjId(goodsorder.getId());
transactions.setObjType(Constants.ZERO);
transactionsMapper.insert(transactions);
- return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
+ return ("澶勭悊鎴愬姛!");
}
--
Gitblit v1.9.3