product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

12/18

Browse Source
This commit is contained in:
wangpengfei
2023-12-18 14:15:40 +08:00
parent 9eac84919d
commit 2d1df06756
7 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java
View File

@@ -61,7 +61,7 @@ public class EmpGiftAppletVo {
ZoneId zoneId = ZoneId.systemDefault(); ZoneId zoneId = ZoneId.systemDefault();
Date date = Date.from(dateAndTime.atZone(zoneId).toInstant()); Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
System.out.println(date); // System.out.println(date);
//1>2 1 、1<2 -1 、1=2 0 //1>2 1 、1<2 -1 、1=2 0
int k = DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date))))); int k = DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
if (String.valueOf(k).equals("1")) { if (String.valueOf(k).equals("1")) {
@@ -126,7 +126,7 @@ public class EmpGiftAppletVo {
} else { } else {
state = "待提货"; state = "待提货";
if (states.equals("5")) { if (states.equals("5")) {
System.out.println("isReservation"+isReservation); // System.out.println("isReservation"+isReservation);
if (isReservation.equals("0")) { if (isReservation.equals("0")) {
this.state = "已预约"; this.state = "已预约";
this.notRese = false; this.notRese = false;

6
src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
View File

@@ -47,6 +47,7 @@ public class AppletVo {
private List<LpkReserveOrderCardVo> orderCardVoList; private List<LpkReserveOrderCardVo> orderCardVoList;
private String value; private String value;
private String serialNumber; private String serialNumber;
private String isEnable;
@@ -59,7 +60,7 @@ public class AppletVo {
ZoneId zoneId = ZoneId.systemDefault(); ZoneId zoneId = ZoneId.systemDefault();
Date date = Date.from(dateAndTime.atZone(zoneId).toInstant()); Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
System.out.println(date); // System.out.println(date);
//1>2 1 、1<2 -1 、1=2 0 //1>2 1 、1<2 -1 、1=2 0
int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date))))); int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
if(String.valueOf(k).equals("1")){ if(String.valueOf(k).equals("1")){
@@ -122,6 +123,9 @@ public class AppletVo {
if( String.valueOf(i).equals("-1")){ if( String.valueOf(i).equals("-1")){
state="已过期"; state="已过期";
showBtn=false; showBtn=false;
}else if(isEnable.equals("2")){
state="已作废";
showBtn=false;
}else{ }else{
state="待提货"; state="待提货";
if(states.equals("5")){ if(states.equals("5")){

2
src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDetailsVo.java
View File

@@ -21,4 +21,6 @@ public class LpkStoreDetailsVo {
private String linker; private String linker;
private String picUrl; private String picUrl;
private String lonAndLat; private String lonAndLat;
private String bankName;
private String bankSid;
} }

4
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
View File

@@ -608,7 +608,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
} }
// 迭代一个星期 // 迭代一个星期
saturday = saturday.plus(Period.ofDays(7)); saturday = saturday.plus(Period.ofDays(7));
System.out.println(saturday.compareTo(endD)); // System.out.println(saturday.compareTo(endD));
} while (saturday.compareTo(endD) < 1); } while (saturday.compareTo(endD) < 1);
// 第一个星期天 // 第一个星期天
LocalDate sunday = now.with(DayOfWeek.SUNDAY); LocalDate sunday = now.with(DayOfWeek.SUNDAY);
@@ -620,7 +620,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
} }
// 迭代一个星期 // 迭代一个星期
sunday = sunday.plus(Period.ofDays(7)); sunday = sunday.plus(Period.ofDays(7));
System.out.println(sunday.compareTo(endD)); // System.out.println(sunday.compareTo(endD));
} while (sunday.compareTo(endD) < 1); } while (sunday.compareTo(endD) < 1);
Object[] array = weekMap.stream().sorted().toArray(); Object[] array = weekMap.stream().sorted().toArray();
return rb.success().setData(array); return rb.success().setData(array);

8
src/main/java/com/yxt/yyth/biz/empreserveorder/EmpReserveOrderService.java
View File

@@ -77,7 +77,7 @@ public class EmpReserveOrderService extends MybatisBaseService<EmpReserveOrderMa
public boolean isSatAndSun(String date){ public boolean isSatAndSun(String date){
DateTime dateTime = DateUtil.parse(date);; // 获取当前时间 DateTime dateTime = DateUtil.parse(date);; // 获取当前时间
int dayOfWeek = dateTime.dayOfWeekEnum().getValue();// 获取星期几（1-7） int dayOfWeek = dateTime.dayOfWeekEnum().getValue();// 获取星期几（1-7）
System.out.println(dayOfWeek); // System.out.println(dayOfWeek);
if (dayOfWeek == 1 || dayOfWeek == 7) { if (dayOfWeek == 1 || dayOfWeek == 7) {
return false; return false;
} else { } else {
@@ -90,11 +90,11 @@ public class EmpReserveOrderService extends MybatisBaseService<EmpReserveOrderMa
DateTime dateTime = DateUtil.parse(date);; // 获取当前时间 DateTime dateTime = DateUtil.parse(date);; // 获取当前时间
int dayOfWeek = dateTime.dayOfWeekEnum().getValue();// 获取星期几（1-7） int dayOfWeek = dateTime.dayOfWeekEnum().getValue();// 获取星期几（1-7）
System.out.println(dayOfWeek); // System.out.println(dayOfWeek);
if (dayOfWeek == 1 || dayOfWeek == 7) { if (dayOfWeek == 1 || dayOfWeek == 7) {
System.out.println(dayOfWeek); // System.out.println(dayOfWeek);
} else { } else {
System.out.println(11111); // System.out.println(11111);
} }
} }
public ResultBean<PagerVo<EmpReserveOrderVo>> orderList(PagerQuery<EmpReserveOrderQuery> pq) { public ResultBean<PagerVo<EmpReserveOrderVo>> orderList(PagerQuery<EmpReserveOrderQuery> pq) {

2
src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java
View File

@@ -48,7 +48,7 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class); ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody()); JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody());
System.out.println(jsonObject); // System.out.println(jsonObject);
return rb.success().setData(jsonObject); return rb.success().setData(jsonObject);
} }

24
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
View File

@@ -136,8 +136,8 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
qw.eq("s.bankSid", query.getBankSid()); qw.eq("s.bankSid", query.getBankSid());
} }
qw.orderByAsc("o.reserveDate"); qw.orderByAsc("o.reserveDate");
qw.orderByDesc("d.sort"); qw.orderByDesc("d.sid");
qw.orderByDesc("s.sort"); qw.orderByDesc("s.sid");
qw.orderByAsc("c.serialNumber"); qw.orderByAsc("c.serialNumber");
// qw.groupBy("o.reserveDate"); // qw.groupBy("o.reserveDate");
@@ -198,8 +198,8 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
} }
qw.orderByAsc("o.reserveDate"); qw.orderByAsc("o.reserveDate");
qw.orderByDesc("d.sort"); qw.orderByDesc("d.sid");
qw.orderByDesc("s.sort"); qw.orderByDesc("s.sid");
qw.groupBy("o.reserveDate"); qw.groupBy("o.reserveDate");
qw.groupBy("t.goodsSid"); qw.groupBy("t.goodsSid");
qw.groupBy("s.name"); qw.groupBy("s.name");
@@ -271,8 +271,8 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
qw.groupBy("t.goodsSid"); qw.groupBy("t.goodsSid");
qw.groupBy("o.reserveDate"); qw.groupBy("o.reserveDate");
qw.orderByAsc("o.reserveDate"); qw.orderByAsc("o.reserveDate");
qw.orderByDesc("d.sort"); qw.orderByDesc("d.sid");
qw.orderByDesc("s.sort"); qw.orderByDesc("s.sid");
// qw.groupBy("s.name"); // qw.groupBy("s.name");
IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq); IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
IPage<LpkReserveOrderVo> pagging = baseMapper.orderListByBank(page, qw); IPage<LpkReserveOrderVo> pagging = baseMapper.orderListByBank(page, qw);
@@ -346,7 +346,7 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
if (StringUtils.isNotBlank(query.getBankSid())) { if (StringUtils.isNotBlank(query.getBankSid())) {
qw.eq("s.bankSid", query.getBankSid()); qw.eq("s.bankSid", query.getBankSid());
} }
qw.orderByDesc("o.reserveDate"); qw.orderByAsc("o.reserveDate");
qw.groupBy("t.goodsSid"); qw.groupBy("t.goodsSid");
qw.groupBy("o.reserveDate"); qw.groupBy("o.reserveDate");
// qw.groupBy("s.name"); // qw.groupBy("s.name");
@@ -503,8 +503,8 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"); qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
} }
qw.orderByAsc("o.reserveDate"); qw.orderByAsc("o.reserveDate");
qw.orderByDesc("d.sort"); qw.orderByDesc("d.sid");
qw.orderByDesc("s.sort"); qw.orderByDesc("s.sid");
qw.orderByAsc("c.serialNumber"); qw.orderByAsc("c.serialNumber");
//得到所有要导出的数据 //得到所有要导出的数据
List<ReserveOrderExport> exportList = baseMapper.exportExcel(qw); List<ReserveOrderExport> exportList = baseMapper.exportExcel(qw);
@@ -606,8 +606,8 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
qw.like("s.name", query.getBankName()); qw.like("s.name", query.getBankName());
} }
qw.orderByAsc("o.reserveDate"); qw.orderByAsc("o.reserveDate");
qw.orderByDesc("d.sort"); qw.orderByDesc("d.sid");
qw.orderByDesc("s.sort"); qw.orderByDesc("s.sid");
qw.groupBy("o.reserveDate"); qw.groupBy("o.reserveDate");
qw.groupBy("t.goodsSid"); qw.groupBy("t.goodsSid");
qw.groupBy("s.name"); qw.groupBy("s.name");
@@ -799,7 +799,7 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
if (StringUtils.isNotBlank(query.getBankSid())) { if (StringUtils.isNotBlank(query.getBankSid())) {
qw.eq("s.bankSid", query.getBankSid()); qw.eq("s.bankSid", query.getBankSid());
} }
qw.orderByDesc("o.reserveDate"); qw.orderByAsc("o.reserveDate");
qw.groupBy("t.goodsSid"); qw.groupBy("t.goodsSid");
qw.groupBy("o.reserveDate"); qw.groupBy("o.reserveDate");
// qw.groupBy("s.name"); // qw.groupBy("s.name");