xiug

src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagService.java

@@ -101,6 +101,9 @@ public class LpkGiftBagService extends MybatisBaseService<LpkGiftBagMapper, LpkG
                 String path = dto.getIconUrl().substring(urlPrefix.length());
                 lpkGiftBag.setIconUrl(path);
             }
+            if(StringUtils.isBlank(dto.getBoundaryPrice())){
+                lpkGiftBag.setBoundaryPrice("0");
+            }
             baseMapper.insert(lpkGiftBag);
             if (!dto.getGoods().isEmpty()) {
                 List<GiftBagGoods> goodsList = dto.getGoods();

src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardRest.java

@@ -36,21 +36,25 @@ public class LpkGiftCardRest {
     public ResultBean wxBindMobile(@RequestBody BindCardDto bindCardDto) {
         return lpkGiftCardService.bindCard(bindCardDto);
     }
+
     @PostMapping("/bindAllCard")
     @ApiOperation(value = "客户绑定礼包卡")
     public ResultBean bindAllCard(@RequestBody BindCardDto bindCardDto) {
         return lpkGiftCardService.bindAllCard(bindCardDto);
     }
+
     @PostMapping("/gifCardByCustomerSid")
     @ApiOperation(value = "获取客户绑定的礼包卡")
     public ResultBean gifCardByCustomerSid(@RequestBody PagerQuery<LpkGiftCardQuery> query) {
         return lpkGiftCardService.getGifCardByCustomerSid(query);
     }
+
     @PostMapping("/gifCardsByCustomerSid")
     @ApiOperation(value = "获取客户绑定的礼包卡")
     public ResultBean gifCardsByCustomerSid(@RequestBody PagerQuery<LpkGiftCardQuery> query) {
         return lpkGiftCardService.getGifCardsByCustomerSid(query);
     }
+
     @GetMapping("/isSaturAndSun/{cardSid}")
     @ApiOperation(value = "获取时间段的周六日")
     public ResultBean isSaturAndSun(@PathVariable("cardSid") String cardSid) {
@@ -74,15 +78,16 @@ public class LpkGiftCardRest {
     public ResultBean generateCard(@RequestBody LpkGiftCardDto dto) {
         return lpkGiftCardService.generateCard(dto);
     }
+
     @GetMapping("/getCardByBank")
     @ApiOperation(value = "生成礼包卡信息")
-    public JSONObject getCardByBank(@RequestParam(value = "pageNo",defaultValue = "1")Integer pageNo,
-                                    @RequestParam(value = "pageSize",defaultValue = "8")Integer pageSize,
-                                    @RequestParam(value = "printAll",required = false) String printAll,
-                                    @RequestParam(value = "end",defaultValue = "") String end,
-                                    @RequestParam(value = "start",defaultValue = "") String start) {
-        PagerQuery<LpkGiftCardListQuery> pq=new PagerQuery<>();
-        LpkGiftCardListQuery q=new LpkGiftCardListQuery();
+    public JSONObject getCardByBank(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                    @RequestParam(value = "pageSize", defaultValue = "8") Integer pageSize,
+                                    @RequestParam(value = "printAll", required = false) String printAll,
+                                    @RequestParam(value = "end", defaultValue = "") String end,
+                                    @RequestParam(value = "start", defaultValue = "") String start) {
+        PagerQuery<LpkGiftCardListQuery> pq = new PagerQuery<>();
+        LpkGiftCardListQuery q = new LpkGiftCardListQuery();
         pq.setCurrent(pageNo);
         pq.setSize(pageSize);
 
@@ -90,11 +95,11 @@ public class LpkGiftCardRest {
         q.setNoStart(start);
         pq.setParams(q);
 
-        PagerVo<LpkGiftCardWordVo> p=lpkGiftCardService.getCardByBank(pq).getData();
-        JSONObject jsonObject=new JSONObject();
-        jsonObject.put("date",p.getRecords());
-        jsonObject.put("total",p.getPages());
-        jsonObject.put("count",p.getTotal());
+        PagerVo<LpkGiftCardWordVo> p = lpkGiftCardService.getCardByBank(pq).getData();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("date", p.getRecords());
+        jsonObject.put("total", p.getPages());
+        jsonObject.put("count", p.getTotal());
         return jsonObject;
     }
 
@@ -129,9 +134,9 @@ public class LpkGiftCardRest {
             @RequestParam(value = "startDate") String startDate,
             @RequestParam(value = "endDate") String endDate,
             @RequestParam(value = "file") MultipartFile file,
-                                   HttpServletRequest request,
-                                   HttpServletResponse response) throws IOException, ParseException {
-        return lpkGiftCardService.getExcelInfo(startDate,endDate,file,request,response);
+            HttpServletRequest request,
+            HttpServletResponse response) throws IOException, ParseException {
+        return lpkGiftCardService.getExcelInfo(startDate, endDate, file, request, response);
     }
 
 
@@ -143,40 +148,43 @@ public class LpkGiftCardRest {
             @RequestParam(value = "file") MultipartFile file,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException {
-        return lpkGiftCardService.getExcelInfo3(startDate,endDate,file,request,response);
+        return lpkGiftCardService.getExcelInfo3(startDate, endDate, file, request, response);
     }
+
     @ApiOperation("订单门店汇总导出")
     @PostMapping("/cardStatisticsListExport")
-    public void  cardStatisticsListExport(@RequestBody LpkGiftCardListQuery pq) {
+    public void cardStatisticsListExport(@RequestBody LpkGiftCardListQuery pq) {
         lpkGiftCardService.cardStatisticsListExport(pq);
     }
+
     @ApiOperation("订单门店汇总列表")
     @PostMapping("/cardStatisticsList")
-    public ResultBean  cardStatisticsList(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
+    public ResultBean cardStatisticsList(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
         return lpkGiftCardService.cardStatisticsList(pq);
     }
 
     @ApiOperation("设置是否作废")
     @GetMapping("/cancelCard/{sid}")
-    public ResultBean  cancelCard(@PathVariable("sid")String sid) {
+    public ResultBean cancelCard(@PathVariable("sid") String sid) {
         return lpkGiftCardService.isEnable(sid);
     }
 
     @ApiOperation("提货卡转赠福礼卡")
     @PostMapping("/cardTransfer")
-    public ResultBean  cardTransfer(String sid) {
+    public ResultBean cardTransfer(String sid) {
         return lpkGiftCardService.cardTransfer(sid);
     }
 
 
     @ApiOperation("共享家庭卡详情")
     @GetMapping("/cardShareDetail/{sid}")
-    public ResultBean  cardShareDetail(@PathVariable("sid") String sid) {
+    public ResultBean cardShareDetail(@PathVariable("sid") String sid) {
         return lpkGiftCardService.cardShareDetail(sid);
     }
+
     @ApiOperation("共享家庭卡蔬菜详情")
     @GetMapping("/cardShareGoodsDetail/{sid}")
-    public ResultBean  cardShareGoodsDetail(@PathVariable("sid") String sid) {
+    public ResultBean cardShareGoodsDetail(@PathVariable("sid") String sid) {
         return lpkGiftCardService.cardShareGoodsDetail(sid);
     }
 

src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java

@@ -161,11 +161,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         return rb.success().setMsg("绑定成功");
     }
 
-    public static void main(String[] args) {
-        String a = "99231229101555309170";
-        ;
-        System.out.println(a.substring(0, 2));
-    }
+//    public static void main(String[] args) {
+//        String a = "99231229101555309170";
+//        ;
+//        System.out.println(a.substring(0, 2));
+//    }
     @Transactional(rollbackFor = Exception.class)
     public ResultBean bindAllCard(BindCardDto bindCardDto) {
         ResultBean rb = new ResultBean().fail();
@@ -1782,4 +1782,5 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
 //    }
 
 
+
 }

src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java

@@ -266,11 +266,11 @@ public class scheduledRest {
         A c=new A();
         int year=DateUtil.year(new Date());
         a=a+year;
-        String s = HttpUtils.sendGet(a, "");
-        JSONObject jsonObject = JSONObject.parseObject(s);
-        HolidayVos d= JSON.toJavaObject(jsonObject,HolidayVos.class);
+//        String s = HttpUtils.sendGet(a, "");
+//        JSONObject jsonObject = JSONObject.parseObject(s);
+//        HolidayVos d= JSON.toJavaObject(jsonObject,HolidayVos.class);
 
-        System.out.println(d);
+//        System.out.println(d);
 //        List<CannotReserveDictionary> reserveDictionaries=new ArrayList<>();
 //        String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
 //        int y = DateUtil.year(DateUtil.parse(nextYear));
@@ -285,7 +285,7 @@ public class scheduledRest {
         String a ="https://timor.tech/api/holiday/year/";
 //        RestTemplate restTemplate=new RestTemplate();
 //        ResponseEntity<String> forEntity = restTemplate.getForEntity(a, String.class);
-        String s = HttpUtils.sendGet(a, "");
-        System.out.println(s);
+//        String s = HttpUtils.sendGet(a, "");
+//        System.out.println(s);
     }
 }