From 850a4fda332510d74e996323ae3604bfe5805fd8 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 17 Jun 2024 09:43:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=80=E5=B8=88?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrderTakingCommentController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/sqx/modules/taking/controller/OrderTakingCommentController.java b/src/main/java/com/sqx/modules/taking/controller/OrderTakingCommentController.java index 20333fe..43bc344 100644 --- a/src/main/java/com/sqx/modules/taking/controller/OrderTakingCommentController.java +++ b/src/main/java/com/sqx/modules/taking/controller/OrderTakingCommentController.java @@ -1,7 +1,9 @@ package com.sqx.modules.taking.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.Result; +import com.sqx.modules.bl.order.entity.UserPackageOrder; import com.sqx.modules.taking.entity.TakingCommnt; import com.sqx.modules.taking.service.OrderTakingCommentService; import io.swagger.annotations.Api; @@ -10,6 +12,8 @@ import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; + @RestController @RequestMapping("/takingComment") @Api(value = "评论", tags = {"评论"}) @@ -46,5 +50,12 @@ public class OrderTakingCommentController { } + @PostMapping("/insertTaking") + public Result refund(TakingCommnt takingCommnt){ + takingCommnt.setCreateTime(DateUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss")); + orderTakingCommentService.save(takingCommnt); + return Result.success(); + } + } From 3ffcb31b51bb0407c56a5c711df9f9859bb376c2 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 17 Jun 2024 11:10:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9C=A8=E9=A2=86=E5=8F=96=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=8D=B7=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E4=BA=BA7=E5=A4=A9=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E4=BA=BA=E4=BC=98=E6=83=A0=E5=8D=B7?= =?UTF-8?q?=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/coupon/entity/Coupon.java | 2 + .../service/impl/CouponUserServiceImpl.java | 39 ++++++++++++++++--- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/coupon/entity/Coupon.java b/src/main/java/com/sqx/modules/coupon/entity/Coupon.java index 19906a3..481aada 100644 --- a/src/main/java/com/sqx/modules/coupon/entity/Coupon.java +++ b/src/main/java/com/sqx/modules/coupon/entity/Coupon.java @@ -40,6 +40,8 @@ public class Coupon implements Serializable { @ApiModelProperty("优惠券金额") private BigDecimal money; + @ApiModelProperty("优惠券类型") + private BigDecimal couType; public Coupon() {} } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java b/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java index c83f46e..c2a5785 100644 --- a/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java +++ b/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java @@ -1,5 +1,6 @@ package com.sqx.modules.coupon.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.PageUtils; @@ -18,6 +19,9 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -97,12 +101,36 @@ public class CouponUserServiceImpl extends ServiceImpl7){ + return Result.error("您已经过了新人优惠期"); + } + //获取所有新人优惠卷 + + QueryWrapper couponQueryWrapper = new QueryWrapper(); + couponQueryWrapper.eq("cou_type",1); + List list = CouponDao.selectList(couponQueryWrapper); + + +// String value = commonInfoService.findOne(281).getValue(); + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); List couponList=new ArrayList<>(); - for(String couponId:value.split(",")){ - Coupon coupon = CouponDao.selectById(Long.parseLong(couponId)); + for(Coupon coupon:list){ Integer endDate = coupon.getEndDate(); Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DATE, endDate); @@ -113,7 +141,7 @@ public class CouponUserServiceImpl extends ServiceImpl Date: Mon, 17 Jun 2024 16:59:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/coupon/service/impl/CouponUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java b/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java index c2a5785..a84ef83 100644 --- a/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java +++ b/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java @@ -108,7 +108,7 @@ public class CouponUserServiceImpl extends ServiceImpl