01/13

src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java

@@ -25,4 +25,5 @@ public class MyGoodsVo {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date periodValidity;
     private String state="0";//商品过期状态  0未过期 1已过期
+    private String remarks;
 }

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

@@ -56,6 +56,7 @@ public class AppletVo {
     private String type;//是否转增 1亲情卡 2家庭 3 企业
     private String logo;//查询标识 1亲情卡 2家庭 3 企业
     private List<LpkGifGoodsVo> list;
+    private String remarks;
 
     public String getStart() {
         SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");

src/main/java/com/yxt/yythmall/api/lpkgoods/GoodsTypeVo.java

@@ -15,6 +15,7 @@ public class GoodsTypeVo {
     private String sid;
     private String id;
     private String count;
+    private String delivery;
     private List<GoodsTypeVo> typeVos;
     private List<BrandVo> brandVos;
 }

src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrderQuery.java

@@ -19,4 +19,7 @@ public class LpkReserveOrderQuery implements Query {
     private String bankName;
     private String serialNumber;
     private String cardType; //1 家庭  2 亲情卡 3 企业
+    private String userAddress; //1 家庭  2 亲情卡 3 企业
+    private String userPhone; //1 家庭  2 亲情卡 3 企业
+    private String goodsName; //1 家庭  2 亲情卡 3 企业
 }

src/main/java/com/yxt/yythmall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java

@@ -42,4 +42,8 @@ public class TransferRecordsGoodsDetailsVo implements Vo {
     private String linkPhone;
     private String address;
     private String cardType;
+    private String remarks;
+    private String specificationUnit;
+    private String unitName;
+    private String weight;
 }

src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java

@@ -18,6 +18,7 @@ public class VegeCellarReserveOrderVo implements Vo {
     private String sid; //预约订单sid
     private String userName; //用户名
     private String userPhone; //用户电话
+    private String userAddress; //用户地址
     private String store; //门店
     private String storeSid; //门店
     private String storeName; //门店

src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreRest.java

@@ -22,9 +22,9 @@ public class CustomerStoreRest {
     CustomerStoreService customerStoreService;
 
     @ApiOperation("我的默认提货地点")
-    @GetMapping("/getStoreBySid/{sid}")
-    public ResultBean getStoreBySid(@PathVariable String sid) {
-        return customerStoreService.getStoreBySid(sid);
+    @GetMapping("/getStoreBySid/{sid}/{delivery}")
+    public ResultBean getStoreBySid(@PathVariable("sid") String sid,@PathVariable("delivery")String delivery) {
+        return customerStoreService.getStoreBySid(sid,delivery);
     }
     @GetMapping("/isSaturAndSun")
     @ApiOperation(value = "获取时间段的周六日")

src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java

@@ -38,7 +38,7 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
     LpkStoreService lpkStoreService;
     @Autowired
     CannotReserveDictionaryService cannotReserveDictionaryService;
-    public ResultBean<CustomerStoreVo> getStoreBySid(String customerSid) {
+    public ResultBean<CustomerStoreVo> getStoreBySid(String customerSid,String delivery) {
         ResultBean rb=new ResultBean().fail();
 
 //        CustomerStoreVo vo=new CustomerStoreVo();
@@ -61,10 +61,10 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
 //        }
         if(null==vo){
             CustomerStoreVo vo1=new CustomerStoreVo();
-            vo1=getStart(vo1);
+            vo1=getStart(vo1,delivery);
             return rb.success().setData(vo1);
         }
-        vo=getStart(vo);
+        vo=getStart(vo,delivery);
         return rb.success().setData(vo);
     }
 
@@ -136,7 +136,26 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
         Object[] array = s.stream().sorted().toArray();
         return rb.success().setData(array);
     }
-    public CustomerStoreVo getStart(CustomerStoreVo vo) {
+    public CustomerStoreVo getStart(CustomerStoreVo vo,String delivery) {
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+        Date nowDate=new Date();
+        String start="";
+        if(delivery.equals("0")){
+             start=sdf.format(DateUtil.offsetDay(nowDate,+3));
+        }else if(delivery.equals("1")){
+            start=sdf.format(DateUtil.offsetDay(nowDate,+1));
+        }
+
+        String end=sdf.format(DateUtil.offsetDay(DateUtil.parse(start),4));
+        vo.setStart(start);
+        vo.setEnd(end);
+        String reserveDate=reserveDate(start);
+        vo.setReserveDate(reserveDate);
+        return vo;
+    }
+
+//    https://timor.tech/api/holiday/year/2025
+        public CustomerStoreVo getStart1(CustomerStoreVo vo) {
         SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         LocalDate today = LocalDate.now(); // 获取今天的日期
@@ -167,6 +186,25 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
         CannotReserveDictionary cannotReserveDictionary=new CannotReserveDictionary();
         cannotReserveDictionary=cannotReserveDictionaryService.getOne(new QueryWrapper<CannotReserveDictionary>().eq("unavailableTime",start));
         if(null!=cannotReserveDictionary){
+//            int i=0;
+            do {
+                SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+                cannotReserveDictionary=cannotReserveDictionaryService.getOne(new QueryWrapper<CannotReserveDictionary>().eq("unavailableTime",start));
+                if(null!=cannotReserveDictionary){
+                    start=sdf.format(DateUtil.offsetDay(DateUtil.parse(start),+1));
+                }
+//                i++;
+            } while (cannotReserveDictionary!=null);
+//            if(i>=5){
+//                start="";
+//            }
+        }
+        return start;
+    }
+    public String reserveDate1(String start){
+        CannotReserveDictionary cannotReserveDictionary=new CannotReserveDictionary();
+        cannotReserveDictionary=cannotReserveDictionaryService.getOne(new QueryWrapper<CannotReserveDictionary>().eq("unavailableTime",start));
+        if(null!=cannotReserveDictionary){
             int i=0;
             do {
                 SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");

src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml

@@ -101,7 +101,8 @@
             s.content AS remark,
             s.weight ,
             r.goodsNumber as goodsNumber,
-            s.periodValidity
+            s.periodValidity,
+            s.remarks
         FROM
             vegetable_cellar r
                 LEFT JOIN lpk_goods s ON s.sid = r.goodsSid

src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java

@@ -322,6 +322,7 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
             vo1.setName(brandVo.getBrandName());
             vo1.setId(brandVo.getId());
             vo1.setSid(brandVo.getId());
+            vo1.setDelivery(brandVo.getDelivery());
 //            vo1.setCount(String.valueOf(myGoodsVos.size()));
             Double d=new Double(0);
             for (MyGoodsVo myGoodsVo : myGoodsVos) {

src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderRest.java

@@ -18,7 +18,8 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "预约订单信息")
 @RestController
-@RequestMapping("/empsreservoorder")
+@RequestMapping("/order")
+//@RequestMapping("/empsreservoorder")
 public class OrdOrderRest {
     @Autowired
     OrdOrderService ordOrderService;

src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java

@@ -55,7 +55,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
 
     private static final String OrderUrl = "https://supervise.yxtsoft.com/lpkapi/empcardgift/generateTopEmpCard?mainSid=";
     private static final String or = "https://supervise.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid=";
-    private static final String payUrl = "https://supervise.yxtsoft.com/lpkapi/empsreservoorder/getPreOrder";
+    private static final String payUrl = "https://supervise.yxtsoft.com/lpkapi/order/getPreOrder";
     @Autowired
     OrdOrderDetailService ordOrderDetailsService;
     @Autowired
@@ -477,7 +477,8 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         for (OrdOrderDetail detail : details) {
             LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", detail.getGoodsSid()));
             detail.setPicUrl(fileUploadComponent.getUrlPrefix() + lpkGoods.getPicUrl());
-            detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart())) + "斤/份，" + "共" + detail.getPartNumber() + "份");
+//            detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart())) + "斤/份，" + "共" + detail.getPartNumber() + "份");
+            detail.setRemarks(lpkGoods.getRemarks());
             detail.setUnitName(lpkGoods.getUnitName());
             detail.setSpecificationUnit(lpkGoods.getSpecificationUnit());
         }

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

@@ -0,0 +1,58 @@
+package com.yxt.yythmall.biz.scheduled;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.http.ResponseEntity;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/17 13:51
+ */
+public class A<T> implements Serializable {
+    public List<T> getList (ResponseEntity<String> stringResponseEntity,Class<T> t){
+        JSONArray jsonArray= JSONObject.parseObject(stringResponseEntity.getBody()).getJSONArray("data");
+        List<T> vos=new ArrayList<>();
+        if(null==jsonArray){
+            return new ArrayList<T>();
+        }
+        for (int i = 0; i < jsonArray.size(); i++) {
+            T d= JSON.toJavaObject(jsonArray.getJSONObject(i),t);
+            vos.add(d);
+        }
+        return vos;
+    }
+    public List<T> getListPage (ResponseEntity<String> stringResponseEntity,Class<T> t){
+        JSONObject jsonObject= JSONObject.parseObject(stringResponseEntity.getBody());
+        JSONObject js=jsonObject.getJSONObject("data");
+        JSONArray jsonArray=js.getJSONArray("records");
+        List<T> vos=new ArrayList<>();
+        if(null==jsonObject){
+            return new ArrayList<T>();
+        }
+        for (int i = 0; i < jsonArray.size(); i++) {
+            T d= JSON.toJavaObject(jsonArray.getJSONObject(i),t);
+            vos.add(d);
+        }
+        return vos;
+    }
+    public T  getObject(ResponseEntity<String> stringResponseEntity,Class<T> t){
+        JSONObject jsonObject = JSONObject.parseObject(stringResponseEntity.getBody()).getJSONObject("data");
+        T d=JSON.toJavaObject(jsonObject,t);
+        return d;
+    }
+    public T  getObject(String s,Class<T> t){
+        JSONObject jsonObject = JSONObject.parseObject(s).getJSONObject("data");
+        T d=JSON.toJavaObject(jsonObject,t);
+        return d;
+    }
+    public Integer getInteger (ResponseEntity<String> stringResponseEntity){
+        Integer a=JSONObject.parseObject(stringResponseEntity.getBody()).getInteger("data");
+        return a;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.yxt.yythmall.biz.scheduled;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/12/27 9:12
+ */
+@Data
+public class HolidayVo {
+    private String holiday;
+    private String name;
+    private String wage;
+    private String date;
+    private String rest;
+}

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

@@ -0,0 +1,16 @@
+package com.yxt.yythmall.biz.scheduled;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/12/27 9:13
+ */
+@Data
+public class HolidayVos {
+    private String code;
+    private List<HolidayVo> holiday=new ArrayList<>();
+}

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

@@ -1,8 +1,11 @@
 package com.yxt.yythmall.biz.scheduled;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.yxt.common.base.utils.HttpUtils;
 import com.yxt.yythmall.api.cannotreservedictionary.CannotReserveDictionary;
 import com.yxt.yythmall.api.cannotreservedictionary.CannotReserveDictionaryDto;
 import com.yxt.yythmall.api.empcard.EmpCard;
@@ -22,9 +25,15 @@ import com.yxt.yythmall.biz.lpkreserveorder.LpkReserveOrderService;
 import com.yxt.yythmall.biz.vegecallerreservedetail.VegeCellarReserveDetailsService;
 import com.yxt.yythmall.biz.vegecallerreserveorder.VegeCellarReserveOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -214,40 +223,69 @@ public class scheduledRest {
         }
         vegeCellarReserveOrderService.updateBatchById(vegeCellarReserveOrders);
     }
-    @Scheduled(cron = "0 0 0 1 1 ? ")
+//    @Scheduled(cron = "0 0 0 1 1 ? ")
+////    @Scheduled(cron = "0 * * * * ? ")
+//    public void cannotReserve(){
+//        Date date =new Date();
+//        SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        String nowDate =sdf1.format(date);
+//        String endDate= sdf1.format(DateUtil.offsetMonth(date,12));
+//        LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate();
+//        LocalDate endD  = DateUtil.parse(endDate).toSqlDate().toLocalDate();
+//        List<CannotReserveDictionary> reserveDictionaries=new ArrayList<>();
+//        // 第一个星期六
+//        LocalDate saturday = now.with(DayOfWeek.SATURDAY);
+//        do {
+//            CannotReserveDictionary e=new CannotReserveDictionary();
+//            e.setUnavailableTime(saturday.toString());
+//            reserveDictionaries.add(e);
+//            // 迭代一个星期
+//            saturday = saturday.plus(Period.ofDays(7));
+//        } while (saturday.compareTo(endD) < 1);
+//        // 第一个星期天
+//        LocalDate sunday = now.with(DayOfWeek.SUNDAY);
+//        do {
+//            CannotReserveDictionary e=new CannotReserveDictionary();
+//            e.setUnavailableTime(sunday.toString());
+//            reserveDictionaries.add(e);
+//            // 迭代一个星期
+//            sunday = sunday.plus(Period.ofDays(7));
+//        } while (sunday.compareTo(endD) < 1);
+//        String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
+//        int y = DateUtil.year(DateUtil.parse(nextYear));
+//        CannotReserveDictionary e=new CannotReserveDictionary();
+//        e.setUnavailableTime(String.valueOf(y) + "-01-01");
+//        reserveDictionaries.add(e);
+//        reserveDictionaries = reserveDictionaries.stream().sorted(Comparator.comparing(CannotReserveDictionary::getUnavailableTime)).collect(Collectors.toList());
+//        cannotReserveDictionaryService.saveBatch(reserveDictionaries);
+//    }
+//    @Scheduled(cron = "0 0 0 1 1 ? ")
 //    @Scheduled(cron = "0 * * * * ? ")
-    public void cannotReserve(){
-        Date date =new Date();
-        SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String nowDate =sdf1.format(date);
-        String endDate= sdf1.format(DateUtil.offsetMonth(date,12));
-        LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate();
-        LocalDate endD  = DateUtil.parse(endDate).toSqlDate().toLocalDate();
-        List<CannotReserveDictionary> reserveDictionaries=new ArrayList<>();
-        // 第一个星期六
-        LocalDate saturday = now.with(DayOfWeek.SATURDAY);
-        do {
-            CannotReserveDictionary e=new CannotReserveDictionary();
-            e.setUnavailableTime(saturday.toString());
-            reserveDictionaries.add(e);
-            // 迭代一个星期
-            saturday = saturday.plus(Period.ofDays(7));
-        } while (saturday.compareTo(endD) < 1);
-        // 第一个星期天
-        LocalDate sunday = now.with(DayOfWeek.SUNDAY);
-        do {
-            CannotReserveDictionary e=new CannotReserveDictionary();
-            e.setUnavailableTime(sunday.toString());
-            reserveDictionaries.add(e);
-            // 迭代一个星期
-            sunday = sunday.plus(Period.ofDays(7));
-        } while (sunday.compareTo(endD) < 1);
-        String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
-        int y = DateUtil.year(DateUtil.parse(nextYear));
-        CannotReserveDictionary e=new CannotReserveDictionary();
-        e.setUnavailableTime(String.valueOf(y) + "-01-01");
-        reserveDictionaries.add(e);
-        reserveDictionaries = reserveDictionaries.stream().sorted(Comparator.comparing(CannotReserveDictionary::getUnavailableTime)).collect(Collectors.toList());
-        cannotReserveDictionaryService.saveBatch(reserveDictionaries);
+    public void cannotReserve() throws NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException {
+        String a ="https://timor.tech/api/holiday/year/";
+        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);
+
+        System.out.println(d);
+//        List<CannotReserveDictionary> reserveDictionaries=new ArrayList<>();
+//        String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
+//        int y = DateUtil.year(DateUtil.parse(nextYear));
+//        CannotReserveDictionary e=new CannotReserveDictionary();
+//        e.setUnavailableTime(String.valueOf(y) + "-01-01");
+//        reserveDictionaries.add(e);
+//        reserveDictionaries = reserveDictionaries.stream().sorted(Comparator.comparing(CannotReserveDictionary::getUnavailableTime)).collect(Collectors.toList());
+//        cannotReserveDictionaryService.saveBatch(reserveDictionaries);
+    }
+
+    public static void main(String[] args) throws NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException {
+        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);
     }
 }

src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java

@@ -98,6 +98,10 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
             vo.setGoodsJs("合计"+DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()*Double.valueOf(k.getWeight())))+"斤");
             vo.setPrice(DoubleUtils.removeZeros(String.valueOf(Double.valueOf(k.getPrice())*Double.valueOf(k.getWeight())))+"元/斤");
             vo.setGoodsPicUrl(fileUploadComponent.getUrlPrefix()+k.getPicUrl());
+            vo.setRemarks(k.getRemarks());
+            vo.setUnitName(k.getUnitName());
+            vo.setWeight(k.getWeight());
+            vo.setSpecificationUnit(k.getSpecificationUnit());
             vos.add(vo);
         }
         transferRecordsVo.setList(vos);

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/ReserveCustomerExcel.java

@@ -12,33 +12,46 @@ import lombok.Setter;
 public class ReserveCustomerExcel {
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "预约日期",index = 0)
+    @ExcelProperty(value = "预约日期", index = 0)
     private String reserveDate;
-    @ColumnWidth(20)
-    @ExcelProperty(value = "支行",index = 1)
-    private String bankName;
-    @ColumnWidth(20)
-    @ExcelProperty(value = "提货门店",index = 2)
-    private String storeName;
-    @ColumnWidth(20)
-    @ExcelProperty(value = "礼包名称",index = 3)
-    private String brandName;
-
-    @ColumnWidth(20)
-    @ExcelProperty(value = "姓名",index = 4)
+    //    @ColumnWidth(20)
+//    @ExcelProperty(value = "支行",index = 1)
+//    private String bankName;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "提货门店",index = 2)
+//    private String storeName;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "礼包名称",index = 3)
+//    private String brandName;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "收货地址", index = 1)
+    private String userAddress;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "客户姓名", index = 2)
     private String userName;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "联系方式",index = 5)
+    @ExcelProperty(value = "联系方式", index = 3)
     private String userPhone;
 
+
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品名称",index = 6)
+    @ExcelProperty(value = "商品名称", index = 4)
     private String goodsName;
+
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品数量(份)",index = 7)
-    private String goodsNumber;
+    @ExcelProperty(value = "商品规格", index = 5)
+    private String gg;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "包装规格", index = 6)
+    private String remarks;
+
     @ColumnWidth(20)
