From 84b076bb33f8b40adc8f5b318b776f30be92349e Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 13 Jan 2025 10:27:16 +0800 Subject: [PATCH] 01/13 --- .../yythmall/api/appletgiftbag/MyGoodsVo.java | 1 + .../yythmall/api/lpkgiftcard/AppletVo.java | 1 + .../yythmall/api/lpkgoods/GoodsTypeVo.java | 1 + .../lpkreserveorder/LpkReserveOrderQuery.java | 3 + .../TransferRecordsGoodsDetailsVo.java | 4 + .../VegeCellarReserveOrderVo.java | 1 + .../biz/customerstore/CustomerStoreRest.java | 6 +- .../customerstore/CustomerStoreService.java | 46 +++++++- .../yythmall/biz/lpkgoods/LpkGoodsMapper.xml | 3 +- .../biz/lpkgoods/LpkGoodsService.java | 1 + .../yythmall/biz/ordorder/OrdOrderRest.java | 3 +- .../biz/ordorder/OrdOrderService.java | 5 +- .../com/yxt/yythmall/biz/scheduled/A.java | 58 ++++++++++ .../yxt/yythmall/biz/scheduled/HolidayVo.java | 16 +++ .../yythmall/biz/scheduled/HolidayVos.java | 16 +++ .../yythmall/biz/scheduled/scheduledRest.java | 106 ++++++++++++------ .../TransferRecordsService.java | 4 + .../ReserveCustomerExcel.java | 51 +++++---- .../ReserveOrderVo.java | 6 + .../VegeCellarReserveOrderMapper.java | 1 + .../VegeCellarReserveOrderMapper.xml | 8 +- .../VegeCellarReserveOrderRest.java | 2 +- .../VegeCellarReserveOrderService.java | 82 ++++++++++++-- .../yxt/yythmall/config/SaTokenConfigure.java | 12 +- .../pms/controller/PmsBrandController.java | 14 ++- .../biz/pms/service/IPmsBrandService.java | 1 + .../pms/service/impl/PmsBrandServiceImpl.java | 5 + .../mallplus/mbg/pms/entity/PmsBrand.java | 17 +++ .../mbg/pms/entity/brand/BrandVo.java | 1 + .../mbg/pms/mapper/PmsBrandMapper.xml | 2 +- 30 files changed, 398 insertions(+), 79 deletions(-) create mode 100644 src/main/java/com/yxt/yythmall/biz/scheduled/A.java create mode 100644 src/main/java/com/yxt/yythmall/biz/scheduled/HolidayVo.java create mode 100644 src/main/java/com/yxt/yythmall/biz/scheduled/HolidayVos.java diff --git a/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java b/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java index 68ee30f..1d01221 100644 --- a/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java +++ b/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; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgiftcard/AppletVo.java b/src/main/java/com/yxt/yythmall/api/lpkgiftcard/AppletVo.java index 0c11d4b..d49ee51 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgiftcard/AppletVo.java +++ b/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 list; + private String remarks; public String getStart() { SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/GoodsTypeVo.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/GoodsTypeVo.java index 96b5cd0..bc6a471 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/GoodsTypeVo.java +++ b/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 typeVos; private List brandVos; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrderQuery.java b/src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrderQuery.java index 8353e95..ff482d9 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrderQuery.java +++ b/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 企业 } diff --git a/src/main/java/com/yxt/yythmall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java b/src/main/java/com/yxt/yythmall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java index 39d858e..988faf4 100644 --- a/src/main/java/com/yxt/yythmall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java +++ b/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; } diff --git a/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java b/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java index c1a8b92..396203e 100644 --- a/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java +++ b/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; //门店 diff --git a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreRest.java b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreRest.java index 2d4a1ee..106ad0d 100644 --- a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreRest.java +++ b/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 = "获取时间段的周六日") diff --git a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java index db8559c..97966bc 100644 --- a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java +++ b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java @@ -38,7 +38,7 @@ public class CustomerStoreService extends MybatisBaseService getStoreBySid(String customerSid) { + public ResultBean getStoreBySid(String customerSid,String delivery) { ResultBean rb=new ResultBean().fail(); // CustomerStoreVo vo=new CustomerStoreVo(); @@ -61,10 +61,10 @@ public class CustomerStoreService extends MybatisBaseService().eq("unavailableTime",start)); if(null!=cannotReserveDictionary){ +// int i=0; + do { + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + cannotReserveDictionary=cannotReserveDictionaryService.getOne(new QueryWrapper().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().eq("unavailableTime",start)); + if(null!=cannotReserveDictionary){ int i=0; do { SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml index e8b0c30..795f5ea 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml +++ b/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 diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java index 0064742..82ec18e 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java @@ -322,6 +322,7 @@ public class LpkGoodsService extends MybatisBaseService().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()); } diff --git a/src/main/java/com/yxt/yythmall/biz/scheduled/A.java b/src/main/java/com/yxt/yythmall/biz/scheduled/A.java new file mode 100644 index 0000000..7ed241f --- /dev/null +++ b/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 implements Serializable { + public List getList (ResponseEntity stringResponseEntity,Class t){ + JSONArray jsonArray= JSONObject.parseObject(stringResponseEntity.getBody()).getJSONArray("data"); + List vos=new ArrayList<>(); + if(null==jsonArray){ + return new ArrayList(); + } + for (int i = 0; i < jsonArray.size(); i++) { + T d= JSON.toJavaObject(jsonArray.getJSONObject(i),t); + vos.add(d); + } + return vos; + } + public List getListPage (ResponseEntity stringResponseEntity,Class t){ + JSONObject jsonObject= JSONObject.parseObject(stringResponseEntity.getBody()); + JSONObject js=jsonObject.getJSONObject("data"); + JSONArray jsonArray=js.getJSONArray("records"); + List vos=new ArrayList<>(); + if(null==jsonObject){ + return new ArrayList(); + } + 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 stringResponseEntity,Class t){ + JSONObject jsonObject = JSONObject.parseObject(stringResponseEntity.getBody()).getJSONObject("data"); + T d=JSON.toJavaObject(jsonObject,t); + return d; + } + public T getObject(String s,Class t){ + JSONObject jsonObject = JSONObject.parseObject(s).getJSONObject("data"); + T d=JSON.toJavaObject(jsonObject,t); + return d; + } + public Integer getInteger (ResponseEntity stringResponseEntity){ + Integer a=JSONObject.parseObject(stringResponseEntity.getBody()).getInteger("data"); + return a; + } + +} diff --git a/src/main/java/com/yxt/yythmall/biz/scheduled/HolidayVo.java b/src/main/java/com/yxt/yythmall/biz/scheduled/HolidayVo.java new file mode 100644 index 0000000..24189e4 --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/yxt/yythmall/biz/scheduled/HolidayVos.java b/src/main/java/com/yxt/yythmall/biz/scheduled/HolidayVos.java new file mode 100644 index 0000000..24c6c5f --- /dev/null +++ b/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 holiday=new ArrayList<>(); +} diff --git a/src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java b/src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java index 8f9e015..b87814b 100644 --- a/src/main/java/com/yxt/yythmall/biz/scheduled/scheduledRest.java +++ b/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 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 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 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 forEntity = restTemplate.getForEntity(a, String.class); + String s = HttpUtils.sendGet(a, ""); + System.out.println(s); } } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java index fc06173..19c618d 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java @@ -98,6 +98,10 @@ public class TransferRecordsService extends MybatisBaseService().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().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().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().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 page = PagerUtil.queryToPage(pq); IPage 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 { 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; diff --git a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java index 848488f..44df526 100644 --- a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java +++ b/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/**"); } } diff --git a/src/main/java/com/yxt/yythmall/mallplus/biz/pms/controller/PmsBrandController.java b/src/main/java/com/yxt/yythmall/mallplus/biz/pms/controller/PmsBrandController.java index b4d2dc0..cb2bcbd 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/biz/pms/controller/PmsBrandController.java +++ b/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 diff --git a/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/IPmsBrandService.java b/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/IPmsBrandService.java index ef403d3..495d3b3 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/IPmsBrandService.java +++ b/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 { int updateShowStatus(List ids, Integer showStatus); + int updateDeliveryStatus(Long ids, String showStatus); int updateFactoryStatus(List ids, Integer factoryStatus); diff --git a/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsBrandServiceImpl.java b/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsBrandServiceImpl.java index 5bebbb9..409bd23 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsBrandServiceImpl.java +++ b/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsBrandServiceImpl.java @@ -32,7 +32,12 @@ public class PmsBrandServiceImpl extends ServiceImpl i return brandMapper.update(pmsBrand, new QueryWrapper().in("id", ids)); } + public int updateDeliveryStatus(Long ids, String showStatus) { + PmsBrand pmsBrand = new PmsBrand(); + pmsBrand.setDelivery(showStatus.toString()); + return brandMapper.update(pmsBrand, new QueryWrapper().eq("id", ids)); + } @Override public int updateFactoryStatus(List ids, Integer factoryStatus) { PmsBrand pmsBrand = new PmsBrand(); diff --git a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/PmsBrand.java b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/PmsBrand.java index f49b4ab..898707d 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/PmsBrand.java +++ b/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; diff --git a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java index 0193b9a..36a968d 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java +++ b/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; } diff --git a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml index 34e3787..39c4e5e 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml +++ b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml @@ -24,6 +24,6 @@