From 801956f3b52d092e88d6c85b809383a1c1f71a05 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 10 十月 2023 08:59:51 +0800
Subject: [PATCH] #pgsql 基础配置 字段值跟新上传
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 210 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 196 insertions(+), 14 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 888b31f..2245919 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
@@ -9,6 +9,7 @@
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
@@ -22,19 +23,19 @@
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.web.response.HomeResponse;
+import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
+import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
-import com.doumee.dao.business.web.response.MemberRidesResponse;
-import com.doumee.dao.business.web.response.PayOrderDTO;
import com.doumee.service.business.GoodsorderService;
+import com.doumee.service.business.PricingRuleService;
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 org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -51,6 +52,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
@Service
public class GoodsorderServiceImpl implements GoodsorderService {
@@ -74,14 +76,14 @@
@Autowired
private BaseParamMapper baseParamMapper;
-
-
-
@Autowired
private RefundMapper refundMapper;
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
+
+ @Autowired
+ PricingRuleService pricingRuleService;
@Override
public String create(Goodsorder goodsorder) {
@@ -221,8 +223,8 @@
}
return homeResponse;
}
-
-
+ @Autowired
+ private TransactionsMapper transactionsMapper;
@Override
@@ -237,7 +239,7 @@
PayOrderDTO payOrderDTO = new PayOrderDTO();
payOrderDTO.setOrderCode(goodsorder.getCode());
- payOrderDTO.setPayType(goodsorder.getPayWay());
+ payOrderDTO.setPayWay(goodsorder.getPayWay());
payOrderDTO.setMoney(goodsorder.getMoney());
payOrderDTO.setPayDate(goodsorder.getPayDate());
payOrderDTOList.add(0,payOrderDTO);
@@ -245,7 +247,8 @@
refunds.forEach(s->{
PayOrderDTO refundOrderDTO = new PayOrderDTO();
refundOrderDTO.setOrderCode(s.getCode());
- refundOrderDTO.setPayType(s.getPayWay());
+ refundOrderDTO.setPayWay(s.getPayWay());
+ refundOrderDTO.setRefundType(s.getType());
refundOrderDTO.setMoney(s.getMoney());
refundOrderDTO.setPayDate(s.getDoneDate());
payOrderDTOList.add(refundOrderDTO);
@@ -262,15 +265,177 @@
}
@Override
- public Goodsorder closerGoodsorder(String id) {
+ public void closerGoodsorder(String id) {
+
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Goodsorder goodsorder = goodsorderMapper.selectById(id);
+ QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(MemberRides::getOrdreId,id);
+ List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
+ if (!CollectionUtils.isEmpty(memberRides)){
+ boolean exitUnBack = memberRides.stream().anyMatch(s -> !Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey().equals(s.getStatus()));
+ if (exitUnBack){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璁㈠崟鏈夋湭瀹屾垚鐨勯獞琛岋紝鏃犳硶寮哄埗缁撶畻");
+ }
+
+ PricingRuleDTO pricingRule = pricingRuleService.getPricingRule(memberRides);
+ RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
+ List<MemberRidesResponse> collect = memberRides.stream().map(s -> {
+ MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
+ memberRidesResponse.setRideStartTime(s.getRentDate());
+ memberRidesResponse.setRideEndTime(s.getBackDate());
+ memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(), memberRidesResponse.getRideEndTime()));
+ memberRidesResponse.setDuration(s.getDuration());
+ memberRidesResponse.setBikeType(s.getParamName());
+ memberRidesResponse.setBikeCode(s.getBikeCode());
+ memberRidesResponse.setBasePrice(s.getBasePrice());
+ memberRidesResponse.setBaseTime(s.getBaseTime());
+ memberRidesResponse.setUnitPrice(s.getUnitTime());
+ memberRidesResponse.setUnitTime(s.getUnitTime());
+ return memberRidesResponse;
+ }).collect(Collectors.toList());
+
+ Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
+ if (durationSum > pricingRule.getMemberRides().getBaseTime()){
+ BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
+ BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())));
+ ridesDetailResponse.setAmount(basePrice.add(multiply));
+ }else {
+ ridesDetailResponse.setAmount(pricingRule.getMemberRides().getBasePrice());
+ }
+ ridesDetailResponse.setBikeType(pricingRule.getBikeType());
+ ridesDetailResponse.setDuration(durationSum);
+ ridesDetailResponse.setMemberRidesResponseList(collect);
-
- return null;
+ Refund refund = new Refund();
+ refund.setCreateDate(new Date());
+ refund.setCreator(principal.getId());
+ refund.setEditDate(new Date());
+ refund.setEditor(principal.getId());
+ refund.setIsdeleted(Constants.ZERO);
+ refund.setInfo("绯荤粺缁撶畻鍚庤鍗曡嚜鍔ㄥ畬缁�");
+// refund.setCode();
+ refund.setMemberId(goodsorder.getMemberId());
+ refund.setMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
+// refund.setStatus();
+// refund.setPreOrderid();
+// refund.setOnlineOrderid();
+ refund.setPayWay(goodsorder.getPayWay());
+ refund.setDoneDate(new Date());
+ refund.setType(Constants.ONE);
+ refund.setObjId(goodsorder.getId());
+ refund.setReason("纭畾寮哄埗缁撶畻鍚楋紵缁撶畻鍚庤鍗曡嚜鍔ㄥ畬缁�");
+ refundMapper.insert(refund);
+ Goodsorder update = new Goodsorder();
+ update.setId(goodsorder.getId());
+ update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
+ update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
+ update.setCloseId(refund.getId());
+ update.setCloseDate(refund.getDoneDate());
+ update.setCloseInfo(refund.getInfo());
+ update.setCloseUserId(principal.getId());
+ update.setCloseType(Constants.ONE);
+ goodsorderMapper.updateById(update);
+ }
}
+ @Override
+ public GoodsorderTotalDataVO getTotalData(Goodsorder param){
+
+ GoodsorderTotalDataVO model = new GoodsorderTotalDataVO();
+ model.setPayMoney(new BigDecimal(0.00));
+ model.setRefundMoney(new BigDecimal(0.00));
+ model.setClosedMoney(new BigDecimal(0.00));
+ model.setUnClosedMoney(new BigDecimal(0.00));
+ model.setClosedNum(0);
+ model.setUnClosedNum(0);
+ 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()));
+ 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" );
+ //鎸夎鍗曠姸鎬佸垎缁勭粺璁�
+ 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())));
+
+ model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
+ model.setPayMoney(model.getPayMoney().add(Constants.formatDecimalNum(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.setPayNum(model.getPayNum()+goodsorder.getCountNum());
+ model.setPayMoney(model.getPayMoney().add(Constants.formatDecimalNum(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()));
+ queryWrapper2.lambda().eq(Refund::getIsdeleted, Constants.ZERO);
+ queryWrapper2.select( "count(id) as count_num"
+ ,"sum(money) as money" );
+ //缁熻閫�娆炬暟鎹�
+ Refund refund = refundMapper.selectOne(queryWrapper2.last("limit 1"));
+ if(refund !=null){
+ model.setRefundNum(Constants.formatIntegerNum(refund.getCountNum()));
+ model.setRefundMoney( Constants.formatDecimalNum(refund.getMoney()));
+ }
+ return model;
+ }
+ @Override
+ public RidesDetailResponse getRidesDetailResponse(String id) {
+
+ QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(MemberRides::getOrdreId,id);
+ List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
+ if (!CollectionUtils.isEmpty(memberRides)){
+ PricingRuleDTO pricingRule = pricingRuleService.getPricingRule(memberRides);
+ RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
+ List<MemberRidesResponse> collect = memberRides.stream().map(s -> {
+ MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
+ memberRidesResponse.setRideStartTime(s.getRentDate());
+ memberRidesResponse.setRideEndTime(s.getBackDate());
+ memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(), memberRidesResponse.getRideEndTime()));
+ memberRidesResponse.setDuration(s.getDuration());
+ memberRidesResponse.setBikeType(s.getParamName());
+ memberRidesResponse.setBikeCode(s.getBikeCode());
+ memberRidesResponse.setBasePrice(s.getBasePrice());
+ memberRidesResponse.setBaseTime(s.getBaseTime());
+ memberRidesResponse.setUnitPrice(s.getUnitTime());
+ memberRidesResponse.setUnitTime(s.getUnitTime());
+ return memberRidesResponse;
+ }).collect(Collectors.toList());
+
+ Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
+ if (durationSum > pricingRule.getMemberRides().getBaseTime()){
+ BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
+ BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())));
+ ridesDetailResponse.setAmount(basePrice.add(multiply));
+ }else {
+ ridesDetailResponse.setAmount(pricingRule.getMemberRides().getBasePrice());
+ }
+ ridesDetailResponse.setBikeType(pricingRule.getBikeType());
+ ridesDetailResponse.setDuration(durationSum);
+ ridesDetailResponse.setMemberRidesResponseList(collect);
+ return ridesDetailResponse;
+ }
+
+ return new RidesDetailResponse();
+ }
@Override
public Object createGoodsOrderPay(String memberId){
@@ -328,6 +493,23 @@
goodsorder.setPayDate(new Date());
goodsorder.setEditDate(new Date());
goodsorderMapper.updateById(goodsorder);
+ //瀛樺偍浜ゆ槗娴佹按琛�
+ 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(Constants.transactionsType.deposit);
+ transactions.setPreOrderid(goodsorder.getPreOrderid());
+ transactions.setOnlineOrderid(goodsorder.getOnlineOrderid());
+ transactions.setDoneDate(new Date());
+ transactions.setTitle("鏀粯");
+ transactions.setContent("鎶奸噾鏀粯");
+ transactions.setBalance(goodsorder.getMoney());
+ transactions.setObjId(goodsorder.getId());
+ transactions.setObjType(Constants.ZERO);
+ transactionsMapper.insert(transactions);
return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
}
--
Gitblit v1.9.3