12/18

src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java

@@ -61,7 +61,7 @@ public class EmpGiftAppletVo {
 
         ZoneId zoneId = ZoneId.systemDefault();
         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
         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")) {
@@ -126,7 +126,7 @@ public class EmpGiftAppletVo {
             } else {
                 state = "待提货";
                 if (states.equals("5")) {
-                    System.out.println("isReservation"+isReservation);
+//                    System.out.println("isReservation"+isReservation);
                     if (isReservation.equals("0")) {
                         this.state = "已预约";
                         this.notRese = false;

src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java

@@ -47,6 +47,7 @@ public class AppletVo {
     private List<LpkReserveOrderCardVo> orderCardVoList;
     private String value;
     private String serialNumber;
+    private String isEnable;
 
 
 
@@ -59,7 +60,7 @@ public class AppletVo {
 
         ZoneId zoneId = ZoneId.systemDefault();
         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
         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")){
@@ -122,6 +123,9 @@ public class AppletVo {
             if( String.valueOf(i).equals("-1")){
                 state="已过期";
                 showBtn=false;
+            }else if(isEnable.equals("2")){
+                state="已作废";
+                showBtn=false;
             }else{
                 state="待提货";
                 if(states.equals("5")){

src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDetailsVo.java

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

src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java

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

src/main/java/com/yxt/yyth/biz/empreserveorder/EmpReserveOrderService.java

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

src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java

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

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java

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