From 580cead2bc3a8502cd9bdd098df02345c0616b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 12:12:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 117 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 28 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 2245919..56f195a 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
@@ -23,6 +23,7 @@
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.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
@@ -83,6 +84,12 @@
private MemberRidesJoinMapper memberRidesJoinMapper;
@Autowired
+ private AdMapper adMapper;
+
+ @Autowired
+ private TransactionsMapper transactionsMapper;
+
+ @Autowired
PricingRuleService pricingRuleService;
@Override
@@ -141,35 +148,56 @@
QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
return goodsorderMapper.selectList(wrapper);
}
+ @Override
+ public List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model){
+ List<GoodsorderExportVO> list = new ArrayList<>();
+ 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.getMemberName());
+ 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);
+ //鍙煡璇㈡敮浠樻垚鍔熺殑
+ model.setPayStatus(Constants.ONE);
+ 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));
}
@@ -192,6 +220,23 @@
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")
+ ));
+ 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()){
+ homeResponse.setIsStopServe(Constants.ONE);
+ }
+ }
//鏌ヨ鏄惁瀛樺湪 宸叉敮浠樼殑 鎶奸噾璁㈠崟
Integer status = this.goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>()
.eq("member_id",memberId)
@@ -223,8 +268,6 @@
}
return homeResponse;
}
- @Autowired
- private TransactionsMapper transactionsMapper;
@Override
@@ -397,7 +440,6 @@
}
@Override
public RidesDetailResponse getRidesDetailResponse(String id) {
-
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(MemberRides::getOrdreId,id);
@@ -450,6 +492,25 @@
if(goodsorderMapper.selectCount(new QueryWrapper<>(qry))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
+ //鏄惁澶勪簬灏忕▼搴忓仠姝㈡湇鍔℃椂闂村唴
+ 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(),"褰撳墠灏忕▼搴忓仠姝㈡湇鍔★紝璇锋敞鎰忔煡鐪嬪叕鍛�");
+ }
+ }
+ //鏄惁澶勪簬钀ヤ笟鏃堕棿
+ 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(),"褰撳墠鏃堕棿鏆傛湭钀ヤ笟鏈嶅姟锛岃娉ㄦ剰鏌ョ湅钀ヤ笟鏃堕棿");
+ }
Goodsorder goodsorder = new Goodsorder();
goodsorder.setId(Constants.getUUID());
goodsorder.setCreateDate(new Date());
--
Gitblit v1.9.3