Merge remote-tracking branch 'origin/master'

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() {}
 }

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 ServiceImpl<CouponUserDao, CouponUser
             return Result.error("您已经领取过新人优惠券了！");
         }
         Long userId=userEntity.getUserId();
-        String value = commonInfoService.findOne(281).getValue();
+        UserEntity user = userService.getById(userId);
-        String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        if(user.getIsCoupon()!=null && user.getIsCoupon()==1){
+            return Result.error("您已经领取过新人优惠券了！");
+        }
+        //当前时间
+        String nowTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        //新增判断是否是新人
+        String userTime = user.getCreateTime();
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate date1 = LocalDate.parse(nowTime, formatter);
+        LocalDate date2 = LocalDate.parse(userTime, formatter);
+        // 计算两个日期之间相差的天数  data1小于date2
+        long daysBetween = ChronoUnit.DAYS.between(date1, date2);
+        if(daysBetween>7){
+            return Result.error("您已经过了新人优惠期");
+        }
+        //获取所有新人优惠卷
+
+        QueryWrapper<Coupon> couponQueryWrapper = new QueryWrapper<Coupon>();
+        couponQueryWrapper.eq("cou_type",1);
+        List<Coupon> list = CouponDao.selectList(couponQueryWrapper);
+
+
+//        String value = commonInfoService.findOne(281).getValue();
+
+
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         List<Coupon> couponList=new ArrayList<>();
-        for(String couponId:value.split(",")){
+        for(Coupon coupon:list){
-            Coupon coupon = CouponDao.selectById(Long.parseLong(couponId));
             Integer endDate = coupon.getEndDate();
             Calendar calendar = Calendar.getInstance();
             calendar.add(Calendar.DATE, endDate);
@@ -113,7 +141,7 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
             couponUser.setUserId(userId);
             couponUser.setCouponName(coupon.getCouponName());
             couponUser.setCouponPicture(coupon.getCouponPicture());
-            couponUser.setCreateTime(createTime);
+            couponUser.setCreateTime(nowTime);
             couponUser.setExpirationTime(expirationTime);
             couponUser.setMinMoney(coupon.getMinMoney());
             couponUser.setMoney(coupon.getMoney());
@@ -131,5 +159,4 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
         return CouponUserDao.selectCountByUserId(userId);
     }
 
-
 }

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();
+    }
+
 
 }