-    @ExcelProperty(value = "客户所属支行",index = 8)
-    private String customerBank;
+    @ExcelProperty(value = "商品数量(份)", index = 7)
+    private String goodsNumber;
+
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "客户所属支行", index = 11)
+//    private String customerBank;
 }

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/ReserveOrderVo.java

@@ -27,6 +27,7 @@ public class ReserveOrderVo implements Vo {
     private String brandName;
     private String userName;
     private String userPhone;
+    private String userAddress;
     private String bankSid;
     private String bankName;
     private String bankLinker;
@@ -36,4 +37,9 @@ public class ReserveOrderVo implements Vo {
     private String goodsName;
     private String goodsNumber;
     private String customerBank;
+    private String weight;
+    private String unitName;
+    private String specificationUnit;
+    private String gg;
+    private String remarks;
 }

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.java

@@ -11,6 +11,7 @@ import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderQuery;
 import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml

@@ -13,6 +13,7 @@
         o.reserveDate,
         o.userName,
         o.userPhone,
+        o.userAddress,
         case o.state
         when 0 then '待提货'
         when 1 then '已提货'
@@ -86,6 +87,7 @@
         pb.name brandName,
         vo.userName userName,
         vo.userPhone userPhone,
+        vo.userAddress userAddress,
         lb.sid bankSid,
         lb.name bankName,
         lb.linker bankLinker,
@@ -94,7 +96,11 @@
         vd.goodsSid,
         vd.goodsName goodsName,
         vd.goodsNumber goodsNumber,
-        lcb.name customerBank
+        lcb.name customerBank,
+        lg.weight,
+        lg.specificationUnit,
+        lg.unitName,
+        lg.remarks
         from vege_cellar_reserve_order vo
         LEFT JOIN lpk_store ls ON ls.sid=vo.storeSid
         LEFT JOIN lpk_bank lb ON lb.sid=ls.bankSid

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "预约订单信息")
 @RestController
