From f1843f0cd53ab6dd749ad71db8e18590ceff98d8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 10:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 1
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 89 ++++++++++++++++++++++++++------------------
server/web/src/main/java/com/doumee/api/web/AccountApi.java | 7 +++
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 11 ++++-
4 files changed, 69 insertions(+), 39 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 4bdbd4a..b8873ca 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -30,6 +30,7 @@
public static final String FILE_DIR ="FILE_DIR" ;
public static final String PRIVATE_KEY = "PRIVATE_KEY";
public static final String PROJECT_FILE = "PROJECT_FILE";
+ public static final String PROJECTS = "PROJECTS";
public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
public static String REDIS_DEBUG_STR="test_";
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 a27f44c..eeacdc4 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
@@ -242,13 +242,15 @@
@Override
public HomeResponse getHome(String memberId){
HomeResponse homeResponse = new HomeResponse();
+ String fullPath = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode() +
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
homeResponse.setParkName(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PROJECT_NAME).getCode());
homeResponse.setServerPhone(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.SERVER_PHONE).getCode());
- homeResponse.setLeaseNoticeUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
+ homeResponse.setLeaseNoticeUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE_URL).getCode());
homeResponse.setLeaseNotice(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LEASE_NOTICE).getCode());
homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
- homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
+ homeResponse.setLeaseVideoUrl(fullPath + systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
homeResponse.setIsBusiness(this.checkBusiness()?0:1);
@@ -258,6 +260,11 @@
.eq("status",Constants.ZERO)
.orderByDesc("create_date")
));;
+ if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){
+ homeResponse.getAdList().forEach(i->{
+ i.setImgfullurl(fullPath + i.getImgurl());
+ });
+ }
homeResponse.setRideStatus(-1);
//鏌ヨ鏄惁瀛樺湪 宸叉敮浠樼殑 鎶奸噾璁㈠崟
Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
index 559d288..85a1fb7 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -53,13 +53,23 @@
@Override
public String create(PricingDetail pricingDetail) {
+ //鏍￠獙鍙傛暟鍚堟硶鎬�
checkPricingDetail(pricingDetail);
+
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ UpdateWrapper<PricingDetail> wrapper = new UpdateWrapper<>();
+ wrapper.lambda()
+ .set(PricingDetail::getIsdeleted,Constants.ONE)
+ .set(PricingDetail::getEditDate,new Date())
+ .set(PricingDetail::getEditor,principal.getId())
+ .eq(PricingDetail::getBikeTypeId,pricingDetail.getBikeTypeId())
+ .eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId());
+ pricingDetailMapper.update(null, wrapper);//鍒犻櫎鑰佺殑閰嶇疆
+
PricingDetail insert = new PricingDetail();
+ insert.setId(Constants.getUUID());
insert.setCreateDate(new Date());
insert.setCreator(principal.getId());
- insert.setEditDate(new Date());
- insert.setEditor(principal.getId());
insert.setIsdeleted(Constants.ZERO);
insert.setPricePramId(pricingDetail.getPricePramId());
insert.setBikeTypeId(pricingDetail.getBikeTypeId());
@@ -72,49 +82,54 @@
insert.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
insert.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
insert.setInfo(pricingDetail.getInfo());
- insert.setTitle(pricingDetail.getTitle());
+ String title = getRoleNameByParam(pricingDetail.getBasePrice(),pricingDetail.getBaseTime(),pricingDetail.getUnitPrice(),pricingDetail.getUnitTime());
+ String info = getRoleNameByParam(pricingDetail.getHolidayBasePrice(),pricingDetail.getHolidayBaseTime(),pricingDetail.getHolidayUnitPrice(),pricingDetail.getHolidayUnitTime());;
+ insert.setTitle(title);//宸ヤ綔鏃ヨ浠烽厤缃鍒�
+ insert.setInfo(info);//鑺傚亣鏃ヨ浠烽厤缃鍒�
pricingDetailMapper.insert(insert);
return pricingDetail.getId();
}
+ private String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
+ String title = "";
+ if(baseTime < 0){
+ title = "瑙勫垯锛�"+Constants.translateMoney(basePrice).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
+ }else {
+ title = "瑙勫垯锛氳捣姝�";
+ int time = baseTime / 60;
+ int min = baseTime % 60;
+ if(time > 0){
+ title += time+"灏忔椂";
+ }
+ if(min >0){
+ title += min+"鍒嗛挓";
+ }
+ title = Constants.translateMoney(unitPrice).doubleValue()
+ +"鍏冿紝瓒呰繃鍚�"+Constants.translateMoney(basePrice).doubleValue()+"鍏�/"
+ +unitTime+"鍒嗛挓";
+ }
+ return title;
+ }
+
private void checkPricingDetail(PricingDetail pricingDetail){
- if ((Objects.nonNull(pricingDetail.getBaseTime()) && pricingDetail.getBaseTime() < 0) &&
- Objects.isNull(pricingDetail.getBasePrice())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓�鍙ｄ环浠锋牸涓嶅彲涓虹┖");
+ if(StringUtils.isBlank(pricingDetail.getPricePramId())
+ ||StringUtils.isBlank(pricingDetail.getBikeTypeId())
+ ||pricingDetail.getBaseTime() == null
+ ||pricingDetail.getBaseTime()==0
+ ||Constants.formatDecimalNum(pricingDetail.getBasePrice() ).doubleValue()<0
+ ||Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice() ).doubleValue()<0
+ ||pricingDetail.getHolidayBaseTime() == null
+ || pricingDetail.getHolidayBaseTime()==0){
+ //鍙傛暟閿欒
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
- if ((Objects.nonNull(pricingDetail.getBaseTime()) && pricingDetail.getBaseTime() > 0) &&
- (Objects.isNull(pricingDetail.getBasePrice())
- || Objects.isNull(pricingDetail.getUnitTime())
- || Objects.isNull(pricingDetail.getUnitPrice()))){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"闃舵瀹氫环鍙傛暟涓嶅彲涓虹┖");
+ if ( pricingDetail.getBaseTime() < 0){
+ pricingDetail.setBaseTime(-1);
}
-
- if ( (Objects.nonNull(pricingDetail.getHolidayBaseTime()) && pricingDetail.getHolidayBaseTime() < 0)
- && ( Objects.isNull(pricingDetail.getHolidayBasePrice()))
- ){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鑺傚亣涓�鍙ｄ环浠锋牸涓嶅彲涓虹┖");
+ if ( pricingDetail.getHolidayBaseTime() < 0){
+ pricingDetail.setHolidayBaseTime(-1);
}
-
- if (((Objects.nonNull(pricingDetail.getHolidayBaseTime()) && pricingDetail.getHolidayBaseTime() > 0))
- && (Objects.isNull(pricingDetail.getHolidayBasePrice())
- || Objects.isNull(pricingDetail.getHolidayUnitTime())
- || Objects.isNull(pricingDetail.getHolidayUnitPrice()))){
-
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鑺傚亣闃舵瀹氫环鍙傛暟涓嶅彲涓虹┖");
- }
-
- QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(PricingDetail::getIsdeleted,Constants.ZERO)
- .eq(PricingDetail::getBikeTypeId,pricingDetail.getBikeTypeId())
- .eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId())
- .last("limit 1");
- PricingDetail exitCount = pricingDetailMapper.selectOne(wrapper);
-
- if (Objects.nonNull(exitCount) && !Objects.equals(exitCount.getId(),pricingDetail.getId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヨ溅鍨嬪凡閰嶇疆");
- }
+// PricingDetail exitCount = pricingDetailMapper.selectOne(wrapper);
}
diff --git a/server/web/src/main/java/com/doumee/api/web/AccountApi.java b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
index 3b007c0..4bb78d8 100644
--- a/server/web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -1,5 +1,7 @@
package com.doumee.api.web;
+import com.doumee.core.Jwt.JwtPayLoad;
+import com.doumee.core.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
@@ -64,6 +66,11 @@
}
+ public static void main(String[] args) {
+ JwtPayLoad payLoad = new JwtPayLoad("07a9f07178864e57bf1fb34e7a321f08");
+ System.out.println(JwtTokenUtil.generateToken(payLoad));
+ }
+
@LoginRequired
@ApiOperation(value = "瑙ｆ瀽寰俊鎵嬫満鍙�", notes = "灏忕▼搴忕")
@PostMapping("/wxPhone")
--
Gitblit v1.9.3