From 062fb1ed6efcaac5d75bbe184524c4929dff7fcd Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期三, 18 十月 2023 15:25:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 35 +++++------------------------------ 1 files changed, 5 insertions(+), 30 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java index 2bfc8a7..d6c2200 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java +++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java @@ -257,6 +257,11 @@ return this.baseMapper.listOne(ids); } + @Override + public Integer listStoreId(String code) { + return this.baseMapper.queryStore(code); + } + /** * 获取课包购买人数 * @param coursePackageId @@ -1042,36 +1047,6 @@ return integers; } - public static void main(String[] args) { - List<Integer> week = week("周一,周二"); - // 今天周几 - int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; - - SimpleDateFormat format = new SimpleDateFormat("MM.dd"); - - ArrayList<String> strings = new ArrayList<>(); - for (Integer integer : week) { - if(integer<i){ - // 找下一周的时间 - Calendar instance = Calendar.getInstance(); - instance.add(Calendar.DATE,7-(i-integer)); - Date time = instance.getTime(); - strings.add(format.format(time)); - - }else if(integer>i) { - Calendar instance = Calendar.getInstance(); - instance.add(Calendar.DATE,integer-i); - Date time = instance.getTime(); - strings.add(format.format(time)); - }else { - Calendar instance = Calendar.getInstance(); - instance.add(Calendar.DATE,7); - Date time = instance.getTime(); - strings.add(format.format(time)); - } - } - System.out.println(strings); - } @Override @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW) public ResultUtil payCourse(PayCourseReq req,Integer userId){ -- Gitblit v1.7.1