-@RequestMapping("/lpksreservoorders")
+@RequestMapping("/vegecellarreserveorder")
 public class VegeCellarReserveOrderRest {
     @Autowired
     VegeCellarReserveOrderService vegeCellarReserveOrderService;

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java

@@ -55,7 +55,6 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
     CannotReserveDictionaryService cannotReserveDictionaryService;
     @Autowired
     VegetableCellarService vegetableCellarService;
-
     @Transactional(rollbackFor = Exception.class)
     public ResultBean submission(VegeCellarReserveOrderDto dto) {
         ResultBean rb = new ResultBean().fail();
@@ -78,19 +77,66 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
             return rb.setMsg("参数不全");
         }
         VegeCellarReserveOrder order = new VegeCellarReserveOrder();
-        LpkStore lpkStore = lpkStoreService.getOne(new QueryWrapper<LpkStore>().eq("sid", dto.getStoreSid()));
-        BeanUtil.copyProperties(dto, order, "id", "sid");
-        order.setStoreSid(dto.getStoreSid());
+        if(StringUtils.isNotBlank(dto.getUserAddress())){
+//            LpkStore lpkStore = lpkStoreService.getOne(new QueryWrapper<LpkStore>().eq("sid", dto.getStoreSid()));
+            BeanUtil.copyProperties(dto, order, "id", "sid");
+            order.setStoreSid(dto.getStoreSid());
+//        order.setCardSid(dto.getSid());
+            order.setCreateTime(new DateTime());
+            String uuid = UniqueIdGenerator.generateUniqueID();
+            order.setReserveCode(uuid);
+            baseMapper.insert(order);
+        }else{
+            LpkStore lpkStore = lpkStoreService.getOne(new QueryWrapper<LpkStore>().eq("sid", dto.getStoreSid()));
+            BeanUtil.copyProperties(dto, order, "id", "sid");
+            order.setStoreSid(dto.getStoreSid());
 //        order.setCardSid(dto.getSid());
-        order.setCreateTime(new DateTime());
-        String uuid = UniqueIdGenerator.generateUniqueID();
-        order.setReserveCode(uuid);
-        order.setStoreName(lpkStore.getName());
-        baseMapper.insert(order);
+            order.setCreateTime(new DateTime());
+            String uuid = UniqueIdGenerator.generateUniqueID();
+            order.setReserveCode(uuid);
+            order.setStoreName(lpkStore.getName());
+            order.setUserAddress(lpkStore.getName()+"-"+ lpkStore.getAddress());
+            baseMapper.insert(order);
+        }
         dto.setOrderSid(order.getSid());
         rb = vegeCellarReserveDetailsService.submissionDetail(dto);
         return rb;
     }
