From cac8f41a47915de2a30a8784fe1fc35c364e86df Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 10 十月 2023 18:27:08 +0800
Subject: [PATCH] #pgsql 运营监控
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 279 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 246 insertions(+), 33 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 9ad6314..bd46ad9 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
@@ -16,6 +16,7 @@
import com.doumee.core.utils.ID;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniConfig;
+import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.*;
import com.doumee.dao.business.MemberRidesMapper;
import com.doumee.dao.business.join.GoodsorderJoinMapper;
@@ -23,6 +24,9 @@
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.RefundDTO;
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
@@ -38,6 +42,7 @@
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -47,6 +52,7 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.sql.Ref;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -80,6 +86,15 @@
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
+
+ @Autowired
+ private AdMapper adMapper;
+
+ @Autowired
+ private TransactionsMapper transactionsMapper;
+
+ @Autowired
+ private WxMiniUtilService wxMiniUtilService;
@Autowired
PricingRuleService pricingRuleService;
@@ -136,39 +151,64 @@
}
@Override
+ public Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper) {
+ return goodsorderMapper.selectOne(wrapper);
+ }
+
+ @Override
public List<Goodsorder> findList(Goodsorder goodsorder) {
QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
return goodsorderMapper.selectList(wrapper);
}
+ @Override
+ public List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model){
+ List<GoodsorderExportVO> list = new ArrayList<>();
+ model.setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑
+ MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
+ List<Goodsorder> goodsorderList = goodsorderJoinMapper.selectJoinList(Goodsorder.class,queryWrapper);
+ if(goodsorderList!=null){
+ for(Goodsorder order : goodsorderList){
+ GoodsorderExportVO vo = new GoodsorderExportVO();
+ vo.setId(order.getId());
+ vo.setOpenid(order.getMemberOpenid());
+ vo.setPayDate(order.getPayDate());
+ vo.setCloseDate(order.getCloseDate());
+ vo.setCloseDate(order.getCloseDate());
+ vo.setCloseMoney(Constants.formatDecimalNum(order.getCloseMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
+ vo.setRefundDate(order.getRefundDate());
+ vo.setRefundMoney(Constants.formatDecimalNum(order.getRefundMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
+ list.add(vo);
+ }
+ }
+ return list;
+ }
+ private MPJLambdaWrapper<Goodsorder> initQueryParamByModel(Goodsorder model) {
+ MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(model);
+
+ queryWrapper.selectAll(Goodsorder.class);
+ queryWrapper.selectAs(Member::getOpenid, Goodsorder::getMemberOpenid);
+ queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
+ queryWrapper.select("select max(r.done_date) from refund r where t1.obj_id=t.id and r.status=2 ) as refund_date");
+ queryWrapper.select("select sum(r.money) from refund r where t1.obj_id=t.id and r.status=2) as refund_money");
+ //鏃堕棿娈电瓫閫�
+ queryWrapper.ge(model.getStartDate()!=null, Goodsorder::getPayDate, model.getStartDate());
+ queryWrapper.le(model.getEndDate()!=null, Goodsorder::getPayDate, model.getEndDate());
+ queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
+ queryWrapper.eq(model.getCode() !=null,Goodsorder::getCode,model.getCode());
+ queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
+ queryWrapper.eq(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
+ queryWrapper.like(model.getMemberOpenid() !=null,Member::getOpenid,model.getMemberOpenid());
+ queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
+ queryWrapper.orderByDesc(Goodsorder::getPayDate);
+ return queryWrapper;
+ }
+
@Override
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
-
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.like(Goodsorder::getCode, pageWrap.getModel().getCode());
- }
-
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.eq(Goodsorder::getStatus, pageWrap.getModel().getStatus());
- }
-
- if (pageWrap.getModel().getOnlineOrderid() != null) {
- queryWrapper.eq(Goodsorder::getOnlineOrderid, pageWrap.getModel().getOnlineOrderid());
- }
-
- if (pageWrap.getModel().getPayDate() != null) {
- queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(pageWrap.getModel().getPayDate()));
- queryWrapper.le(Goodsorder::getPayDate, Utils.Date.getEnd(pageWrap.getModel().getPayDate()));
- }
-
- queryWrapper.orderByDesc(Goodsorder::getCreateDate);
- queryWrapper.selectAll(Goodsorder.class)
- .selectAs(Member::getName,Goodsorder::getMemberName)
- .leftJoin(Member.class,Member::getId,Goodsorder::getMemberId)
- .like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName,pageWrap.getModel().getMemberName());
+ MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
}
@@ -191,6 +231,13 @@
homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
homeResponse.setPricingRules(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRICING_RULE).getCode());
+ homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
+ homeResponse.setIsStopServe(Constants.ZERO);
+ homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
+ .eq("isdeleted",Constants.ZERO)
+ .eq("status",Constants.ZERO)
+ .orderByDesc("create_date")
+ ));
//鏌ヨ鏄惁瀛樺湪 宸叉敮浠樼殑 鎶奸噾璁㈠崟
Integer status = this.goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>()
.eq("member_id",memberId)
@@ -222,8 +269,6 @@
}
return homeResponse;
}
- @Autowired
- private TransactionsMapper transactionsMapper;
@Override
@@ -341,20 +386,66 @@
}
}
+ @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)){
- 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 -> {
@@ -402,6 +493,10 @@
if(goodsorderMapper.selectCount(new QueryWrapper<>(qry))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
+ //鏄惁澶勪簬灏忕▼搴忓仠姝㈡湇鍔℃椂闂村唴
+ this.checkTemporaryStop();
+ //鏄惁澶勪簬钀ヤ笟鏃堕棿
+ this.checkBusiness();
Goodsorder goodsorder = new Goodsorder();
goodsorder.setId(Constants.getUUID());
goodsorder.setCreateDate(new Date());
@@ -433,6 +528,124 @@
}
}
+ /**
+ * 楠岃瘉钀ヤ笟鏃堕棿
+ */
+ @Override
+ public void checkBusiness(){
+ String businessStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode();
+ String businessEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode();
+ String nowTime = DateUtil.getDate(new Date(),"HH:mm");
+ if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
+ ||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"钀ヤ笟鏃堕棿涓�06:00 ~ 23:59锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
+ }
+ }
+
+ /**
+ * 涓存椂鍋滄鏈嶅姟 鏈氦鎶奸噾鐨勭敤鎴凤紝鏃犳硶鎵溅浣跨敤锛涘凡缁忎氦杩囨娂閲戠殑鐢ㄦ埛鍙互缁х画鎵爜楠戣锛�
+ */
+ @Override
+ public void checkTemporaryStop(){
+ if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE)){
+ String stopServeStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_STARTTIME).getCode();
+ String stopServeEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_ENDTIME).getCode();
+ //鏌ヨ褰撳墠鏃堕棿鏄惁鍦ㄥ仠姝腑
+ long s = DateUtil.StringToDate(stopServeStartTime).getTime();
+ long e = DateUtil.StringToDate(stopServeEndTime).getTime();
+ if(e>System.currentTimeMillis()&&s<=System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
+ }
+ }
+ }
+
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void goodsOrderSettlement(String orderId) {
+ Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
+ QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(MemberRides::getOrdreId,orderId);
+ 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();
+ //TODO 鍙栬瘉
+ BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())).divide(new BigDecimal(pricingRule.getMemberRides().getUnitTime())).setScale(0,BigDecimal.ROUND_CEILING));
+ ridesDetailResponse.setAmount(basePrice.add(multiply));
+ }else {
+ ridesDetailResponse.setAmount(pricingRule.getMemberRides().getBasePrice());
+ }
+ ridesDetailResponse.setBikeType(pricingRule.getBikeType());
+ ridesDetailResponse.setDuration(durationSum);
+ ridesDetailResponse.setMemberRidesResponseList(collect);
+ Refund refund = new Refund();
+
+ //鑻ユ秷璐归噾棰� 澶т簬 璁㈠崟鎶奸噾锛屽垯涓嶈繘琛岄��娆句笟鍔�
+ if(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())>Constants.ZERO){
+ RefundDTO refundDTO = new RefundDTO();
+ refundDTO.setOrderId(orderId);
+ refundDTO.setCanBalance(goodsorder.getMoney());
+ refundDTO.setRefundAmount(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
+ refundDTO.setTotalAmount(goodsorder.getMoney());
+ refundDTO.setMemberId(goodsorder.getMemberId());
+ refundDTO.setReason("鐢ㄦ埛涓诲姩閫�娆�");
+ refundDTO.setType(Constants.REFUND_TYPE.NORMAL.getKey());
+ refund = wxMiniUtilService.wxRefund(refundDTO);
+ }
+
+ //瀛樺偍 娑堣垂 浜ゆ槗娴佹按
+ Transactions transactions = new Transactions();
+ transactions.setMemberId(goodsorder.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(orderId);
+ transactions.setMoney(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())<=Constants.ZERO?goodsorder.getMoney():ridesDetailResponse.getAmount());
+ transactions.setType(Constants.transactionsType.consumption);
+ transactions.setDoneDate(new Date());
+ transactions.setTitle("娑堣垂缁撶畻");
+ transactions.setContent("缁撶畻瀹為檯娑堣垂");
+ transactions.setBalance(BigDecimal.ZERO);
+ transactions.setObjId(orderId);
+ transactions.setObjType(Constants.ONE);
+ transactionsMapper.insert(transactions);
+
+ Goodsorder update = new Goodsorder();
+ update.setId(goodsorder.getId());
+ update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
+ update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
+ update.setCloseId(!Objects.isNull(refund)?refund.getId():null);
+ update.setCloseDate(!Objects.isNull(refund)?refund.getDoneDate():null);
+ update.setCloseInfo(!Objects.isNull(refund)?refund.getInfo():null);
+ update.setCloseType(Constants.ONE);
+ goodsorderMapper.updateById(update);
+ }
+ }
+
+
@Override
public String payNotify(String preOrderId,String paymentNo){
Goodsorder goodsorder = this.goodsorderMapper.selectById(preOrderId);
--
Gitblit v1.9.3