From ea1252ecc093d605df37e41dcb37545e00e1de1e Mon Sep 17 00:00:00 2001 From: wangguocheng Date: Wed, 24 Apr 2024 17:55:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=85=8D=E5=8D=95=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrderController.java | 7 +-- .../cashierservice/entity/TbYhqParams.java | 44 ++----------------- .../cashierservice/entity/vo/IntegralVo.java | 9 ++++ .../cashierservice/task/TaskScheduler.java | 4 +- .../system/cashierservice/util/DateUtils.java | 3 ++ 5 files changed, 19 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java index 4815f7c..c47df9f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java @@ -66,11 +66,12 @@ public class OrderController { return orderService.mineCoupons(userId,status,page,size); } @GetMapping("/findCoupons") - private Result findCoupons(@RequestHeader String token,@RequestParam String type, + private Result findCoupons(@RequestHeader String token,String type, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "size", required = false, defaultValue = "1") Integer size) throws IOException { return orderService.findCoupons(type,page,size); } + @GetMapping("/findWiningUser") private Result findWiningUser(){ return orderService.findWiningUser(); @@ -87,8 +88,4 @@ public class OrderController { private Result yhqDouble(@RequestParam Integer conponsId){ return orderService.yhqDouble(conponsId); } -// @GetMapping("/testPay") -// private Result testPay(@RequestParam Integer orderId){ -// return orderService.testPay(orderId); -// } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbYhqParams.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbYhqParams.java index 0c6bd92..41e19af 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbYhqParams.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbYhqParams.java @@ -1,8 +1,11 @@ package com.chaozhanggui.system.cashierservice.entity; +import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; +@Data public class TbYhqParams implements Serializable { private Integer id; @@ -13,46 +16,5 @@ public class TbYhqParams implements Serializable { private BigDecimal maxPrice; private String status; - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public BigDecimal getMinPrice() { - return minPrice; - } - - public void setMinPrice(BigDecimal minPrice) { - this.minPrice = minPrice; - } - - public BigDecimal getMaxPrice() { - return maxPrice; - } - - public void setMaxPrice(BigDecimal maxPrice) { - this.maxPrice = maxPrice; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status == null ? null : status.trim(); - } } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralVo.java index ee02a3c..f03a086 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralVo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralVo.java @@ -1,5 +1,6 @@ package com.chaozhanggui.system.cashierservice.entity.vo; +import com.chaozhanggui.system.cashierservice.config.FieldDescription; import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail; import lombok.Data; @@ -11,9 +12,17 @@ import java.util.List; */ @Data public class IntegralVo { + //openId + @FieldDescription("用户openId") private String openId; + //数量 + @FieldDescription("数量") private BigDecimal num; + //类型 + @FieldDescription("类型") private String type; + //签名 + @FieldDescription("签名") private String sign; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/task/TaskScheduler.java b/src/main/java/com/chaozhanggui/system/cashierservice/task/TaskScheduler.java index 3e12626..9b470ed 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/task/TaskScheduler.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/task/TaskScheduler.java @@ -71,7 +71,7 @@ public class TaskScheduler { } - @Scheduled(fixedRate = 200000) + @Scheduled(cron = "0 1 0 * * ?") public void winningUser() { String day = DateUtils.getDay(); List list = winingParamsMapper.selectAll(); @@ -119,7 +119,7 @@ public class TaskScheduler { } for (int i = 0; i < noUserNum; i++) { long endDate = DateUtils.convertDate1(day + " 00:00:00").getTime(); - long startDate = DateUtils.convertDate1(DateUtils.getTimes(DateUtils.getNewDate(new Date(), 3, -1)) + " 00:00:00").getTime(); + long startDate = DateUtils.convertDate1(DateUtils.getSdfDayTimes(DateUtils.getNewDate(new Date(), 3, -1))+" 00:00:00").getTime(); String orderNo = generateOrderNumber(startDate, endDate); String userName = NicknameGenerator.generateRandomWeChatNickname(); BigDecimal orderAmount = RandomUtil.getRandomBigDecimal(winingParams.getMinPrice(), winingParams.getMaxPrice()); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/DateUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/DateUtils.java index 41df0e8..de1dafe 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/DateUtils.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/DateUtils.java @@ -59,6 +59,9 @@ public class DateUtils { public static String getTimes(Date date){ return sdfday.format(date); } + public static String getSdfDayTimes(Date date){ + return sdfDay.format(date); + } /**