+//    @Transactional(rollbackFor = Exception.class)
+//    public ResultBean submission(VegeCellarReserveOrderDto dto) {
+//        ResultBean rb = new ResultBean().fail();
+//        boolean b = isSatAndSun(dto.getReserveDate());
+//        if (!b) {
+//            return rb.setMsg("当前提货时间不可预约提货");
+//        }
+//        Date date=new Date();
+//        //1>2 1 、1<2 -1 、1=2 0
+//        //判断预约时间小于当前时间
+//        int i =date.compareTo(DateUtil.parse(dto.getReserveDate()));
+//        if(i!=-1){
+//            return rb.setMsg("预约时间有误，请重新选择");
+//        }
+//        //判断三点前 还是三点后
+//        if(!isReserve(dto.getReserveDate())){
+//            return rb.setMsg("预约时间有误，请重新选择");
+//        }
+//        if (StringUtils.isBlank(dto.getCustomerSid())) {
+//            return rb.setMsg("参数不全");
+//        }
+//        VegeCellarReserveOrder order = new VegeCellarReserveOrder();
+//        LpkStore lpkStore = lpkStoreService.getOne(new QueryWrapper<LpkStore>().eq("sid", dto.getStoreSid()));
+//        BeanUtil.copyProperties(dto, order, "id", "sid");
+//        order.setStoreSid(dto.getStoreSid());
+////        order.setCardSid(dto.getSid());
+//        order.setCreateTime(new DateTime());
+//        String uuid = UniqueIdGenerator.generateUniqueID();
+//        order.setReserveCode(uuid);
+//        order.setStoreName(lpkStore.getName());
+//        baseMapper.insert(order);
+//        dto.setOrderSid(order.getSid());
+//        rb = vegeCellarReserveDetailsService.submissionDetail(dto);
+//        return rb;
+//    }
     @Transactional(rollbackFor = Exception.class)
     public ResultBean cancelReservation(String code) {
         ResultBean rb = new ResultBean().fail();
@@ -253,7 +299,18 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         if (StrUtil.isNotBlank(query.getCardType())) {
             qw.eq("vo.affiliation", query.getCardType());
         }
-
+        if (StrUtil.isNotBlank(query.getUserAddress())) {
+            qw.like("vo.userAddress", query.getUserAddress());
+        }
+        if (StrUtil.isNotBlank(query.getUserName())) {
+            qw.like("vo.userName", query.getUserName());
+        }
+        if (StrUtil.isNotBlank(query.getUserPhone())) {
+            qw.like("vo.userPhone", query.getUserPhone());
+        }
+        if (StrUtil.isNotBlank(query.getGoodsName())) {
+            qw.like("vd.goodsName", query.getGoodsName());
+        }
 //        qw.orderByAsc("vo.reserveDate");
         return qw;
     }
