From c977f0e2fd86ca3e9e3ad3961f702206c41d2767 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 10:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
index 1a049aa..7c88851 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DiscountMapper;
import com.doumee.dao.business.join.BikeRepairJoinMapper;
@@ -29,6 +30,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -58,6 +60,9 @@
discount.setIsdeleted(Constants.ZERO);
discount.setCreateDate(new Date());
discount.setCreator(userInfo.getId());
+ if(Constants.equalsInteger(discount.getUseType(),Constants.ZERO)){
+ discount.setUseDays((int) (DateUtil.getBetweenDays(DateUtil.dateToString(discount.getUseStartDate(),"yyyy-MM-dd"),DateUtil.dateToString(discount.getUseEndDate(),"yyyy-MM-dd"))));
+ }
discountMapper.insert(discount);
return discount.getId();
}
@@ -68,15 +73,15 @@
|| StringUtils.isBlank(discount.getName())
|| Objects.isNull(discount.getType())
|| Objects.isNull(discount.getLimitType())
- || (discount.getLimitTime()==Constants.ONE && Objects.isNull(discount.getLimitTime()))
- || Objects.isNull(discount.getPrice())
+ || (Constants.equalsInteger(discount.getLimitTime(),Constants.ONE) && Objects.isNull(discount.getLimitTime()))
+ || Objects.isNull(discount.getPrice()) || discount.getPrice().compareTo(BigDecimal.ZERO) <= Constants.ZERO
|| Objects.isNull(discount.getChannel())
|| Objects.isNull(discount.getStartDate())
|| Objects.isNull(discount.getEndDate())
|| Objects.isNull(discount.getUseType())
- || (discount.getUseType()==Constants.ZERO && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseEndDate()) ))
- || (discount.getUseType()==Constants.ONE && Objects.isNull(discount.getUseDays()))
- || (discount.getUseType()==Constants.TWO && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseDays()) ))
+ || (Constants.equalsInteger(discount.getUseType(),Constants.ZERO) && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseEndDate()) ))
+ || (Constants.equalsInteger(discount.getUseType(),Constants.ONE) && Objects.isNull(discount.getUseDays()))
+ || (Constants.equalsInteger(discount.getUseType(),Constants.TWO) && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseDays()) ))
|| (Objects.isNull(discount.getUseHoliday()) || Objects.isNull(discount.getUseWorkday()) )
|| (Objects.isNull(discount.getIsbike()) || Objects.isNull(discount.getIselecbike()) )
){
@@ -86,15 +91,16 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閿�鍞椂娈典俊鎭敊璇�");
}
//鍥哄畾鏃ユ湡鐢熸晥
- if(discount.getUseType()==Constants.ZERO &&
+ if(Constants.equalsInteger(discount.getUseType(),Constants.ZERO) &&
( discount.getUseStartDate().getTime()>discount.getUseEndDate().getTime() ||
discount.getUseStartDate().getTime() < discount.getStartDate().getTime() ||
discount.getUseEndDate().getTime() > discount.getEndDate().getTime()
) ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浣跨敤鏃舵淇℃伅閿欒");
}
+
//鎸囧畾鏃ユ湡鐢熸晥
- if(discount.getUseType()==Constants.TWO &&
+ if(Constants.equalsInteger(discount.getUseType(),Constants.TWO) &&
( discount.getUseStartDate().getTime()<discount.getStartDate().getTime() ||
discount.getUseStartDate().getTime() > discount.getEndDate().getTime()
) ){
@@ -125,8 +131,6 @@
}
discountMapper.update(null,new UpdateWrapper<Discount>().lambda().set(Discount::getStatus,discount.getStatus()).eq(Discount::getId,discount.getId()));
}
-
-
@Override
@@ -168,6 +172,7 @@
if(Objects.isNull(discount)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ this.dealPrice(discount);
if(StringUtils.isNotBlank(discount.getImgurl())){
String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+
systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.DISCOUNT).getCode();
@@ -203,10 +208,31 @@
.eq(Objects.nonNull(modele.getBikeOrElec()) && Constants.equalsInteger(modele.getBikeOrElec(),Constants.TWO),Discount::getIselecbike, Constants.ONE)
.eq(Discount::getIsdeleted, Constants.ZERO)
.eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus());
- queryWrapper.orderByDesc(Discount::getCreateDate);
- return PageData.from(discountJoinMapper.selectJoinPage(page, Discount.class,queryWrapper));
+ queryWrapper.orderByDesc(Discount::getCreateDate);
+ PageData<Discount> pageData = PageData.from(discountJoinMapper.selectJoinPage(page, Discount.class,queryWrapper));
+ for (Discount discount:pageData.getRecords()) {
+ dealPrice(discount);
+ }
+ return pageData;
}
+
+
+ @Override
+ public void dealPrice(Discount discount){
+ if(Objects.isNull(discount)
+ || Objects.isNull(discount.getUseEndDate())
+ || Objects.isNull(discount.getUseStartDate())
+ || Objects.isNull(discount.getPrice())
+ || discount.getPrice().compareTo(BigDecimal.ZERO)==0
+ ){
+ discount.setDayPrice(BigDecimal.ZERO);
+ return;
+ }
+ discount.setDayPrice(discount.getPrice().divide(new BigDecimal(Long.toString(discount.getUseDays())),2));
+ }
+
+
@Override
public long count(Discount discount) {
QueryWrapper<Discount> wrapper = new QueryWrapper<>(discount);
--
Gitblit v1.9.3