From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 1193 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 1,021 insertions(+), 172 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 99b728c..74ead5c 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,9 +1,12 @@
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;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.constants.Constants;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
@@ -17,35 +20,39 @@
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.BikeIncomeDetailReportVO;
+import com.doumee.dao.business.vo.BikeIncomeReportVO;
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.*;
+import com.doumee.dao.system.model.SystemUser;
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;
-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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -54,23 +61,35 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.math.BigDecimal;
import java.net.InetAddress;
+import java.net.URLEncoder;
import java.net.UnknownHostException;
+import java.nio.charset.Charset;
import java.sql.Ref;
import java.time.LocalTime;
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 {
-
-
@Autowired
private GoodsorderMapper goodsorderMapper;
+
+ @Autowired
+ private DiscountMemberMapper discountMemberMapper;
+
+ @Autowired
+ private DiscountLogMapper discountLogMapper;
+ @Autowired
+ private DiscountMapper discountMapper;
@Autowired
GoodsorderJoinMapper goodsorderJoinMapper;
@@ -78,14 +97,20 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private BikesMapper bikesMapper;
+
+
@Autowired
private MemberMapper memberMapper;
@Autowired
private BaseParamMapper baseParamMapper;
-
@Autowired
private RefundMapper refundMapper;
+
+ @Autowired
+ private RefundJoinMapper refundJoinMapper;
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
@@ -104,6 +129,10 @@
@Autowired
RefundService refundService;
+
+ @Autowired
+ private HolidaysMapper holidaysMapper;
+
@Override
public String create(Goodsorder goodsorder) {
@@ -170,10 +199,60 @@
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());
- IPage<GoodsorderExportVO> goodsorderExportVOIPage = 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.selectAs(BaseParam::getType, Goodsorder::getBikeType);
+ queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
+ queryWrapper.leftJoin(BaseParam.class, BaseParam::getId ,Goodsorder::getParamId);
+ 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(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.setBikeType(s.getType()==Constants.ZERO?s.getBikeType():Constants.ONE);
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()));
@@ -181,44 +260,63 @@
}
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> 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.setBikeType(s.getType()==Constants.ZERO?s.getBikeType():Constants.ONE);
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()));
});
}
- /* 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);
- }
- }*/
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.selectAs(DiscountMember::getName, Goodsorder::getDiscountName);
+ queryWrapper.selectAs(BaseParam::getType, Goodsorder::getBikeType);
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");
+ queryWrapper.leftJoin(DiscountMember.class, DiscountMember::getGoodsorderId ,Goodsorder::getId);
+ queryWrapper.leftJoin(BaseParam.class, BaseParam::getId ,Goodsorder::getParamId);
+ queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id and r.status in(0,2)) as refund_date");
+ queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status in(0,2)) as refund_money");
+ queryWrapper.select("(select sum(d.ride_price) from discount_log d where d.goodsorder_id=t.id and d.type = 0) as discountMoney");
//鏃堕棿娈电瓫閫�
if (Objects.nonNull(model.getStartDate())){
queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(model.getStartDate()));
@@ -226,16 +324,19 @@
if (Objects.nonNull(model.getEndDate())){
queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
}
-
- queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
+ queryWrapper.eq(Objects.nonNull(model.getBikeType()),BaseParam::getType,model.getBikeType());
+ queryWrapper.eq(Constants.equalsInteger(model.getType(),Constants.ONE)&&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.eq(model.getPayWay() !=null,Goodsorder::getPayWay,model.getPayWay());
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.orderByDesc(Goodsorder::getPayDate);
+ //濡傛灉鏄獞琛岃鍗曞彧鏄剧ず鏀粯鎴愬姛鐨�
+ queryWrapper.eq(Constants.equalsInteger(model.getType(),Constants.ZERO),Goodsorder::getPayStatus,Constants.ONE);
+ queryWrapper.in(Constants.equalsInteger(model.getType(),Constants.ONE),Goodsorder::getStatus,Constants.ONE,Constants.ZERO);
+
return queryWrapper;
}
@@ -244,32 +345,38 @@
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
- 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.orderByDesc(Goodsorder::getPayDate);
+ 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");
+
+
+ queryWrapper.select("( select s.realname from refund r left join system_user s on r.creator = s.id where r.obj_id = t.id order by r.id desc limit 1 ) ",Goodsorder::getRefundUserName);
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()),DiscountMember::getName,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
public long count(Goodsorder goodsorder) {
QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
return goodsorderMapper.selectCount(wrapper);
}
-
-
@Override
public HomeResponse getHome(String memberId){
@@ -287,11 +394,27 @@
homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
homeResponse.setIsBusiness(this.checkBusiness()?0:1);
homeResponse.setUnBusinessTips("钀ヤ笟鏃堕棿涓�"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
+ homeResponse.setEleBusinessArea(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PARK_LAT_LNG_LIST).getCode());
+
homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
.eq("isdeleted",Constants.ZERO)
.eq("status",Constants.ZERO)
- .orderByDesc("create_date")
+ .orderByAsc("sortnum")
));;
+ homeResponse.setDiscountList(
+ discountMapper.selectList(new QueryWrapper<Discount>().lambda()
+ .eq(Discount::getIsdeleted,Constants.ZERO)
+ .eq(Discount::getStatus,Constants.ZERO)
+ .apply(" now() BETWEEN start_date and ( end_date + INTERVAL '1 day' ) ")
+ .orderByDesc(Discount::getId)
+ .last(" limit 3 ")
+ )
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(homeResponse.getDiscountList())){
+ for (Discount discount:homeResponse.getDiscountList()) {
+ discount.setDayPrice(discount.getPrice().divide(new BigDecimal(Integer.toString(discount.getUseDays())),2));
+ }
+ }
if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){
homeResponse.getAdList().forEach(i->{
i.setImgfullurl(fullPath + i.getImgurl());
@@ -302,49 +425,78 @@
Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
.eq("member_id",memberId)
.eq("status",Constants.goodsorderStatus.pay)
+ .eq("type",0)
.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.nonNull(memberRides)) {
+ homeResponse.setRideStatus(memberRides.getStatus());
+ MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
+ BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
+ if(!Objects.isNull(baseParam)){
+ memberRidesResponse.setBikeType(baseParam.getName());
+ }
+ memberRidesResponse.setRidesType(memberRides.getType());
+ 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()));
+ if(Constants.equalsInteger(memberRides.getType(),Constants.ONE)){
+ Bikes bikes = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,memberRides.getBikeCode()).eq(Bikes::getType,Constants.ONE).last("limit 1"));
+ memberRidesResponse.setVoltageStatus(this.getVoltageStatus(bikes));
+ }
+ //鏌ヨ褰撳墠鐨勯獞琛屽椁�
+ memberRidesResponse.setDiscountMember(this.getUseDiscount(memberId,Constants.ZERO,memberRides.getType()));
+ 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;
}
+ @Override
+ public Integer getVoltageStatus(Bikes bikes){
+ //浣庣數閲忕數鍘�
+ BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_BIKE_VOLTAGE).getCode());
+ if(Objects.isNull(bikes)||Objects.isNull(bikes.getVoltage())||Objects.isNull(lowVoltage)){
+ return 0;
+ }
+ return bikes.getVoltage().compareTo(lowVoltage)>=0?0:1;
+ }
+
@Override
public GoodsorderDetailDTO getGoodsorderDetailDTO(String id) {
-
List<PayOrderDTO> payOrderDTOList = new ArrayList<>();
Goodsorder goodsorder = goodsorderMapper.selectById(id);
if(goodsorder == null){
@@ -384,9 +536,64 @@
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;
}
+
+
+
+ @Override
+ public GoodsorderDetailVO getGoodsorderDetailForDisCount(String id){
+ GoodsorderDetailVO goodsorderDetailVO = new GoodsorderDetailVO();
+ Goodsorder goodsorder = goodsorderMapper.selectById(id);
+ if(goodsorder == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ }
+ if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ }
+ goodsorder.setMoney(Constants.translateMoney(goodsorder.getMoney()));
+ goodsorderDetailVO.setGoodsOrder(goodsorder);
+ Member member = memberMapper.selectById(goodsorder.getMemberId());
+ if(Objects.nonNull(member)){
+ goodsorderDetailVO.setMember(member);
+ }
+ //鏌ヨ鍟嗗搧淇℃伅
+ DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda()
+ .eq(DiscountMember::getIsdeleted,Constants.ZERO)
+ .eq(DiscountMember::getGoodsorderId,goodsorder.getId()));
+ if(Objects.nonNull(discountMember)){
+ goodsorderDetailVO.setDiscountMember(discountMember);
+ }
+ //鏌ヨ鎵�鏈夋湁閫�娆捐褰�
+ List<Refund> refunds = refundJoinMapper.selectJoinList(Refund.class,
+ new MPJLambdaWrapper<Refund>()
+ .selectAll(Refund.class)
+ .selectAs(SystemUser::getRealname,Refund::getCreatorName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Refund::getCreator)
+ .eq(Refund::getObjId,goodsorder.getId())
+ .orderByDesc(Refund::getId)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(refunds)){
+ for (Refund refund:refunds) {
+ if(Objects.nonNull(refund.getMoney())){
+ refund.setMoney(Constants.translateMoney(refund.getMoney()));
+ }
+ }
+ }
+ goodsorderDetailVO.setRefundList(refunds);
+
+ return goodsorderDetailVO;
+ }
+
+
+
@Override
public void forceCloseGoodsorder(String orderId) {
//鏌ヨ璁㈠崟 淇℃伅
@@ -408,19 +615,73 @@
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 ) {
-
-//
- List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
+ 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());//鎵撹溅楠戣璁板綍
+ 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)){
//楠戣鎬绘椂闀�
- closeMoney = getCloseMoneyByRides(memberRides,true).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(),goodsorder.getMemberId(),true).getAmount();
//瀹為檯缁撶畻浠锋牸锛岃褰曞湪鏈�楂樿溅鍨嬭褰曚笂
- memberRides.get(0).setActualPrice(closeMoney);
+// 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,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());
@@ -433,18 +694,49 @@
memberRidesJoinMapper.updateById(up);
}
}
+ int durationSum = 0;
+ int freeTime = 0;
+ try {
+ freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
+ }catch (Exception e){
+ }
+ //鏈�楂樹环鏍艰溅鍨嬬殑楠戣璁板綍
+ //MemberRides topRides = this.getMaxRides(memberRides,durationSum,freeTime,true);
+ MemberRides topRides =null;
+ for(MemberRides rides : memberRides){
+ if ( true && Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璁㈠崟鏈夋湭瀹屾垚鐨勯獞琛岋紝鏃犳硶寮哄埗缁撶畻");
+ }
+ durationSum += Constants.formatIntegerNum(rides.getDuration());//绱楠戣锛堣璐癸級鏃堕暱
+ if(durationSum-freeTime > 0 ){//鍙畻瓒呭嚭鍏嶈垂鏃堕暱鐨勬暟鎹�
+ if(topRides == null ||( Constants.formatIntegerNum(topRides.getSortnum())<Constants.formatIntegerNum(rides.getSortnum())
+ && Constants.formatIntegerNum(rides.getDuration())>0)){
+ topRides = rides;
+ }
+ }
+ }
+ //鏃犺秴杩囧厤璐规椂闀跨殑楠戣璁板綍 鏌ヨ鏈�鍚庝竴鏉¤褰�
+ if(Objects.isNull(topRides)){
+ topRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda().eq(MemberRides::getOrdreId,goodsorder.getId()).orderByDesc(MemberRides::getCreateDate).last("limit 1"));
+ }
+// 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.setParamId(Objects.nonNull(topRides)?topRides.getParamId():null);
+ update.setCloseStatus(Constants.ONE);
update.setCloseDate(new Date());
update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
update.setCloseUserId(goodsorder.getEditor());
+ update.setType(Constants.ZERO);
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);
@@ -452,21 +744,7 @@
//濡傛灉鏄钩鍙拌嚜鍔ㄧ粨绠�
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.setCreator(update.getEditor());
- refundDTO.setType(type);
- Refund refund = wxMiniUtilService.wxRefund(refundDTO);
- update.setCloseId(refund.getId());
- }
+ update.setCloseId(closeId);
//瀛樺偍 娑堣垂浜ゆ槗娴佹按
Transactions transactions = new Transactions();
transactions.setId(Constants.getUUID());
@@ -474,7 +752,7 @@
transactions.setCreateDate(new Date());
transactions.setIsdeleted(Constants.ZERO);
transactions.setOrderId(goodsorder.getId());
- transactions.setMoney(goodsorder.getMoney().subtract(new BigDecimal(refundMoney)));
+ transactions.setMoney(closeMoney);
transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
transactions.setDoneDate(new Date());
transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
@@ -487,19 +765,134 @@
goodsorderMapper.updateById(update);
}
- private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose) {
- RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
- BigDecimal closeMoney = new BigDecimal(0.00);
- int durationSum = 0;
- //鍙栨渶楂樿溅鍨嬭绠楁柟妗堢粨绠楄鍗�
+ public MemberRides getMaxRides(List<MemberRides> memberRides,Integer durationSum,Integer freeTime,boolean isClose){
+ 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(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){
+ return topRides;
+ }
+ /**
+ * 閫�娆炬垚鍔熷洖璋�
+ */
+ @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());
+ if(type == 0|| type ==1 || type==2){
+ //濡傛灉鏄樁娈甸��娆�
+ Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
+ closeGoodsorderDoneNoRefund(goodsorder,type,refund.getMoney(),refund.getId(),null);
+ }
+ }
+
+ 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);
+ }
+
+ @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());
+ 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);
+ //鍙栨渶楂樿溅鍨嬩綔涓鸿浠锋柟妗�
+ //鏌ヨ鎵�鏈夐獞琛岃褰�
+ List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class,wrapper);
+ return memberRides;
+ }
+
+ private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney,String memberId,Boolean unOver) {
+ RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
+ ridesDetailResponse.setHaveDisCount(Constants.ZERO);
+ BigDecimal closeMoney = new BigDecimal(0.00);
+ int durationSum = 0;
+ //鏈�楂樹环鏍艰溅鍨嬬殑楠戣璁板綍
+ //MemberRides topRides = this.getMaxRides(memberRides,durationSum,freeTime,isClose);
+ 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(durationSum-freeTime > 0 ){//鍙畻瓒呭嚭鍏嶈垂鏃堕暱鐨勬暟鎹�
+ if(topRides == null ||( Constants.formatIntegerNum(topRides.getSortnum())<Constants.formatIntegerNum(rides.getSortnum())
+ && Constants.formatIntegerNum(rides.getDuration())>0)){
+ topRides = rides;
+ }
+ }
+ }
+ //璁＄畻搴斾粯閲戦
+ if( topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
//濡傛灉鏄竴鍙ｄ环鏂瑰紡锛屼环鏍肩洿鎺ヤ负涓�鍙ｄ环baseMoney,濡傛灉涓嶆槸璁＄畻姝ｅ父浠锋牸
@@ -511,58 +904,145 @@
closeMoney = closeMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
}
}
+ topRides.setActualPrice(closeMoney);
+ //2025骞�3鏈�18鏃�11:28:38 杩斿洖楠戣浠锋牸鏈�楂樼殑杞﹀瀷
+ ridesDetailResponse.setParamId(topRides.getParamId());
+ }
+ //鏌ヨ鏄惁瀛樺湪濂楅淇℃伅
+ DiscountMember discountMember = this.getUseDiscount(memberId,durationSum,Objects.nonNull(topRides)?topRides.getType():null);
+ //璁＄畻鎶垫墸閲戦
+ //unOver 鏄惁鏈粨绠� 鏈粨绠楃殑璁㈠崟鏍规嵁褰撳墠濂楅鏌ヨ 宸茬粨绠楃殑璁㈠崟鏍规嵁宸茬敓鎴愮殑鏁版嵁杩涜鏌ヨ
+ if(Objects.nonNull(discountMember) && Objects.nonNull(topRides) && unOver){
+ //瀛樺偍鎶垫墸璁板綍
+ DiscountLog discountLog = new DiscountLog();
+ discountLog.setIsdeleted(Constants.ZERO);
+ discountLog.setCreator(memberId);
+ discountLog.setCreateDate(new Date());
+ discountLog.setDiscountMemberId(discountMember.getId());
+ discountLog.setType(Constants.ZERO);
+ discountLog.setInfo("楠戣鎶垫墸");
+ discountLog.setEditInfo("楠戣鎶垫墸");
+ discountLog.setGoodsorderId(topRides.getOrdreId());
+ //濡傛灉楠戣鏃堕棿灏忎簬绛変簬鍓╀綑鏃堕棿 鍒欑洿鎺ユ坊鍔� 楠戣鍗′娇鐢ㄦ暟鎹� 淇瀹為檯鏀粯閲戦
+ if(Constants.equalsInteger(discountMember.getLimitType(),Constants.ZERO) || discountMember.getSurplusTime() >= durationSum){
+ discountLog.setRideTime(durationSum);
+ discountLog.setRidePrice(closeMoney);
+ topRides.setActualPrice(BigDecimal.ZERO);
+ closeMoney = BigDecimal.ZERO;
+ }else{
+ int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
+ BigDecimal closeDisCountMoney = Constants.formatDecimalNum(topRides.getBasePrice());
+ //鍑忓幓浼樻儬鏃堕暱鍓╀綑鏃堕暱
+ Integer durationDisCountSum = durationSum - discountMember.getSurplusTime();
+ discountLog.setRideTime(durationDisCountSum<=Constants.ZERO?discountMember.getSurplusTime():Constants.ZERO);
+ //濡傛灉鏄竴鍙ｄ环鏂瑰紡锛屼环鏍肩洿鎺ヤ负涓�鍙ｄ环baseMoney,濡傛灉涓嶆槸璁＄畻姝ｅ父浠锋牸
+ if(baseTime != -1){//涓嶆槸涓�鍙ｄ环
+ if(durationDisCountSum > baseTime && Constants.formatIntegerNum(topRides.getUnitTime())>0){
+ //濡傛灉瓒呭嚭浜嗚捣姝ヤ环鏍硷紝璁＄畻瓒呭嚭浠锋牸
+ BigDecimal unit = new BigDecimal(durationSum-baseTime).divide(new BigDecimal(topRides.getUnitTime()), 0, BigDecimal.ROUND_UP);
+ //璁＄畻閲戦绱瓒呭嚭閮ㄩ棬浠锋牸锛堣秴鍑烘椂闂村崟浣�*瓒呭嚭鍗曚綅鏃堕棿浠锋牸锛�
+ closeDisCountMoney = closeDisCountMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
+ }
+ discountLog.setRidePrice(durationDisCountSum<=Constants.ZERO?closeMoney.subtract(closeDisCountMoney):BigDecimal.ZERO);
+ }else{
+ discountLog.setRidePrice(BigDecimal.ZERO);
+ }
+ }
+ if(isClose&&discountLog.getRideTime()>Constants.ZERO){
+ discountLogMapper.insert(discountLog);
+ }
+ ridesDetailResponse.setHaveDisCount(discountLog.getRideTime()>Constants.ZERO?Constants.ONE:Constants.ZERO);
+ ridesDetailResponse.setDisCountMoney(discountLog.getRidePrice());
+ }else if(Objects.nonNull(discountMember) && Objects.nonNull(topRides)
+ && !unOver ){
+ //宸茶繕杞﹀垯鏌ヨ鏄惁鏈� 濂楅鍗′娇鐢ㄨ褰�
+ List<DiscountLog> discountLogList = discountLogMapper.selectList(new QueryWrapper<DiscountLog>().lambda().eq(DiscountLog::getGoodsorderId,topRides.getOrdreId()).eq(DiscountLog::getType,Constants.ZERO)
+ .eq(DiscountLog::getIsdeleted,Constants.ZERO));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountLogList)){
+ ridesDetailResponse.setHaveDisCount(Constants.ONE);
+ ridesDetailResponse.setDisCountMoney(discountLogList.stream().map(i->i.getRidePrice()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ }
+ }
+ //濡傛灉璁㈠崟浠锋牸灏侀《浜嗭紝鍙栬鍗� 浠锋牸
+ if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
+ closeMoney = yjMoney;
}
ridesDetailResponse.setDuration(durationSum);
ridesDetailResponse.setAmount(closeMoney);
- ridesDetailResponse.setBikeType(topRides.getParamName());
+ ridesDetailResponse.setBikeType(topRides!=null?topRides.getParamName():"-");
return ridesDetailResponse;
}
- private 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());
- wrapper.selectAll(MemberRides.class).selectAs(BaseParam::getName, MemberRides::getParamName);
- wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
- wrapper.orderByDesc(BaseParam::getSortnum);
- //鍙栨渶楂樿溅鍨嬩綔涓鸿浠锋柟妗�
- //鏌ヨ鎵�鏈夐獞琛岃褰�
- List<MemberRides> memberRides = memberRidesJoinMapper.selectList(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())
+ || 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(), "瀵逛笉璧凤紝璁㈠崟淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
- if (Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.CLOSE.getKey()){
+ if (Constants.equalsInteger(goodsorder.getType(),Constants.ZERO) &&
+ Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.CLOSE.getKey()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヨ鍗曡缁撶畻鍚庡啀閫�娆緙");
+ }
+ if (Constants.equalsInteger(goodsorder.getType(),Constants.ONE) &&
+ Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヨ鍗曡鏀粯鍚庡啀閫�娆緙");
}
QueryWrapper<Refund> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(Refund::getObjId,orderId)
- .eq(Refund::getStatus,Constants.TWO)
+ .eq(Refund::getObjId,goodsorderBackDTO.getOrderId())
+ .in(Refund::getStatus,Constants.TWO,Constants.ZERO)
.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){
+ 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());
- Refund refund = wxMiniUtilService.wxRefund(refundDTO);
+ //閫�璐ч��娆� 鏌ョ湅濂楅璁㈠崟鐘舵�� 鏇存柊璁㈠崟淇℃伅
+ if(Constants.equalsInteger(goodsorderBackDTO.getBackType(),Constants.ZERO)&&Constants.equalsInteger(goodsorder.getType(),Constants.ONE)){
+ DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda().
+ eq(DiscountMember::getGoodsorderId,goodsorder.getId())
+ .eq(DiscountMember::getIsdeleted,Constants.ZERO)
+ .last("limit 1"));
+ 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+"鍏�");
}
@@ -578,7 +1058,7 @@
QueryWrapper<Refund> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Refund::getObjId,orderId)
- .eq(Refund::getStatus,Constants.TWO)
+ .in(Refund::getStatus,Constants.TWO,Constants.ZERO)
.eq(Refund::getIsdeleted,Constants.ZERO) ;
wrapper.select("sum(money) as money").last(" limit 1");
Refund total = refundMapper.selectOne(wrapper);
@@ -600,6 +1080,7 @@
model.setPayMoney(new BigDecimal(0.00));
model.setRefundMoney(new BigDecimal(0.00));
model.setClosedMoney(new BigDecimal(0.00));
+ model.setDiscountMoney(new BigDecimal(0.00));
model.setUnClosedMoney(new BigDecimal(0.00));
model.setClosedNum(0);
model.setUnClosedNum(0);
@@ -614,27 +1095,36 @@
}
queryWrapper.lambda().eq(Goodsorder::getPayStatus, Constants.ONE);//宸叉敮浠�
queryWrapper.lambda().eq(Goodsorder::getIsdeleted, Constants.ZERO);
- queryWrapper.lambda().groupBy(Goodsorder::getStatus);
- queryWrapper.select( "status ","count(id) as count_num"
+ queryWrapper.lambda().groupBy(Goodsorder::getStatus,Goodsorder::getType);
+ queryWrapper.select( "type","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.translateMoney(goodsorder.getCloseMoney())));
+ if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
+ //濡傛灉鏄獞琛岃鍗曟娂閲戯紝璁＄畻楠戣鏀跺叆
+ if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.CLOSE.getKey()){
+ //宸茬粨绠�
+ model.setClosedNum(model.getClosedNum()+goodsorder.getCountNum());
+ //淇敼bug 缁撶畻鏀跺叆 = 鏀粯閲戦-閫�娆�-鏈粨绠�
+// model.setClosedMoney(model.getClosedMoney().add(Constants.translateMoney(goodsorder.getCloseMoney())));
- model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
- 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.translateMoney(goodsorder.getMoney())));
+ model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
+ 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.translateMoney(goodsorder.getMoney())));
- model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
- model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
+ model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
+ model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
+ }
+ }else{
+ //濂楅鍗℃敹鍏ョ疮璁� (浜ゆ槗绗旀暟鍜屼氦鏄撻噾棰濓級
+ model.setDiscountNum(model.getDiscountNum()+goodsorder.getCountNum());
+ model.setDiscountMoney(model.getDiscountMoney().add(Constants.translateMoney(goodsorder.getMoney())));
}
+
}
QueryWrapper<Refund> queryWrapper2 = new QueryWrapper<>();
if(Objects.nonNull(param.getStartDate())) {
@@ -652,6 +1142,7 @@
model.setRefundNum(Constants.formatIntegerNum(refund.getCountNum()));
model.setRefundMoney(Constants.translateMoney(Constants.formatDecimalNum(refund.getMoney())));
}
+ model.setClosedMoney(model.getPayMoney().add(model.getDiscountMoney()).subtract(model.getRefundMoney()).subtract(model.getUnClosedMoney()));
return model;
}
@Override
@@ -664,9 +1155,11 @@
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())
+ .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey()
+ ,Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey(),Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey())
.orderByDesc(MemberRides::getCreateDate));
if (!CollectionUtils.isEmpty(memberRides)){
//棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
@@ -702,7 +1195,8 @@
return memberRidesResponse;
}).collect(Collectors.toList());
//绱鍜岄绠楃粨绠楅噾棰�
- RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false);;
+ RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney(),goodsorder.getMemberId(),
+ Constants.equalsInteger(goodsorder.getStatus(),Constants.GOODSORDER_STATUS.CLOSE.getKey())?false:true);
if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
//濡傛灉闈炲凡鏀粯浣嗘湭缁撶畻锛屼娇鐢ㄨ鍗曢噾棰�
ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -724,6 +1218,7 @@
qry.setStatus(Constants.goodsorderStatus.pay);
qry.setMemberId(memberId);
qry.setIsdeleted(Constants.ZERO);
+ qry.setType(Constants.ZERO);
if(goodsorderMapper.selectCount(new QueryWrapper<>(qry))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
@@ -740,6 +1235,7 @@
goodsorder.setCreateDate(new Date());
goodsorder.setIsdeleted(Constants.ZERO);
goodsorder.setCode(goodsorder.getId());
+ goodsorder.setType(Constants.ZERO);
goodsorder.setMemberId(memberId);
goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(new BigDecimal(100)));
goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
@@ -748,23 +1244,132 @@
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(goodsorder.getMoney().intValue());
- 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;
+ }
+
+
+ @Override
+ public Object createDiscountOrderPay(String memberId,String discountId){
+ Member member = memberMapper.selectById(memberId);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛瀵硅薄淇℃伅");
+ }
+ Discount discount = discountMapper.selectById(discountId);
+ this.checkDiscountSaleDate(discount);
+ String discountMemberId = Constants.getUUID();
+ String goodsorderId = Constants.getUUID();
+ DiscountMember discountMember = new DiscountMember();
+ BeanUtils.copyProperties(discount,discountMember);
+ discountMember.setCreator(null);
+ discountMember.setId(discountMemberId);
+ discountMember.setCreateDate(new Date());
+ discountMember.setEditDate(new Date());
+ discountMember.setEditor(null);
+ discountMember.setMemberId(memberId);
+ discountMember.setStatus(Constants.TWO);
+ discountMember.setGoodsorderId(goodsorderId);
+ if(!Constants.equalsInteger(discountMember.getUseType(),Constants.ZERO)){
+ if(Constants.equalsInteger(discountMember.getUseType(),Constants.ONE)){
+ discountMember.setUseStartDate(DateUtil.StringToDateFormat(DateUtil.getCurrDate(),"yyyy-MM-dd"));
+ }
+ discountMember.setUseEndDate( DateUtil.StringToDateFormat(DateUtil.getXDaysAfter(discountMember.getUseStartDate(),discountMember.getUseDays()-1),"yyyy-MM-dd"));
+ }
+ discountMemberMapper.insert(discountMember);
+ Goodsorder goodsorder = new Goodsorder();
+ goodsorder.setId(goodsorderId);
+ goodsorder.setCreateDate(new Date());
+ goodsorder.setIsdeleted(Constants.ZERO);
+ goodsorder.setCode(goodsorder.getId());
+ goodsorder.setMemberId(memberId);
+ goodsorder.setType(Constants.ONE);
+ goodsorder.setMoney(discount.getPrice().multiply(new BigDecimal(100)));
+ goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
+ goodsorder.setPreOrderid(goodsorder.getId());
+ goodsorder.setPayStatus(Constants.goodsorderPayStatus.waitPay);
+ goodsorder.setPayWay(Constants.ZERO);
+ goodsorder.setObjType(Constants.ZERO);
+ goodsorder.setObjId(discount.getId());
+ this.goodsorderMapper.insert(goodsorder);
+ //璋冭捣鏀粯
+ Object response = null;
+ try {
+ response = getWxPayResponse(goodsorder,member.getOpenid());
+ } catch (Exception e) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍙戣捣鏀粯澶辫触~");
+ }
+ return response;
+
+ }
+
+ public void checkDiscountSaleDate(Discount discount){
+ if(Objects.isNull(discount)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌濂楅淇℃伅");
+ }
+ if(!(Constants.equalsInteger(discount.getIsdeleted(),Constants.ZERO)
+ && Constants.equalsInteger(discount.getStatus(),Constants.ZERO))){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"濂楅宸蹭笅鏋讹紝鏃犳硶杩涜璐拱锛岃鍒锋柊鏌ョ湅");
+ }
+ if(!(discount.getStartDate().getTime() < System.currentTimeMillis()
+ && Utils.Date.getEnd(discount.getEndDate()).getTime() > System.currentTimeMillis() )){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"濂楅寮�鏀炬椂闂存湭鍒�,鏃犳硶杩涜璐拱");
+ }
+ //楠岃瘉鏄惁瓒呰繃浠婃棩鍙敭鍗栨暟閲�
+ if(Objects.nonNull(discount.getSaleDayLimit())&&discount.getSaleDayLimit()>Constants.ZERO){
+ if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
+ .eq(Goodsorder::getType,Constants.ONE)
+ .eq(Goodsorder::getObjId,discount.getId())
+ .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE)
+ .apply(" EXTRACT(DAY FROM create_date) = EXTRACT(DAY FROM CURRENT_DATE) ")
+ )>=discount.getSaleDayLimit()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"濂楅浠婃棩鍙戣閲忓凡鍞絼锛岃鏄庢棩鏌ョ湅锛�");
+ }
+ }
+ if(Objects.nonNull(discount.getSaleLimit())&&discount.getSaleLimit()>Constants.ZERO){
+ if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
+ .eq(Goodsorder::getType,Constants.ONE)
+ .eq(Goodsorder::getObjId,discount.getId())
+ .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE)
+ )>=discount.getSaleLimit()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"濂楅鍙戣閲忓凡鍞絼锛�");
+ }
}
}
+
+
+
+ private Object getWxPayResponse(Goodsorder goodsorder,String openid){
+ Object response = null;
+ //璋冭捣鏀粯
+ PrepayRequest request = new PrepayRequest();
+ request.setAttach("createGoodsOrder");
+ request.setDescription(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)?"妫灄鍏洯鑷杞﹂獞琛屾娂閲戞敮浠�":"妫灄鍏洯鑷杞﹁喘涔伴獞琛屽椁愭敮浠�");
+ 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;
+ }
+
+
+
/**
* 楠岃瘉钀ヤ笟鏃堕棿
@@ -806,11 +1411,45 @@
}
+ @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.setIsdeleted(Constants.ZERO);
+ goodsorder.setType(Constants.ZERO);
goodsorder.setStatus(Constants.goodsorderStatus.pay);
List<Goodsorder> list = findList(goodsorder);
if (!CollectionUtils.isEmpty(list)){
@@ -820,28 +1459,24 @@
s.setEditDate(date);
s.setEditor(null);
s.setCloseDate(date);
-
closeGoodsorder(s,Constants.REFUND_TYPE.PLAT_AUTO.getKey());
}catch (BusinessException e){
-
}catch (Exception e){
}
});
}
-
}
+
@Override
public void goodsOrderSettlement(String memberId) {
Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
.eq("member_id",memberId)
.eq("status",Constants.goodsorderStatus.pay)
+ .eq("type",Constants.ZERO)
.last(" limit 1 "));
if(Objects.isNull(goodsorder)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犻獞琛岃鍗曡褰�");
- }
- if(goodsorder == null ){
- throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ 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(),"瀵逛笉璧凤紝璇ヨ鍗曞綋鍓嶇姸鎬佷笉鏀寔缁撶畻鎿嶄綔锛岃灏濊瘯鍒锋柊鍒楄〃閲嶈瘯锛�" );
@@ -858,9 +1493,53 @@
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);
+ if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
+ this.dealGoodsOrderCallBack(goodsorder);
+ }else{
+ this.dealDiscountOrderCallBack(goodsorder);
+ }
+ return ("澶勭悊鎴愬姛!");
+ }
+
+ public void dealDiscountOrderCallBack(Goodsorder goodsorder){
+ goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
+ goodsorder.setStatus(Constants.goodsorderStatus.pay);
+ goodsorder.setPayDate(new Date());
+ goodsorder.setEditDate(new Date());
+ goodsorderMapper.updateById(goodsorder);
+
+ DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda()
+ .eq(DiscountMember::getGoodsorderId,goodsorder.getId()).last(" limit 1 "));
+ discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda()
+ .set(DiscountMember::getStatus,Constants.ZERO)
+ .eq(DiscountMember::getId,discountMember.getId())
+ );
+ Constants.TRANSACTIONS_TYPE discountConstants = Constants.TRANSACTIONS_TYPE.DISCOUNT;
+ //瀛樺偍浜ゆ槗娴佹按琛�
+ Transactions transactions = new Transactions();
+ transactions.setMemberId(goodsorder.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(goodsorder.getId());
+ transactions.setMoney(goodsorder.getMoney());
+ transactions.setType(discountConstants.getKey());
+ transactions.setPreOrderid(goodsorder.getPreOrderid());
+ transactions.setOnlineOrderid(goodsorder.getOnlineOrderid());
+ transactions.setDoneDate(new Date());
+ transactions.setTitle(discountConstants.getName());
+ transactions.setContent(discountConstants.getInfo());
+ //transactions.setContent(discountMember.getName() +" 鏈夋晥鏈�" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd"));
+ transactions.setBalance(goodsorder.getMoney());
+ transactions.setObjId(discountMember.getId());
+ transactions.setObjType(Constants.TWO);
+ transactionsMapper.insert(transactions);
+ }
+
+
+ public void dealGoodsOrderCallBack(Goodsorder goodsorder){
goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
goodsorder.setStatus(Constants.goodsorderStatus.pay);
goodsorder.setPayDate(new Date());
@@ -883,9 +1562,7 @@
transactions.setObjId(goodsorder.getId());
transactions.setObjType(Constants.ZERO);
transactionsMapper.insert(transactions);
- return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
}
-
/**
@@ -938,4 +1615,176 @@
}
+ /**
+ * 鑾峰彇褰撳墠鍙娇鐢ㄧ殑濂楅
+ * @param memberId
+ */
+ @Override
+ public DiscountMember getUseDiscount(String memberId,Integer driveTime,Integer type){
+ if(Objects.isNull(type)){
+ return null;
+ }
+ String today = DateUtil.getToday();
+ //鍒ゆ柇浠婂ぉ鏄惁涓鸿妭鍋囨棩
+ Holidays holidays = new Holidays();
+ holidays.setHoliday(today);
+ holidays.setIsdeleted(Constants.ZERO);
+ //鏄惁鏄妭鍋囨棩 1=鏄紱0=鍚�
+ Integer holiday = holidaysMapper.selectCount(new QueryWrapper<>(holidays))>0?1:0;
+ List<DiscountMember> discountMemberList = discountMemberMapper.selectJoinList(DiscountMember.class,new MPJLambdaWrapper<DiscountMember>()
+ .selectAll(DiscountMember.class)
+ .select(" ( select sum(d.ride_time) from discount_log d where d.discount_member_id = t.id " +
+ "and d.isdeleted = 0 and d.type = 0 and EXTRACT(DAY FROM d.create_date) = EXTRACT(DAY FROM CURRENT_DATE) ) " , DiscountMember::getUseTime)//鏌ヨ浠婃棩宸蹭娇鐢ㄦ椂闂�
+ .eq(DiscountMember::getStatus,Constants.ZERO)
+ .eq(DiscountMember::getMemberId,memberId)
+ .apply(" t.use_start_date <= '"+today+"' and t.use_end_date >= '"+today+"' ")
+
+ .eq(Constants.equalsInteger(holiday,Constants.ZERO),DiscountMember::getUseWorkday,Constants.ONE)
+ .eq(Constants.equalsInteger(holiday,Constants.ONE),DiscountMember::getUseHoliday,Constants.ONE)
+
+ .eq(Constants.equalsInteger(type,Constants.ZERO),DiscountMember::getIsbike,Constants.ONE)
+ .eq(Constants.equalsInteger(type,Constants.ONE),DiscountMember::getIselecbike,Constants.ONE)
+ .orderByDesc(DiscountMember::getLimitType)
+ .orderByDesc(DiscountMember::getLimitTime)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountMemberList)){
+ //鏌ョ湅鏄惁鏈夋棤鏈熼檺鐨勫椁� 濡傛灉瀛樺湪 鍒欑洿鎺ヨ繑鍥炴棤鏈熼檺鐨勫椁�
+ Optional<DiscountMember> optional = discountMemberList.stream().filter(i->Constants.equalsInteger(i.getLimitType(),Constants.ZERO)).findAny();
+ if(optional.isPresent()){
+ return optional.get();
+ }
+ //澶勭悊鍓╀綑鏃堕棿
+ for (DiscountMember discountMember:discountMemberList) {
+ if(Objects.isNull(discountMember.getUseTime())){
+ discountMember.setSurplusTime(discountMember.getLimitTime());
+ }else if(discountMember.getUseTime()>=discountMember.getLimitTime()){
+ discountMember.setSurplusTime(0);
+ }else{
+ discountMember.setSurplusTime(discountMember.getLimitTime() - discountMember.getUseTime());
+ }
+ }
+ //楠戣涓� 鏄剧ず鍓╀綑鏃堕棿鏈�澶х殑
+ if(Constants.equalsInteger(driveTime,Constants.ZERO)){
+ List<DiscountMember> list = discountMemberList.stream().filter(i->i.getSurplusTime()>0).collect(Collectors.toList());
+ if(list.size()>Constants.ZERO){
+ //d1鍦ㄥ墠鍒欏崌搴� 鍙嶄箣闄嶅簭
+ list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
+ return list.get(Constants.ZERO);
+ }
+ }else{
+ //鏃犳棤鏈熼檺鐨勫椁� 浼樺厛鏌ヨ鍓╀綑鏃堕暱澶т簬楠戣鏃堕暱鐨勪俊鎭�(鍙栨椂闂存渶灏忕殑濂楅) 鍐嶆煡璇㈠皬浜庨獞琛屾椂闀跨殑濂楅
+ List<DiscountMember> list = discountMemberList.stream().filter(i->i.getSurplusTime()>=driveTime).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+ if(list.size()>Constants.ZERO){
+ //d1鍦ㄥ墠鍒欏崌搴� 鍙嶄箣闄嶅簭
+ list.sort((d1,d2)-> Integer.compare(d1.getSurplusTime(),d2.getSurplusTime()));
+ return list.get(Constants.ZERO);
+ }
+
+ }
+ list = discountMemberList.stream().filter(i->i.getSurplusTime()<driveTime).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+ if(list.size()>Constants.ZERO){
+ list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
+ }
+ return list.get(Constants.ZERO);
+ }
+ }
+ }
+ return null;
+ }
+
+
+
+ @Override
+ public void autCancel(){
+ goodsorderMapper.update(null,new UpdateWrapper<Goodsorder>().lambda()
+ .set(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CANCEL.getKey())
+ .set(Goodsorder::getEditDate,DateUtil.getCurrDateTime())
+ .eq(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.UN_PAY.getKey())
+ .apply(" NOW() >= create_date + INTERVAL '30 min' ")
+ );
+ }
+
+
+
+ @Override
+ public List<List<String>> getBikeIncomeReportVOList(Date startDate ,Date endDate){
+ if( (Objects.isNull(startDate)||Objects.isNull(endDate))
+ || startDate.getTime()>endDate.getTime()
+ || DateUtil.daysBetweenDates(endDate,startDate) > 30
+ )
+ {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ System.out.println( DateUtil.daysBetweenDates(endDate,startDate));
+ //鑾峰彇鎵�鏈夎溅鍨嬩俊鎭�
+ List<BaseParam> baseParamList = baseParamMapper.selectList(new QueryWrapper<BaseParam>().lambda().eq(BaseParam::getIsdeleted,Constants.ZERO)
+ .in(BaseParam::getType,Constants.THREE,Constants.FOUR)
+ .orderByAsc(BaseParam::getType,BaseParam::getSortnum)
+ );
+ //鑾峰彇2涓棩鏈熶笅鎵�鏈夊ぉ鏁�
+ List<Date> dateList = DateUtil.getDateList(startDate,endDate);
+ //鏌ヨ鏃ユ湡鍐呯殑鎵�鏈夋暟鎹�
+ List<Goodsorder> goodsorderList = goodsorderMapper.selectList(new QueryWrapper<Goodsorder>().lambda().eq(Goodsorder::getType,Constants.ZERO)
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .eq(Goodsorder::getStatus,Constants.FOUR)
+ .isNotNull(Goodsorder::getParamId)
+ .ge(Goodsorder::getPayDate, Utils.Date.getStart(startDate))
+ .le( Goodsorder::getPayDate, Utils.Date.getEnd(endDate))
+ );
+
+ List<List<String>> parentList = new ArrayList<>();
+
+ for (BaseParam baseParam:baseParamList) {
+ List<String> dataChildList = new ArrayList<>();
+ dataChildList.add(baseParam.getName()+"(鍏�)");
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ for (Date date:dateList) {
+ BigDecimal amount = goodsorderList.stream()
+ .filter(i->StringUtils.isNotBlank(i.getParamId())&&DateUtil.getShortDateStr(date).equals(DateUtil.getShortDateStr(i.getCreateDate()))&&baseParam.getId().equals(i.getParamId()))
+ .map(i->i.getCloseMoney()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ amount = amount.divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP);
+ dataChildList.add(amount.toString());
+ totalAmount = amount.add(totalAmount);
+ }
+ dataChildList.add("锟�"+totalAmount);
+ parentList.add(dataChildList);
+ }
+
+ List<String> dataStrList = new ArrayList<>();
+ dataStrList.add("鏃ユ湡");
+ for (Date date:dateList) {
+ dataStrList.add(DateUtil.getShortDateStr(date));
+ }
+ dataStrList.add("鎬昏");
+ parentList.add(0,dataStrList);
+
+ return parentList;
+
+ }
+
+ @Override
+ public void excel(Date startDate , Date endDate, HttpServletResponse response){
+ List<List<String>> data = this.getBikeIncomeReportVOList(startDate,endDate);
+ try {
+ String fileName = "杞﹀瀷鏀跺叆鍒嗘瀽_"+System.currentTimeMillis();
+ String encodeFileName = URLEncoder.encode(fileName, Charset.forName("UTF-8").toString()) + ".xlsx";
+ response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+ response.setContentType("application/octet-stream");
+ response.setHeader("eva-opera-type", "download");
+ response.setHeader("eva-download-filename", encodeFileName);
+ ExcelExporter.exportList(data, fileName, response.getOutputStream());
+ } catch (IOException e) {
+ throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+ }
+ }
+
+
+
+
+
+
+
+
}
--
Gitblit v1.9.3