@@ -265,6 +322,9 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfCustomer(page, qw);
+        for (ReserveOrderVo record : pagerVo.getRecords()) {
+            record.setGg(record.getWeight()+record.getSpecificationUnit()+"/"+record.getUnitName());
+        }
         return rb.success().setData(pagerVo);
     }
 
@@ -294,6 +354,8 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         list.forEach(vo -> {
             ReserveCustomerExcel ex = new ReserveCustomerExcel();
             BeanUtil.copyProperties(vo, ex);
+            ex.setRemarks(vo.getRemarks());
+            ex.setGg(vo.getWeight()+vo.getSpecificationUnit()+"/"+vo.getUnitName());
             volist.add(ex);
         });
         return volist;

src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java

@@ -35,8 +35,10 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/lpkgiftcard/getReservationBySid/**")
                 .excludePathPatterns("/lpksreservoorder/submission")
                 .excludePathPatterns("/lpksreservoorder/exportExcelByStore")
+                .excludePathPatterns("/order/createNewUserBagOrder")
                 .excludePathPatterns("/empsreservoorder/createNewUserBagOrder")
                 .excludePathPatterns("/lpksreservoorders/submission")
+                .excludePathPatterns("/order/ordersList")
                 .excludePathPatterns("/empsreservoorder/ordersList")
                 .excludePathPatterns("/empsreservoorder/submission")
                 .excludePathPatterns("/empsreservoorder/submissionEmp")
@@ -50,6 +52,9 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/newcomerrecorecord/recommendedAssistance")
                 .excludePathPatterns("/newcomerrecorecord/recordList/**")
                 .excludePathPatterns("/transferrecords/transferRecordsList")
+                .excludePathPatterns("/order/createVegeOrder")
+                .excludePathPatterns("/order/OrderDetails/**")
+                .excludePathPatterns("/order/changePayState/**")
                 .excludePathPatterns("/empsreservoorder/createVegeOrder")
                 .excludePathPatterns("/empsreservoorder/OrderDetails/**")
                 .excludePathPatterns("/empsreservoorder/changePayState/**")
@@ -70,11 +75,13 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/lpkgiftcard/cardShareDetail/**")
                 .excludePathPatterns("/lpkgiftcard/cardShareGoodsDetail/**")
                 .excludePathPatterns("/empcardgift/generateTopEmpCard/**")
+                .excludePathPatterns("/order/createOrder")
                 .excludePathPatterns("/empsreservoorder/createOrder")
                 .excludePathPatterns("/appletgiftbag/recommendRecord/**")
                 //2024-01-17
                 .excludePathPatterns("/lpkgiftcard/getAllGoodsType/**")
                 .excludePathPatterns("/appletnotice/getNotice")
+                .excludePathPatterns("/order/getPreOrder")
                 .excludePathPatterns("/empsreservoorder/getPreOrder")
                 .excludePathPatterns("/lpkgoods/getAllGoodsType/**")
                 .excludePathPatterns("/transferrecords/submission")
@@ -90,7 +97,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/shoppingcart/shoppingCartList")
                 .excludePathPatterns("/shoppingcart/delShoppingCart/**")
                 .excludePathPatterns("/lpkgoods/vegeCellarTypeList")
-//                .excludePathPatterns("/vegetablecellar/addGoods/**")
+                .excludePathPatterns("/vegetablecellar/addGoods/**")
                 .excludePathPatterns("/lpkgoods/vegeCellarList")
                 .excludePathPatterns("/customerstore/getStoreBySid/**")
                 .excludePathPatterns("/lpkgiftcard/bindAllCard")
@@ -116,6 +123,9 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/invoicetype/listAll")
                 .excludePathPatterns("/invoicerecords/save")
                 .excludePathPatterns("/lpkgoods/vegeCellarInvalidList")
+                .excludePathPatterns("/vegecellarreserveorder/submission")
+                .excludePathPatterns("/vegecellarreserveorder/cancelReservation")
+                .excludePathPatterns("/vegecellarreserveorder/orderListByUserSid")
                 .excludePathPatterns("//wxapi/**");
     }
 }

src/main/java/com/yxt/yythmall/mallplus/biz/pms/controller/PmsBrandController.java

@@ -147,7 +147,19 @@ public class PmsBrandController {
             return new CommonResult().failed();
         }
     }
-
+    @ApiOperation(value = "批量更新配送状态")
+    @RequestMapping(value = "update/delivery", method = RequestMethod.POST)
+    @ResponseBody
+    // @SysLog(MODULE = "pms", REMARK = "批量更新显示状态")
+    public Object updateDeliveryStatus(@RequestParam("ids") Long ids,
+                                   @RequestParam("delivery") String delivery) {
+        int count = IPmsBrandService.updateDeliveryStatus(ids, delivery);
+        if (count > 0) {
+            return new CommonResult().success(count);
+        } else {
+            return new CommonResult().failed();
+        }
+    }
     @ApiOperation(value = "批量更新厂家制造商状态")
     @RequestMapping(value = "/update/factoryStatus", method = RequestMethod.POST)
     @ResponseBody

src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/IPmsBrandService.java

@@ -18,6 +18,7 @@ import java.util.List;
 public interface IPmsBrandService extends IService<PmsBrand> {
 
     int updateShowStatus(List<Long> ids, Integer showStatus);
+    int updateDeliveryStatus(Long ids, String showStatus);
 
     int updateFactoryStatus(List<Long> ids, Integer factoryStatus);
 

src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsBrandServiceImpl.java

@@ -32,7 +32,12 @@ public class PmsBrandServiceImpl extends ServiceImpl<PmsBrandMapper, PmsBrand> i
         return brandMapper.update(pmsBrand, new QueryWrapper<PmsBrand>().in("id", ids));
 
     }
+    public int updateDeliveryStatus(Long ids, String showStatus) {
+        PmsBrand pmsBrand = new PmsBrand();
+        pmsBrand.setDelivery(showStatus.toString());
+        return brandMapper.update(pmsBrand, new QueryWrapper<PmsBrand>().eq("id", ids));
 
+    }
     @Override
     public int updateFactoryStatus(List<Long> ids, Integer factoryStatus) {
         PmsBrand pmsBrand = new PmsBrand();

src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/PmsBrand.java

@@ -84,6 +84,23 @@ public class PmsBrand extends BaseEntity implements Serializable {
 
     @TableField("qdxy")
     private String qdxy;
+    @TableField("delivery")
+    private String delivery;
+
+    public String getDelivery() {
+        return delivery;
+    }
+
+    public void setDelivery(String delivery) {
+        this.delivery = delivery;
+    }
+    //    public int getDelivery() {
+//        return delivery;
+//    }
+//
+//    public void setDelivery(int delivery) {
+//        this.delivery = delivery;
+//    }
 
     public Long getId() {
         return id;

src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java

@@ -22,4 +22,5 @@ public class BrandVo {
     @ApiModelProperty("起订协议")
     private String qdxy;
     private String count;
+    private String delivery;
 }

src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml

@@ -24,6 +24,6 @@
     </sql>
 
     <select id="getList" resultType="com.yxt.yythmall.mallplus.mbg.pms.entity.brand.BrandVo">
-        select name brandName,id,qssl,dgxy,qdxy from pms_brand order by sort asc
+        select name brandName,id,qssl,dgxy,qdxy,delivery from pms_brand order by sort asc
     </select>
 </mapper>