From f19155dcda0413563963d545eed3045364814c0d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 12 八月 2023 05:14:27 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
index 4205722..f83a967 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -111,6 +111,7 @@
BigDecimal discountPercent;
String useLimit = "";
for(MgtCouponPageVo mgtCouponPageVo : mgtCouponPageVoList){
+ useLimit = null;
//处理使用限制
couponType = mgtCouponPageVo.getCouponType();
if(couponType.equals("满减")){
@@ -123,7 +124,7 @@
discountPercent = mgtCouponPageVo.getDiscountPercent();
useLimit = discountPercent.toString() + "折";
}
- if(couponType.equals("抵扣")){
+ if(couponType.equals("代金")){
discountMoney = mgtCouponPageVo.getDiscountMoney();
useLimit = discountMoney.toString();
}
@@ -133,7 +134,7 @@
if(validTimeType==1){
validStartTime = mgtCouponPageVo.getValidStartTime();
validEndTime = mgtCouponPageVo.getValidEndTime();
- validTime = DateUtils.dateTime(validStartTime) + '-' + DateUtils.dateTime(validEndTime);
+ validTime = DateUtils.parseDateToStr("yyyy-MM-dd",validStartTime) + '-' + DateUtils.parseDateToStr("yyyy-MM-dd",validEndTime);
}else if(validTimeType==2){
validDay = mgtCouponPageVo.getValidDay();
validTime = "领取之日起" + validDay.toString() + "天";
@@ -209,20 +210,23 @@
* @description 平台获取优惠券编辑信息
* @author jqs
* @date 2023/6/13 14:29
- * @param couponId
+ * @param merBaseGetDto
* @return MgtCouponGetVo
*/
@Override
- public MerCouponGetVo getMerCouponVo(String couponId){
+ public MerCouponGetVo getMerCouponVo(MerBaseGetDto merBaseGetDto){
MerCouponGetVo merCouponGetVo = new MerCouponGetVo();
- Coupon coupon = this.getById(couponId);
+ Coupon coupon = this.getById(merBaseGetDto.getId());
BeanUtils.copyProperties(coupon, merCouponGetVo);
//判断优惠券是否为指定商品
if(coupon.getUseScope()==2){
String relGoodsIds = coupon.getRelGoodsIds();
if(StringUtils.isNotBlank(relGoodsIds)){
//获取指定商品列表
- List<MerGoodsPriceListVo> goodsList = remoteGoodsService.listGoodsPriceByGoodsId(relGoodsIds).getData();
+ MerGoodsPriceListDto merGoodsPriceListDto = new MerGoodsPriceListDto();
+ merGoodsPriceListDto.setGoodsIds(relGoodsIds);
+ merGoodsPriceListDto.setShopId(merBaseGetDto.getShopId());
+ List<MerGoodsPriceListVo> goodsList = remoteGoodsService.listGoodsPriceByGoodsId(merGoodsPriceListDto).getData();
if(goodsList!=null&&!goodsList.isEmpty()){
merCouponGetVo.setRelGoodsList(goodsList);
}
@@ -694,7 +698,7 @@
if(validTimeType==1){
validStartTime = mgtCouponAuditPageVo.getValidStartTime();
validEndTime = mgtCouponAuditPageVo.getValidEndTime();
- validTime = DateUtils.dateTime(validStartTime) + '-' + DateUtils.dateTime(validEndTime);
+ validTime = DateUtils.parseDateToStr("yyyy-MM-dd",validStartTime) + '-' + DateUtils.parseDateToStr("yyyy-MM-dd",validEndTime);
}else if(validTimeType==2){
validDay = mgtCouponAuditPageVo.getValidDay();
validTime = "领取之日起" + validDay.toString() + "天";
--
Gitblit v1.7.1