From ad635dd02ee09be7aec46073db6ea5b95ff665bb Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 26 Jan 2024 20:37:19 +0800 Subject: [PATCH] 1/26 --- .../NewcomerRecoRecord.java | 1 + .../reservedeliveryorder/MergeStrategy.java | 92 ++ .../reservedeliveryorder/OrderGoodsVo.java | 16 + .../ReserveDeliveryOrder.java | 31 + .../ReserveDeliveryOrderDto.java | 31 + .../ReserveDeliveryOrderQuery.java | 23 + .../ReserveDeliveryOrderVo.java | 43 + .../ReserveDeliveryOrderDetails.java | 29 + .../ReserveDeliveryOrderDetailsDto.java | 14 + .../ReserveDeliveryOrderDetailsQuery.java | 8 + .../NewcomerRecoRecordService.java | 7 +- .../ReserveDeliveryOrderMapper.java | 60 ++ .../ReserveDeliveryOrderMapper.xml | 558 ++++++++++++ .../ReserveDeliveryOrderRest.java | 99 ++ .../ReserveDeliveryOrderService.java | 845 ++++++++++++++++++ .../ReserveDeliveryOrderDetailsMapper.java | 28 + .../ReserveDeliveryOrderDetailsMapper.xml | 37 + .../ReserveDeliveryOrderDetailsRest.java | 25 + .../ReserveDeliveryOrderDetailsService.java | 91 ++ .../VegetableCellarService.java | 36 + .../mallplus/mbg/pms/entity/PmsBrand.java | 8 + .../mbg/pms/entity/brand/BrandVo.java | 2 + .../mbg/pms/mapper/PmsBrandMapper.xml | 2 +- 23 files changed, 2082 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorder/MergeStrategy.java create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorder/OrderGoodsVo.java create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrder.java create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderDto.java create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderQuery.java create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderVo.java create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetails.java create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsDto.java create mode 100644 src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsQuery.java create mode 100644 src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderMapper.java create mode 100644 src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderMapper.xml create mode 100644 src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderRest.java create mode 100644 src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderService.java create mode 100644 src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsMapper.java create mode 100644 src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsMapper.xml create mode 100644 src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsRest.java create mode 100644 src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsService.java diff --git a/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecord.java b/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecord.java index 6ff3153..3080531 100644 --- a/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecord.java +++ b/src/main/java/com/yxt/yythmall/api/newcomerrecorecord/NewcomerRecoRecord.java @@ -24,6 +24,7 @@ public class NewcomerRecoRecord { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date assistanceDate; private String giftName; + private String state; } diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/MergeStrategy.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/MergeStrategy.java new file mode 100644 index 0000000..d42e3fa --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/MergeStrategy.java @@ -0,0 +1,92 @@ +package com.yxt.yythmall.api.reservedeliveryorder; + +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.write.merge.AbstractMergeStrategy; +import org.apache.commons.collections.map.HashedMap; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.util.CellRangeAddress; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * @author wangpengfei + * @date 2023/12/15 13:43 + */ +public class MergeStrategy extends AbstractMergeStrategy { + + // 合并的列编号，从0开始，指定的index或自己按字段顺序数 + private Set mergeCellIndex = new HashSet<>(); + + // 数据集大小，用于区别结束行位置 + private Integer maxRow = 0; + + // 禁止无参声明 + private MergeStrategy() { + } + + public MergeStrategy(Integer maxRow, int... mergeCellIndex) { + Arrays.stream(mergeCellIndex).forEach(item -> { + this.mergeCellIndex.add(item); + }); + this.maxRow = maxRow; + } + + // 记录上一次合并的信息 + private Map lastRow = new HashedMap(); + + // 每行每列都会进入，绝对不要在这写循环 + @Override + protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) { + int currentCellIndex = cell.getColumnIndex(); + // 判断该行是否需要合并 + if (mergeCellIndex.contains(currentCellIndex)) { + String currentCellValue = cell.getStringCellValue(); + int currentRowIndex = cell.getRowIndex(); + if (!lastRow.containsKey(currentCellIndex)) { + // 记录首行起始位置 + lastRow.put(currentCellIndex, new MergeRange(currentCellValue, currentRowIndex, currentRowIndex, currentCellIndex, currentCellIndex)); + return; + } + //有上行这列的值了，拿来对比. + MergeRange mergeRange = lastRow.get(currentCellIndex); + if (!(mergeRange.lastValue != null && mergeRange.lastValue.equals(currentCellValue))) { + // 结束的位置触发下合并. + // 同行同列不能合并，会抛异常 + if (mergeRange.startRow != mergeRange.endRow || mergeRange.startCell != mergeRange.endCell) { + sheet.addMergedRegionUnsafe(new CellRangeAddress(mergeRange.startRow, mergeRange.endRow, mergeRange.startCell, mergeRange.endCell)); + } + // 更新当前列起始位置 + lastRow.put(currentCellIndex, new MergeRange(currentCellValue, currentRowIndex, currentRowIndex, currentCellIndex, currentCellIndex)); + } + // 合并行 + 1 + mergeRange.endRow += 1; + // 结束的位置触发下最后一次没完成的合并 + if (relativeRowIndex.equals(maxRow - 1)) { + MergeRange lastMergeRange = lastRow.get(currentCellIndex); + // 同行同列不能合并，会抛异常 + if (lastMergeRange.startRow != lastMergeRange.endRow || lastMergeRange.startCell != lastMergeRange.endCell) { + sheet.addMergedRegionUnsafe(new CellRangeAddress(lastMergeRange.startRow, lastMergeRange.endRow, lastMergeRange.startCell, lastMergeRange.endCell)); + } + } + } + } +} +class MergeRange { + public int startRow; + public int endRow; + public int startCell; + public int endCell; + public String lastValue; + + public MergeRange(String lastValue, int startRow, int endRow, int startCell, int endCell) { + this.startRow = startRow; + this.endRow = endRow; + this.startCell = startCell; + this.endCell = endCell; + this.lastValue = lastValue; + } +} diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/OrderGoodsVo.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/OrderGoodsVo.java new file mode 100644 index 0000000..de202b5 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/OrderGoodsVo.java @@ -0,0 +1,16 @@ +package com.yxt.yythmall.api.reservedeliveryorder; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2023/11/28 10:11 + */ +@Data +public class OrderGoodsVo implements Vo { + private int num; + private String goodName; + private String unitName; +} diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrder.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrder.java new file mode 100644 index 0000000..b6b58f1 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrder.java @@ -0,0 +1,31 @@ +package com.yxt.yythmall.api.reservedeliveryorder; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/11/23 10:29 + */ +@Data +public class ReserveDeliveryOrder { + private String id; + private String sid= UUID.randomUUID().toString(); + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String affiliation; + private String customerSid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date reserveDate; + private String userName; + private String userPhone; + private String userAddress; + private String reserveCode; + private String state; + +} diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderDto.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderDto.java new file mode 100644 index 0000000..5f4a777 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderDto.java @@ -0,0 +1,31 @@ +package com.yxt.yythmall.api.reservedeliveryorder; + +import com.yxt.common.core.dto.Dto; +import com.yxt.yythmall.api.lpkgiftcard.GoodsVo; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/23 10:29 + */ +@Data +public class ReserveDeliveryOrderDto implements Dto { + private String customerSid; + private String reserveDate; + private String storeSid; + private String storeName; + private String userName; + private String userPhone; + private String userAddress; + private String affiliation; + private String brandId; + private List goodsVos; + private String goodsSid; + private double select; + private String orderSid; + private String addressName; + private String cardType;//提货类型，1=提货卡；2=福利卡 + +} diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderQuery.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderQuery.java new file mode 100644 index 0000000..de882a2 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderQuery.java @@ -0,0 +1,23 @@ +package com.yxt.yythmall.api.reservedeliveryorder; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/23 10:30 + */ +@Data +public class ReserveDeliveryOrderQuery implements Query { + private String userName; //用户名 + private String store; // 门店 + private String startDate; //预约开始日期 + private String endDate; // 预约结束日期 + private String userSid; + private String customerSid; + private String storeSid; + private String bankSid; + private String bankName; + private String serialNumber; + private String state; +} diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderVo.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderVo.java new file mode 100644 index 0000000..1ac6439 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorder/ReserveDeliveryOrderVo.java @@ -0,0 +1,43 @@ +package com.yxt.yythmall.api.reservedeliveryorder; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2023/11/27 15:11 + */ +@Data +public class ReserveDeliveryOrderVo implements Vo { + private String sid; //预约订单sid + private String userName; //用户名 + private String userPhone; //用户电话 + private String store; //门店 + private String storeSid; //门店 + @JsonFormat(pattern = "yyyy-MM-dd ",timezone="GMT+8") + private Date reserveDate; //预约时间 + private String bagName; //礼包 + private String code; //卡号 + private String goodsInfo; + private List goodsVo = new ArrayList<>(); + private List goods=new ArrayList<>(); + private String bankName; + private String goodsSid; + private String goodsName; + private String goodsNumber; + private String serialNumber; + private String linker; + private String linkPhone; + private String address; + private String cardType; + private String goodss; + private String stateValue; + private String affiliationValue; + private String reserveCode; +} diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetails.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetails.java new file mode 100644 index 0000000..996f6d9 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetails.java @@ -0,0 +1,29 @@ +package com.yxt.yythmall.api.reservedeliveryorderdetails; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/11/23 10:29 + */ +@Data +public class ReserveDeliveryOrderDetails { + private String id; + private String sid= UUID.randomUUID().toString(); + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + private String remarks; + private String cardSid; + + private double goodsNumber=0; + @TableField(exist = false) + private String num; +// @TableField(exist = false) + private String orderSid; + private String goodsName; +} diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsDto.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsDto.java new file mode 100644 index 0000000..38763d4 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsDto.java @@ -0,0 +1,14 @@ +package com.yxt.yythmall.api.reservedeliveryorderdetails; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/23 10:29 + */ +@Data +public class ReserveDeliveryOrderDetailsDto { + private String cardSid; + private String goodsSid; + private String goodsNumber; +} diff --git a/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsQuery.java b/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsQuery.java new file mode 100644 index 0000000..dcbd8f5 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsQuery.java @@ -0,0 +1,8 @@ +package com.yxt.yythmall.api.reservedeliveryorderdetails; + +/** + * @author wangpengfei + * @date 2023/11/23 10:30 + */ +public class ReserveDeliveryOrderDetailsQuery { +} diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java index 13bbd2a..743cfe4 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java @@ -69,8 +69,9 @@ public class NewcomerRecoRecordService extends MybatisBaseService bags=recommendNewUserBagService.list(new QueryWrapper().eq("isGrounding","1 ")); + List bags=recommendNewUserBagService.list(new QueryWrapper().eq("isGrounding","1")); if(bags.size()==0){ + newcomerRecoRecord.setSid(""); return rb.success().setData(newcomerRecoRecord); } dto.setGiftBagSid(bags.get(0).getSid()); @@ -91,14 +92,14 @@ public class NewcomerRecoRecordService extends MybatisBaseService().eq("sid",dto.getSid())); + NewcomerRecoRecord newcomerRecoRecord = baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getOrderSid())); newcomerRecoRecord.setRecommendedSid(dto.getCustomerSid()); newcomerRecoRecord.setAssistanceDate(new Date()); - baseMapper.updateById(newcomerRecoRecord); Listlist=recommendNewUserBagDetailsService.list(new QueryWrapper().eq("giftbagSid",newcomerRecoRecord.getGiftBagSid())); if(list.size()==0){ return rb.success(); } + baseMapper.updateById(newcomerRecoRecord); // Listlist=appletGiftBagGoodsService.list(new QueryWrapper().eq("giftbagSid",dto.getGiftBagSid())); VegetableCellarDto dto1=new VegetableCellarDto(); dto1.setCustomerSid(customer.getSid()); diff --git a/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderMapper.java b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderMapper.java new file mode 100644 index 0000000..4818a4b --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderMapper.java @@ -0,0 +1,60 @@ +package com.yxt.yythmall.biz.reservedeliveryorder; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrder; +import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderQuery; +import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderVo; +import com.yxt.yythmall.biz.vegecallerreserveorder.ReserveOrderVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Mapper +public interface ReserveDeliveryOrderMapper extends BaseMapper { +// IPage orderList(IPage page, @Param("qw") ReserveDeliveryOrderQuery qw); +// IPage orderListByStore(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +// IPage orderListByBank(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +// IPage orderListByZ(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +//// List orderByCardSid(String sid); +// +//// IPage orderListByUserSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage orderListByUserSid(IPage page, @Param("query") ReserveDeliveryOrderQuery query); + + IPage pageOfCustomer(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List pageOfCustomer(@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage pageOfStore(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + List pageOfStore(@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage pageOfBank(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + List pageOfBank(@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage pageOfAll(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + List pageOfAll(@Param(Constants.WRAPPER) QueryWrapper qw); +// +// List exportExcel(@Param("qw") ReserveDeliveryOrderQuery qw); +// List exportExcelByStore(@Param(Constants.WRAPPER) QueryWrapper qw); +// List exportExcelByBank(@Param(Constants.WRAPPER) QueryWrapper qw); +// List exportExcelByZ(@Param(Constants.WRAPPER) QueryWrapper qw); +// @Select("select sid from lpk_reserve_order where storeSid=#{storeSid} and reserveDate =#{reserveDate}") +// List getOrderByStore(@Param("storeSid")String storeSid,@Param("reserveDate")String reserveDate); +// @Select("select * from lpk_reserve_order where customerSid =#{sid} order by createTime desc limit 1") +// ReserveDeliveryOrderVo getStoreByCustomerSid(@Param("sid") String sid); +// @Select("select * from lpk_reserve_order where cardSid =#{sid} order by reserveDate desc limit 1") +// ReserveDeliveryOrderVo selByCardSid(@Param("sid") String sid); +// @Select("SELECT o.*,st.`name` AS store FROM lpk_reserve_order o LEFT JOIN lpk_store st ON o.storeSid = st.sid where o.cardSid =#{sid} ORDER BY o.reserveDate desc") +// List selOrderByCardSid(@Param("sid") String sid); + +} diff --git a/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderMapper.xml b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderMapper.xml new file mode 100644 index 0000000..6953ad6 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderMapper.xml @@ -0,0 +1,558 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderRest.java b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderRest.java new file mode 100644 index 0000000..49aa13a --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderRest.java @@ -0,0 +1,99 @@ +//package com.yxt.yythmall.biz.reservedeliveryorder; +// +//import com.yxt.common.core.query.PagerQuery; +//import com.yxt.common.core.result.ResultBean; +//import com.yxt.common.core.vo.PagerVo; +//import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderDto; +//import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderQuery; +//import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderVo; +//import com.yxt.yythmall.api.vegecallerreserveorder.ReserveDeliveryOrderDto; +//import com.yxt.yythmall.api.vegecallerreserveorder.ReserveDeliveryOrderQuery; +//import com.yxt.yythmall.api.vegecallerreserveorder.ReserveDeliveryOrderVo; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestBody; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +///** +// * @author wangpengfei +// * @date 2023/11/23 10:35 +// */ +//@Api(tags = "预约订单信息") +//@RestController +//@RequestMapping("/lpksreservoorders") +//public class ReserveDeliveryOrderRest { +// @Autowired +// ReserveDeliveryOrderService ReserveDeliveryOrderService; +//// +//// +// @ApiOperation("预约提交") +// @PostMapping("/submission") +// public ResultBean submission(@RequestBody ReserveDeliveryOrderDto dto) { +// return ReserveDeliveryOrderService.submission(dto); +// } +// +// +// @ApiOperation("移动端预约订单列表") +// @PostMapping("/orderListByUserSid") +// public ResultBean> orderListByUserSid(@RequestBody PagerQuery pq) { +// return ReserveDeliveryOrderService.orderListByUserSid(pq); +// } +//// +//// @ApiOperation("订单列表") +//// @PostMapping("/orderList") +//// public ResultBean> orderList(@RequestBody PagerQuery pq) { +//// return ReserveDeliveryOrderService.orderList(pq); +//// } +//// @ApiOperation("订单门店汇总列表") +//// @PostMapping("/orderListByStore") +//// public ResultBean> orderListByStore(@RequestBody PagerQuery pq) { +//// return ReserveDeliveryOrderService.orderListByStore(pq); +//// } +//// @ApiOperation("订单门店支行汇总列表") +//// @PostMapping("/orderListByBank") +//// public ResultBean> orderListByBank(@RequestBody PagerQuery pq) { +//// return ReserveDeliveryOrderService.orderListByBank(pq); +//// } +//// @ApiOperation("订单总汇总列表") +//// @PostMapping("/orderListByZ") +//// public ResultBean> orderListByZ(@RequestBody PagerQuery pq) { +//// return ReserveDeliveryOrderService.orderListByZ(pq); +//// } +//// @ApiOperation("根据提货卡查询预约记录") +//// @GetMapping("/orderByCardSid/{sid}") +//// public ResultBean orderByCardSid(@PathVariable("sid") String sid) { +//// return ReserveDeliveryOrderService.orderByCardSid(sid); +//// } +//// +// +//// +//// @ApiOperation("预约记录详情") +//// @GetMapping("/orderDetails/{orderSid}") +//// public ResultBean orderDetails(@PathVariable("orderSid") String orderSid) { +//// return ReserveDeliveryOrderService.orderDetails(orderSid); +//// } +//// +//// @ApiOperation(value = "预约订单信息列表导出") +//// @PostMapping("/exportExcel") +//// public void exportExcel(@RequestBody ReserveDeliveryOrderQuery query) { +//// ReserveDeliveryOrderService.exportExcel(query); +//// } +//// @ApiOperation(value = "预约订单门店汇总导出") +//// @PostMapping("/exportExcelByStore") +//// public void exportExcelByStore(@RequestBody ReserveDeliveryOrderQuery query) { +//// ReserveDeliveryOrderService.exportExcelByStore(query); +//// } +//// @ApiOperation(value = "预约订单支行汇总导出") +//// @PostMapping("/exportExcelByBank") +//// public void exportExcelByBank(@RequestBody ReserveDeliveryOrderQuery query) { +//// ReserveDeliveryOrderService.exportExcelByBank(query); +//// } +//// @ApiOperation(value = "预约订单总汇总导出") +//// @PostMapping("/exportExcelByZ") +//// public void exportExcelByZ(@RequestBody ReserveDeliveryOrderQuery query) { +//// ReserveDeliveryOrderService.exportExcelByZ(query); +//// } +//} diff --git a/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderService.java b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderService.java new file mode 100644 index 0000000..d0a07fc --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorder/ReserveDeliveryOrderService.java @@ -0,0 +1,845 @@ +//package com.yxt.yythmall.biz.reservedeliveryorder; +// +//import cn.hutool.core.bean.BeanUtil; +//import cn.hutool.core.date.DateTime; +//import cn.hutool.core.date.DateUtil; +//import cn.hutool.core.util.StrUtil; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.yxt.common.base.service.MybatisBaseService; +//import com.yxt.common.base.utils.PagerUtil; +//import com.yxt.common.base.utils.StringUtils; +//import com.yxt.common.core.query.PagerQuery; +//import com.yxt.common.core.result.ResultBean; +//import com.yxt.common.core.vo.PagerVo; +//import com.yxt.yythmall.api.lpkgoods.LpkGoods; +//import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderQuery; +//import com.yxt.yythmall.api.lpkstore.LpkStore; +//import com.yxt.yythmall.api.reservedeliveryorder.OrderGoodsVo; +//import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrder; +//import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderDto; +//import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderQuery; +//import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderVo; +//import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails; +//import com.yxt.yythmall.api.vegecallerreserveorder.*; +//import com.yxt.yythmall.biz.lpkgiftcard.generateRule.UniqueIdGenerator; +//import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; +//import com.yxt.yythmall.biz.lpkstore.LpkStoreService; +//import com.yxt.yythmall.biz.reservedeliveryorderdetails.ReserveDeliveryOrderDetailsService; +//import com.yxt.yythmall.biz.vegecallerreservedetail.VegeCellarReserveDetailsService; +//import com.yxt.yythmall.biz.vegecallerreserveorder.*; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +//import org.springframework.transaction.annotation.Transactional; +// +//import java.util.ArrayList; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +///** +// * @author wangpengfei +// * @date 2023/11/23 10:36 +// */ +//@Service +//public class ReserveDeliveryOrderService extends MybatisBaseService { +// @Autowired +// ReserveDeliveryOrderDetailsService reserveDeliveryOrderDetailsService; +// @Autowired +// LpkStoreService lpkStoreService; +// +// @Autowired +// private LpkGoodsService lpkGoodsService; +// +// @Transactional(rollbackFor = Exception.class) +// public ResultBean submission(ReserveDeliveryOrderDto dto) { +// ResultBean rb = new ResultBean().fail(); +// boolean b = isSatAndSun(dto.getReserveDate()); +// if (!b) { +// return rb.setMsg("周六、周日不能预约提货"); +// } +// if(StringUtils.isBlank(dto.getCustomerSid())){ +// return rb.setMsg("参数不全"); +// } +// ReserveDeliveryOrder order = new ReserveDeliveryOrder(); +// 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; +// } +// +// public ResultBean addGoodsOrder(ReserveDeliveryOrderDto dto) { +// ResultBean rb = new ResultBean().fail(); +// boolean b = isSatAndSun(dto.getReserveDate()); +// if (!b) { +// return rb.setMsg("周六、周日不能预约提货"); +// } +// ReserveDeliveryOrder order = new ReserveDeliveryOrder(); +// order = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) +// .eq("affiliation", dto.getAffiliation()).eq("state", "0")).get(0); +// if (order == null) { +// BeanUtil.copyProperties(dto, order, "id", "sid"); +//// order.setStoreSid(dto.getStoreSid()); +//// order.setCardSid(dto.getSid()); +// order.setCreateTime(new DateTime()); +// baseMapper.insert(order); +// } +// dto.setOrderSid(order.getSid()); +// vegeCellarReserveDetailsService.addDetail(dto); +// return rb.success().setData("预约成功"); +// } +// +// public ResultBean minusGoodsOrder(ReserveDeliveryOrderDto dto) { +// ResultBean rb = new ResultBean().fail(); +// boolean b = isSatAndSun(dto.getReserveDate()); +// if (!b) { +// return rb.setMsg("周六、周日不能预约提货"); +// } +// ReserveDeliveryOrder order = new ReserveDeliveryOrder(); +// order = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) +// .eq("affiliation", dto.getAffiliation()).eq("state", "0")).get(0); +// if (order == null) { +// BeanUtil.copyProperties(dto, order, "id", "sid"); +//// order.setStoreSid(dto.getStoreSid()); +//// order.setCardSid(dto.getSid()); +// order.setCreateTime(new DateTime()); +// baseMapper.insert(order); +// } +// dto.setOrderSid(order.getSid()); +// vegeCellarReserveDetailsService.addDetail(dto); +// return rb.success().setData("预约成功"); +// } +// +// +// public boolean isSatAndSun(String date) { +// DateTime dateTime = DateUtil.parse(date); +// ; // 获取当前时间 +// int dayOfWeek = dateTime.dayOfWeekEnum().getValue();// 获取星期几（1-7） +// System.out.println(dayOfWeek); +// if (dayOfWeek == 1 || dayOfWeek == 7) { +// return false; +// } else { +// return true; +// } +// } +// +// // @Test +//// public void isSatAndSun(){ +//// String date="2023-12-11"; +//// DateTime dateTime = DateUtil.parse(date);; // 获取当前时间 +//// int dayOfWeek = dateTime.dayOfWeekEnum().getValue();// 获取星期几（1-7） +//// +//// System.out.println(dayOfWeek); +//// if (dayOfWeek == 1 || dayOfWeek == 7) { +//// System.out.println(dayOfWeek); +//// } else { +//// System.out.println(11111); +//// } +//// } +//// public ResultBean> orderList(PagerQuery pq) { +//// ResultBean rb = ResultBean.fireFail(); +//// ReserveDeliveryOrderQuery query = pq.getParams(); +//// IPage page = PagerUtil.queryToPage(pq); +//// IPage pagging = baseMapper.orderList(page, query); +//// List records = pagging.getRecords(); +//// if (!records.isEmpty()) { +//// records.forEach(s -> { +//// List orderGoods = ReserveDeliveryOrderGoodsService.selByOrderSid(s.getSid()); +//// List goodsVoList = new ArrayList<>(); +//// if (!orderGoods.isEmpty()) { +//// for (ReserveDeliveryOrderGoods orderGood : orderGoods) { +//// OrderGoodsVo goodsVo = new OrderGoodsVo(); +//// if (StringUtils.isNotBlank(orderGood.getGoodsSid())) { +//// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid()); +//// if (null != lpkGoods) { +//// goodsVo.setGoodName(lpkGoods.getName()); +//// } +//// } +//// if (orderGood.getGoodsNumber() != 0) { +//// goodsVo.setNum((int) orderGood.getGoodsNumber()); +//// } +//// goodsVoList.add(goodsVo); +//// } +//// } +//// s.setGoodsVo(goodsVoList); +//// }); +//// } +//// PagerVo p = PagerUtil.pageToVo(pagging, null); +//// return rb.success().setData(p); +//// } +//// public ResultBean> orderListByStore(PagerQuery pq) { +//// ResultBean rb = ResultBean.fireFail(); +//// ReserveDeliveryOrderQuery query = pq.getParams(); +//// QueryWrapper qw = new QueryWrapper<>(); +//// qw.eq("1", "1"); +//// if (StringUtils.isNotBlank(query.getStore())) { +//// qw.like("s.name", query.getStore()); +//// } +//// if (StringUtils.isNotBlank(query.getBankName())) { +//// qw.like("d.name", query.getBankName()); +//// } +//// if (StringUtils.isNotBlank(query.getBankSid())) { +//// qw.eq("s.bankSid", query.getBankSid()); +//// } +//// if (StringUtils.isNotBlank(query.getStartDate())) { +//// +//// String startDate = query.getStartDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getEndDate())) { +//// String endDate = query.getEndDate(); +//// 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.sid"); +//// qw.orderByDesc("s.sid"); +//// qw.groupBy("o.cardType"); +//// qw.groupBy("o.reserveDate"); +//// qw.groupBy("t.goodsSid"); +//// qw.groupBy("s.name"); +//// IPage page = PagerUtil.queryToPage(pq); +//// IPage pagging = baseMapper.orderListByStore(page, qw); +////// List records = pagging.getRecords(); +//// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +////// if (!records.isEmpty()) { +////// records.forEach(s -> { +////// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); +////// s.setGoodsName(lpkGoods.getName()); +////// }); +////// } +//// PagerVo p = PagerUtil.pageToVo(pagging, null); +//// return rb.success().setData(p); +//// } +//// public ResultBean> orderListByBank(PagerQuery pq) { +//// ResultBean rb = ResultBean.fireFail(); +//// ReserveDeliveryOrderQuery query = pq.getParams(); +//// QueryWrapper qw = new QueryWrapper<>(); +//// qw.eq("1", "1"); +//// +//// if (StringUtils.isNotBlank(query.getStartDate())) { +//// +//// String startDate = query.getStartDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getEndDate())) { +//// String endDate = query.getEndDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getBankSid())) { +//// qw.eq("s.bankSid", query.getBankSid()); +//// } +//// +//// qw.groupBy("d.sid"); +//// qw.groupBy("t.goodsSid"); +//// qw.groupBy("o.reserveDate"); +//// qw.groupBy("o.cardType"); +//// qw.orderByAsc("o.reserveDate"); +//// qw.orderByDesc("d.sid"); +//// qw.orderByDesc("s.sid"); +////// qw.groupBy("s.name"); +//// IPage page = PagerUtil.queryToPage(pq); +//// IPage pagging = baseMapper.orderListByBank(page, qw); +//// List records = pagging.getRecords(); +//// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +//// +////// if (!records.isEmpty()) { +////// records.forEach(s -> { +////// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); +////// s.setGoodsName(lpkGoods.getName()); +////// }); +////// } +//// PagerVo p = PagerUtil.pageToVo(pagging, null); +//// return rb.success().setData(p); +//// } +//// public ResultBean> orderListByZ(PagerQuery pq) { +//// ResultBean rb = ResultBean.fireFail(); +//// ReserveDeliveryOrderQuery query = pq.getParams(); +//// QueryWrapper qw = new QueryWrapper<>(); +//// qw.eq("1", "1"); +//// if (StringUtils.isNotBlank(query.getStore())) { +//// qw.like("s.name", query.getStore()); +//// } +//// if (StringUtils.isNotBlank(query.getUserName())) { +//// qw.like("o.userName", query.getUserName()); +//// } +//// if (StringUtils.isNotBlank(query.getUserSid())) { +//// qw.like("o.customerSid", query.getUserSid()); +//// } +//// if (StringUtils.isNotBlank(query.getStartDate())) { +//// +//// String startDate = query.getStartDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getEndDate())) { +//// String endDate = query.getEndDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getBankSid())) { +//// qw.eq("s.bankSid", query.getBankSid()); +//// } +//// qw.orderByAsc("o.reserveDate"); +//// qw.groupBy("t.goodsSid"); +//// qw.groupBy("o.reserveDate"); +//// qw.groupBy("o.cardType"); +////// qw.groupBy("s.name"); +//// IPage page = PagerUtil.queryToPage(pq); +//// IPage pagging = baseMapper.orderListByZ(page, qw); +//// List records = pagging.getRecords(); +//// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +////// if (!records.isEmpty()) { +////// records.forEach(s -> { +////// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); +////// s.setGoodsName(lpkGoods.getName()); +////// }); +////// } +//// PagerVo p = PagerUtil.pageToVo(pagging, null); +//// return rb.success().setData(p); +//// } +//// public ResultBean orderByCardSid(String sid) { +//// ResultBean rb = ResultBean.fireFail(); +//// List list = baseMapper.orderByCardSid(sid); +//// return rb.success().setData(list); +//// } +//// +// public ResultBean> orderListByUserSid(PagerQuery pq) { +// ResultBean rb = ResultBean.fireFail(); +// ReserveDeliveryOrderQuery query = pq.getParams(); +// QueryWrapper qw = new QueryWrapper<>(); +// if (StringUtils.isBlank(query.getCustomerSid())) { +// return rb.setMsg("参数不全"); +// } +// qw.eq("o.customerSid", query.getUserSid()); +// qw.eq("o.state", query.getState()); +// qw.orderByDesc("reserveDate"); +// IPage page = PagerUtil.queryToPage(pq); +// IPage pagging = baseMapper.orderListByUserSid(page, query); +// List goodsVo = new ArrayList<>(); +// for (ReserveDeliveryOrderVo vo : pagging.getRecords()) { +// List goods = reserveDeliveryOrderDetailsService.selByOrderSids(vo.getSid()); +// for (VegeCellarReserveDetails goods1 : goods) { +// LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper().eq("sid", goods1.getGoodsSid())); +//// OrderGoodsVo orderGoodsVo=new OrderGoodsVo(); +//// orderGoodsVo.setGoodName(lpkGoods.getName()); +//// orderGoodsVo.setNum(Integer.parseInt(goods1.getNum())); +//// orderGoodsVo.setUnitName(lpkGoods.getUnitName()); +//// goodsVo.add(orderGoodsVo); +// if (StringUtils.isBlank(vo.getGoodss())) { +// vo.setGoodss(lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName()); +// } else { +// vo.setGoodss(vo.getGoodss() + " " + lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName()); +// } +// } +// vo.setGoodsVo(goodsVo); +// } +// +// PagerVo p = PagerUtil.pageToVo(pagging, null); +// return rb.success().setData(p); +// } +//// +//// public ResultBean orderDetails(String orderSid) { +//// ResultBean rb = new ResultBean().fail(); +//// ReserveDeliveryOrder ReserveDeliveryOrder = fetchBySid(orderSid); +//// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +//// if (null != ReserveDeliveryOrder) { +//// AppletVo vo = lpkGiftCardMapper.getGifCardBySid(ReserveDeliveryOrder.getCardSid()); +//// if (StringUtils.isNotBlank(ReserveDeliveryOrder.getStoreSid())) { +//// LpkStore lpkStore = lpkStoreService.fetchBySid(ReserveDeliveryOrder.getStoreSid()); +//// if (null != lpkStore) { +//// if (StringUtils.isNotBlank(lpkStore.getName())) { +//// vo.setStore(lpkStore.getName()); +//// } +//// } +//// } +//// if (StringUtils.isNotBlank(ReserveDeliveryOrder.getReserveDate())) { +//// try { +//// Date parse = sdf.parse(ReserveDeliveryOrder.getReserveDate()); +//// vo.setReserveDate(sdf.format(parse)); +//// } catch (ParseException e) { +//// e.printStackTrace(); +//// } +//// } +//// List list = lpkGiftBagGoodsService.getGoodsByBagSid(vo.getGiftbagSid()); +//// List l = lpkStoreService.getAllStore().getData(); +//// List goodsVos = new ArrayList<>(); +//// list.forEach(s -> { +//// ReserveDeliveryOrderGoods goods = ReserveDeliveryOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); +//// ReserveDeliveryOrderGoods orderGoods = ReserveDeliveryOrderGoodsService.selByOrderSidAndGoodSid(orderSid, s.getGoodsSid()); +//// GoodsVo goodsVo = new GoodsVo(); +//// goodsVo.setGoods(s.getGoodsName()); +//// goodsVo.setNum(s.getGoodsNumber()); +//// goodsVo.setGoodsSid(s.getGoodsSid()); +//// goodsVo.setPic(fileUploadComponent.getUrlPrefix() + s.getPicUrl()); +//// if (null != goods) { +//// if (goods.getGoodsNumber() != s.getGoodsNumber()) { +//// goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()); +//// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber()); +//// if (null != orderGoods) { +//// goodsVo.setOrderNum(orderGoods.getGoodsNumber()); +//// } +//// goodsVos.add(goodsVo); +//// } +//// } else { +//// goodsVo.setLNum(s.getGoodsNumber()); +//// goodsVo.setSelect(s.getGoodsNumber()); +//// goodsVos.add(goodsVo); +//// } +//// }); +//// vo.setGoodsVos(goodsVos); +//// vo.setSelect(l); +//// return rb.success().setData(vo); +//// } +//// return rb.success(); +//// } +//// +//// public void exportExcel(ReserveDeliveryOrderQuery query) { +//// //得到所有要导出的数据 +//// List exportList = baseMapper.exportExcel(query); +//// List exportList1 = new ArrayList<>(); +//// if (!exportList.isEmpty()) { +//// exportList.forEach(s -> { +//// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); +//// s.setGoodsName(lpkGoods.getName()); +////// if (StringUtils.isNotBlank(s.getUserPhone())) { +//////// String phone = s.getUserPhone().substring(0, 3) + "****" + s.getUserPhone().substring(7); +////// String phone = s.getUserPhone(); +////// s.setUserPhone(phone); +////// } +////// List orderGoods = ReserveDeliveryOrderGoodsService.selByOrderSid(s.getSid()); +////// if (!orderGoods.isEmpty()) { +////// int i=0; +////// for (ReserveDeliveryOrderGoods orderGood : orderGoods) { +////// String num = ""; +////// String goodsName = ""; +////// String finWord = ""; +////// String unitName = ""; +////// if (StringUtils.isNotBlank(orderGood.getGoodsSid())) { +////// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid()); +////// if (null != lpkGoods) { +////// goodsName = lpkGoods.getName(); +////// if (StringUtils.isNotBlank(lpkGoods.getUnitName())) { +////// unitName = lpkGoods.getUnitName(); +////// } +////// } +////// } +////// if (orderGood.getGoodsNumber() != 0) { +////// num = String.valueOf((int) orderGood.getGoodsNumber()); +////// } +////// finWord = goodsName+num + unitName ; +////// i++; +////// if(i>1){ +////// ReserveOrderExport en=new ReserveOrderExport(); +////// BeanUtil.copyProperties(s,en , "id"); +////// en.setGoodsInfo(finWord); +////// exportList1.add(en); +////// }else{ +////// s.setGoodsInfo(finWord); +////// exportList1.add(s); +////// } +////// } +////// } +//// }); +//// } +//// //定义导出的excel名字 +//// //定义导出的excel名字 +//// String excelName = "订单明细.xlsx"; +//// String fileNameURL = "1"; +//// response.setContentType( "application/vnd.ms-excel"); +//// response.setCharacterEncoding("utf8"); +//// response.setHeader("Content-disposition","attachment;filename="+ excelName ); +//// ServletOutputStream outputStream = null; +//// try { +//// WriteCellStyle headWriteCellStyle = new WriteCellStyle(); +//// +//// //设置头居中 +//// headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); +//// +//// //内容策略 +//// WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); +//// //设置 水平居中 +//// contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); +////// HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle,contentWriteCellStyle); +//// HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle()); +//// +//// EasyExcel//将数据映射到DownloadDTO实体类并响应到浏览器 +//// .write(new BufferedOutputStream(response.getOutputStream()), ReserveOrderExport.class) +//// //是否自动关闭输入流 +//// .autoCloseStream(Boolean.TRUE) +////// .registerWriteHandler(new MergeStrategy(exportList.size(),1,5)) +//// .registerWriteHandler(horizontalCellStyleStrategy) +//// .sheet().doWrite(exportList); +//// } catch (IOException e) { +//// throw new RuntimeException(e); +//// } +//// } +//// public void exportExcelByStore(ReserveDeliveryOrderQuery query) { +//// QueryWrapper qw = new QueryWrapper<>(); +//// qw.eq("1", "1"); +//// if (StringUtils.isNotBlank(query.getStartDate())) { +//// String startDate = query.getStartDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getEndDate())) { +//// String endDate = query.getEndDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getStore())) { +//// qw.like("s.name", query.getStore()); +//// } +//// if (StringUtils.isNotBlank(query.getBankSid())) { +//// qw.eq("s.bankSid", query.getBankSid()); +//// } +//// if (StringUtils.isNotBlank(query.getBankName())) { +//// qw.like("s.name", query.getBankName()); +//// } +//// qw.orderByAsc("o.reserveDate"); +//// qw.orderByDesc("d.sid"); +//// qw.orderByDesc("s.sid"); +//// qw.groupBy("o.reserveDate"); +//// qw.groupBy("t.goodsSid"); +//// qw.groupBy("s.name"); +////// qw.orderByDesc("o.reserveDate"); +////// qw.groupBy("s.name"); +//// //得到所有要导出的数据 +//// List exportList = baseMapper.exportExcelByStore(qw); +//// List exportList1 = new ArrayList<>(); +//// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +////// if (!exportList.isEmpty()) { +////// exportList.forEach(s -> { +////// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); +////// s.setGoodsName(lpkGoods.getName()); +////// }); +////// } +//// //定义导出的excel名字 +//// String excelName = "配货信息.xlsx"; +//// String fileNameURL = "1"; +//// response.setContentType( "application/vnd.ms-excel"); +//// response.setCharacterEncoding("utf8"); +//// response.setHeader("Content-disposition","attachment;filename="+ excelName ); +//// ServletOutputStream outputStream = null; +//// try { +//// WriteCellStyle headWriteCellStyle = new WriteCellStyle(); +//// +//// //设置头居中 +//// headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); +//// +//// //内容策略 +//// WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); +//// //设置 水平居中 +//// contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); +////// HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle,contentWriteCellStyle); +//// HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle()); +//// +//// EasyExcel//将数据映射到DownloadDTO实体类并响应到浏览器 +//// .write(new BufferedOutputStream(response.getOutputStream()), ReserveOrderExportByStore.class) +//// //是否自动关闭输入流 +//// .autoCloseStream(Boolean.TRUE) +////// .registerWriteHandler(new MergeStrategy(exportList.size(),1,1)) +//// .registerWriteHandler(horizontalCellStyleStrategy) +//// .sheet().doWrite(exportList); +//// } catch (IOException e) { +//// throw new RuntimeException(e); +//// } +//// } +//// public void exportExcelByBank(ReserveDeliveryOrderQuery query) { +//// QueryWrapper qw = new QueryWrapper<>(); +//// qw.eq("1", "1"); +//// if (StringUtils.isNotBlank(query.getStartDate())) { +//// String startDate = query.getStartDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getEndDate())) { +//// String endDate = query.getEndDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getStore())) { +//// qw.like("s.name", query.getStore()); +//// } +//// if (StringUtils.isNotBlank(query.getBankSid())) { +//// qw.eq("s.bankSid", query.getBankSid()); +//// } +//// qw.orderByDesc("o.reserveDate"); +//// qw.groupBy("d.sid"); +//// qw.groupBy("t.goodsSid"); +//// qw.groupBy("o.reserveDate"); +////// qw.groupBy("s.name"); +//// //得到所有要导出的数据 +//// List exportList = baseMapper.exportExcelByBank(qw); +//// List exportList1 = new ArrayList<>(); +////// if (!exportList.isEmpty()) { +////// exportList.forEach(s -> { +////// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); +////// s.setGoodsName(lpkGoods.getName()); +////// }); +////// } +//// //定义导出的excel名字 +//// String excelName = "支行汇总信息.xlsx"; +//// String fileNameURL = "1"; +//// response.setContentType( "application/vnd.ms-excel"); +//// response.setCharacterEncoding("utf8"); +//// response.setHeader("Content-disposition","attachment;filename="+ excelName ); +//// ServletOutputStream outputStream = null; +//// try { +//// WriteCellStyle headWriteCellStyle = new WriteCellStyle(); +//// //设置头居中 +//// headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); +//// //内容策略 +//// WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); +//// //设置 水平居中 +//// contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); +////// HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle,contentWriteCellStyle); +//// HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle()); +//// +//// EasyExcel//将数据映射到DownloadDTO实体类并响应到浏览器 +//// .write(new BufferedOutputStream(response.getOutputStream()), ReserveOrderExportByBank.class) +//// //是否自动关闭输入流 +//// .autoCloseStream(Boolean.TRUE) +////// .registerWriteHandler(new MergeStrategy(exportList.size(),1,5)) +//// .registerWriteHandler(horizontalCellStyleStrategy) +//// .sheet().doWrite(exportList); +//// } catch (IOException e) { +//// throw new RuntimeException(e); +//// } +//// } +//// public void exportExcelByZ(ReserveDeliveryOrderQuery query) { +//// QueryWrapper qw = new QueryWrapper<>(); +//// qw.eq("1", "1"); +//// if (StringUtils.isNotBlank(query.getStartDate())) { +//// String startDate = query.getStartDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getEndDate())) { +//// String endDate = query.getEndDate(); +//// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"); +//// } +//// if (StringUtils.isNotBlank(query.getStore())) { +//// qw.like("s.name", query.getStore()); +//// } +//// if (StringUtils.isNotBlank(query.getBankSid())) { +//// qw.eq("s.bankSid", query.getBankSid()); +//// } +//// qw.orderByAsc("o.reserveDate"); +//// qw.groupBy("t.goodsSid"); +//// qw.groupBy("o.reserveDate"); +////// qw.groupBy("s.name"); +//// //得到所有要导出的数据 +//// List exportList = baseMapper.exportExcelByZ(qw); +//// List exportList1 = new ArrayList<>(); +////// if (!exportList.isEmpty()) { +////// exportList.forEach(s -> { +////// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); +////// s.setGoodsName(lpkGoods.getName()); +//////// List list=baseMapper.getOrderByStore(s.getStoreSid(),s.getReserveDate()); +//////// List orderGoods = ReserveDeliveryOrderGoodsService.selInOrderSid(list); +//////// if (!orderGoods.isEmpty()) { +//////// int i=0; +//////// for (ReserveDeliveryOrderGoods orderGood : orderGoods) { +//////// String num = ""; +//////// String goodsName = ""; +//////// String finWord = ""; +//////// String unitName = ""; +//////// if (StringUtils.isNotBlank(orderGood.getGoodsSid())) { +//////// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid()); +//////// if (null != lpkGoods) { +//////// goodsName = lpkGoods.getName(); +//////// if (StringUtils.isNotBlank(lpkGoods.getUnitName())) { +//////// unitName = lpkGoods.getUnitName(); +//////// } +//////// } +//////// } +//////// if (orderGood.getGoodsNumber() != 0) { +//////// num = String.valueOf((int) orderGood.getGoodsNumber()); +//////// } +//////// finWord = goodsName+ num + unitName; +//////// i++; +//////// if(i>1){ +//////// ReserveOrderExportByBank en=new ReserveOrderExportByBank(); +//////// BeanUtil.copyProperties(s,en , "id"); +//////// en.setGoodsInfo(finWord); +//////// exportList1.add(en); +//////// }else{ +//////// s.setGoodsInfo(finWord); +//////// exportList1.add(s); +//////// } +//////// } +//////// } +////// }); +////// } +//// //定义导出的excel名字 +//// String excelName = "支行汇总信息.xlsx"; +//// String fileNameURL = "1"; +//// response.setContentType( "application/vnd.ms-excel"); +//// response.setCharacterEncoding("utf8"); +//// response.setHeader("Content-disposition","attachment;filename="+ excelName ); +//// ServletOutputStream outputStream = null; +//// try { +//// WriteCellStyle headWriteCellStyle = new WriteCellStyle(); +//// //设置头居中 +//// headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); +//// //内容策略 +//// WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); +//// //设置 水平居中 +//// contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); +////// HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle,contentWriteCellStyle); +//// HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle()); +//// +//// EasyExcel//将数据映射到DownloadDTO实体类并响应到浏览器 +//// .write(new BufferedOutputStream(response.getOutputStream()), ReserveOrderExportByZ.class) +//// //是否自动关闭输入流 +//// .autoCloseStream(Boolean.TRUE) +////// .registerWriteHandler(new MergeStrategy(exportList.size(),1,5)) +//// .registerWriteHandler(horizontalCellStyleStrategy) +//// .sheet().doWrite(exportList); +//// } catch (IOException e) { +//// throw new RuntimeException(e); +//// } +//// } +//// public ResultBean getStoreByCustomerSid(String sid) { +//// return new ResultBean().success().setData(baseMapper.getStoreByCustomerSid(sid)); +//// } +//// public ResultBean selByCardSid(String sid) { +//// return new ResultBean().success().setData(baseMapper.selByCardSid(sid)); +//// } +//// public ResultBean> selOrderByCardSid(String sid) { +//// return new ResultBean().success().setData(baseMapper.selOrderByCardSid(sid)); +//// } +// +// +// private QueryWrapper buildQuery(LpkReserveOrderQuery query) { +// QueryWrapper qw = new QueryWrapper<>(); +//// qw.eq("vo.isEnable","1"); +// +// if (StrUtil.isNotBlank(query.getStartDate())) { +// qw.ge("date_format(vo.reserveDate,'%Y-%m-%d')", query.getStartDate()); +// } +// if (StrUtil.isNotBlank(query.getEndDate())) { +// qw.le("date_format(vo.reserveDate,'%Y-%m-%d')", query.getEndDate()); +// } +// if (StrUtil.isNotBlank(query.getBankSid())) { +// qw.eq("lb.sid", query.getBankSid()); +// } +// if (StrUtil.isNotBlank(query.getStore())) { +// qw.eq("vo.storeSid", query.getStore()); +// } +// if (StrUtil.isNotBlank(query.getCardType())) { +// qw.eq("vo.affiliation", query.getCardType()); +// } +// +//// qw.orderByAsc("vo.reserveDate"); +// return qw; +// } +// +// public ResultBean> pageOfCustomer(PagerQuery pq) { +// ResultBean rb = ResultBean.fireFail(); +// LpkReserveOrderQuery query = pq.getParams(); +// QueryWrapper qw = buildQuery(query); +// +// IPage page = PagerUtil.queryToPage(pq); +// IPage pagerVo = baseMapper.pageOfCustomer(page, qw); +// return rb.success().setData(pagerVo); +// } +// +// public Map> mapForExcelCustomer(LpkReserveOrderQuery query) { +// QueryWrapper qw = buildQuery(query); +// List list = baseMapper.pageOfCustomer(qw); +// Map> map = new HashMap<>(); +// list.forEach(vo -> { +// List volist = map.get(vo.getBankName()); +// if (volist == null) { +// volist = new ArrayList<>(); +// map.put(vo.getBankName(), volist); +// } +// ReserveCustomerExcel ex = new ReserveCustomerExcel(); +// BeanUtil.copyProperties(vo, ex); +// volist.add(ex); +// }); +// return map; +// } +// +// public ResultBean> pageOfStore(PagerQuery pq) { +// ResultBean rb = ResultBean.fireFail(); +// LpkReserveOrderQuery query = pq.getParams(); +// QueryWrapper qw = buildQuery(query); +// +// IPage page = PagerUtil.queryToPage(pq); +// IPage pagerVo = baseMapper.pageOfStore(page, qw); +// return rb.success().setData(pagerVo); +// } +// +// public Map> mapForExcelStore(LpkReserveOrderQuery query) { +// QueryWrapper qw = buildQuery(query); +// List list = baseMapper.pageOfStore(qw); +// Map> map = new HashMap<>(); +// list.forEach(vo -> { +// List volist = map.get(vo.getBankName()); +// if (volist == null) { +// volist = new ArrayList<>(); +// map.put(vo.getBankName(), volist); +// } +// ReserveStoreExcel ex = new ReserveStoreExcel(); +// BeanUtil.copyProperties(vo, ex); +// volist.add(ex); +// }); +// return map; +// } +// +// public ResultBean> pageOfBank(PagerQuery pq) { +// ResultBean rb = ResultBean.fireFail(); +// LpkReserveOrderQuery query = pq.getParams(); +// QueryWrapper qw = buildQuery(query); +// +// IPage page = PagerUtil.queryToPage(pq); +// IPage pagerVo = baseMapper.pageOfBank(page, qw); +// return rb.success().setData(pagerVo); +// } +// +// public Map> mapForExcelBank(LpkReserveOrderQuery query) { +// QueryWrapper qw = buildQuery(query); +// List list = baseMapper.pageOfBank(qw); +// Map> map = new HashMap<>(); +// list.forEach(vo -> { +// List volist = map.get(vo.getBankName()); +// if (volist == null) { +// volist = new ArrayList<>(); +// map.put(vo.getBankName(), volist); +// } +// ReserveBankExcel ex = new ReserveBankExcel(); +// BeanUtil.copyProperties(vo, ex); +// volist.add(ex); +// }); +// return map; +// } +// +// public ResultBean> pageOfAll(PagerQuery pq) { +// ResultBean rb = ResultBean.fireFail(); +// LpkReserveOrderQuery query = pq.getParams(); +// QueryWrapper qw = buildQuery(query); +// +// IPage page = PagerUtil.queryToPage(pq); +// IPage pagerVo = baseMapper.pageOfAll(page, qw); +// return rb.success().setData(pagerVo); +// } +// +// public List listForExcelAll(LpkReserveOrderQuery query) { +// +// +// QueryWrapper qw = buildQuery(query); +// List list = baseMapper.pageOfAll(qw); +// List listRes = new ArrayList<>(); +// +// list.forEach(vo -> { +// ReserveAllExcel ex = new ReserveAllExcel(); +// BeanUtil.copyProperties(vo, ex); +// listRes.add(ex); +// }); +// return listRes; +// } +//} diff --git a/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsMapper.java b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsMapper.java new file mode 100644 index 0000000..776b29e --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsMapper.java @@ -0,0 +1,28 @@ +package com.yxt.yythmall.biz.reservedeliveryorderdetails; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.yythmall.api.reservedeliveryorderdetails.ReserveDeliveryOrderDetails; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Mapper +public interface ReserveDeliveryOrderDetailsMapper extends BaseMapper { + @Select("select sum(goodsNumber) as goodsNumber , goodsSid as goodsSid from lpk_reserve_order_goods where cardSid=#{cardSid} and goodsSid=#{goodsSid}") + ReserveDeliveryOrderDetails getReserveByCardSid(@Param("cardSid") String cardSid, @Param("goodsSid") String goodsSid); + + ReserveDeliveryOrderDetails selByOrderSidAndGoodSid(@Param("orderSid") String orderSid, @Param("goodsSid") String goodsSid); + + @Select("select * from lpk_reserve_order_goods where orderSid=#{orderSid}") + List selByOrderSid(String orderSid); + + List selInOrderSid(@Param("orderSids") List orderSids); + @Select("select *,goodsNumber as num from vege_cellar_reserve_details where orderSid=#{orderSid}") + List selByOrderSids(String orderSid); +} diff --git a/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsMapper.xml b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsMapper.xml new file mode 100644 index 0000000..1447e77 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsRest.java b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsRest.java new file mode 100644 index 0000000..704e2ae --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsRest.java @@ -0,0 +1,25 @@ +//package com.yxt.yythmall.biz.reservedeliveryorderdetails; +// +//import io.swagger.annotations.Api; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +///** +// * @author wangpengfei +// * @date 2023/11/23 10:35 +// */ +//@Api(tags = "预约订单信息") +//@RestController +//@RequestMapping("vegecellarreservedetails") +//public class ReserveDeliveryOrderDetailsRest { +// @Autowired +// ReserveDeliveryOrderDetailsService ReserveDeliveryOrderDetailsService; +// +// +//// @ApiOperation("预约提交") +//// @PostMapping("/submissionDetail") +//// public ResultBean submissionDetail(ReserveDeliveryOrderDetailsDto dto){ +//// return ReserveDeliveryOrderDetailsService.submissionDetail(dto); +//// } +//} diff --git a/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsService.java b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsService.java new file mode 100644 index 0000000..ec5f1d4 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/reservedeliveryorderdetails/ReserveDeliveryOrderDetailsService.java @@ -0,0 +1,91 @@ +//package com.yxt.yythmall.biz.reservedeliveryorderdetails; +// +//import cn.hutool.core.bean.BeanUtil; +//import cn.hutool.core.date.DateTime; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.yxt.common.base.service.MybatisBaseService; +//import com.yxt.common.core.result.ResultBean; +//import com.yxt.yythmall.api.customerstore.CustomerStoreDto; +//import com.yxt.yythmall.api.lpkgiftcard.GoodsVo; +//import com.yxt.yythmall.api.lpkgoods.LpkGoods; +//import com.yxt.yythmall.api.reservedeliveryorder.ReserveDeliveryOrderDto; +//import com.yxt.yythmall.api.reservedeliveryorderdetails.ReserveDeliveryOrderDetails; +//import com.yxt.yythmall.api.vegetablecellar.VegetableCellar; +//import com.yxt.yythmall.biz.customerstore.CustomerStoreService; +//import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardService; +//import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; +//import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +// +//import java.util.List; +// +///** +// * @author wangpengfei +// * @date 2023/11/23 10:36 +// */ +//@Service +//public class ReserveDeliveryOrderDetailsService extends MybatisBaseService { +// @Autowired +// LpkGiftCardService lpkGiftCardService; +// @Autowired +// VegetableCellarService vegetableCellarService; +// @Autowired +// CustomerStoreService customerStoreService; +// @Autowired +// LpkGoodsService lpkGoodsService; +// +// +// public ResultBean getReserveByCardSid(String carSid, String goodsSid) { +// ResultBean rb = new ResultBean(); +// ReserveDeliveryOrderDetails goods = baseMapper.getReserveByCardSid(carSid, goodsSid); +// return rb.success().setData(goods); +// } +// +// public ResultBean submissionDetail(ReserveDeliveryOrderDto dto) { +// ResultBean rb = new ResultBean(); +// ReserveDeliveryOrderDetails goods = new ReserveDeliveryOrderDetails(); +// BeanUtil.copyProperties(dto, goods, "id", "sid"); +//// goods.setCardSid(dto.getSid()); +// for (GoodsVo goods1 : dto.getGoodsVos()) { +// if (goods1.getSelect() != 0) { +//// goods.setCardSid(dto.getSid()); +// LpkGoods goods2=lpkGoodsService.getOne(new QueryWrapper().eq("sid",goods1.getGoodsSid())); +//// goods.setGoodsSid(goods1.getGoodsSid()); +// goods.setGoodsNumber(goods1.getSelect()); +// goods.setGoodsName(goods2.getName()); +// goods.setCreateTime(new DateTime()); +// goods.setOrderSid(dto.getOrderSid()); +// baseMapper.insert(goods); +// VegetableCellar vegetableCellar= vegetableCellarService.list(new QueryWrapper().eq("customerSid",dto.getCustomerSid()) +// .eq("goodsSid",goods1.getGoodsSid()).eq("affiliation",goods2.getBrandId())).get(0); +// double d=Double.valueOf(vegetableCellar.getGoodsNumber()); +// double c=Double.valueOf(goods1.getSelect()); +// if(c>d){ +// return rb.setMsg("预约数量大于库存数量"); +// } +// if(Double.compare(d,c)==0){ +// vegetableCellarService.deleteBySid(vegetableCellar.getSid()); +// }else{ +// vegetableCellar.setGoodsNumber(String.valueOf((int)(Double.valueOf(vegetableCellar.getGoodsNumber())-Double.valueOf(goods1.getSelect())))); +// vegetableCellarService.updateById(vegetableCellar); +// } +// +// } +// } +// CustomerStoreDto dto1=new CustomerStoreDto(); +// dto1.setPhone(dto.getUserPhone()); +// dto1.setStoreSid(dto.getStoreSid()); +// dto1.setName(dto.getUserName()); +// dto1.setCustomerSid(dto.getCustomerSid()); +// customerStoreService.saveStore(dto1); +// return rb.success().setData("预约成功"); +// } +// +// +// +// +// public List selByOrderSids(String orderSid) { +// return baseMapper.selByOrderSids(orderSid); +// } +//} diff --git a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java index 9edc9ef..da6ca81 100644 --- a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java +++ b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java @@ -8,10 +8,13 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.yythmall.api.appletgiftbaggoods.AppletGiftBagGoods; import com.yxt.yythmall.api.lpkcustomer.LpkCustomer; import com.yxt.yythmall.api.lpkgoods.LpkGoods; +import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecord; import com.yxt.yythmall.api.ordorder.OrdOrder; import com.yxt.yythmall.api.ordorderdetails.OrdOrderDetail; +import com.yxt.yythmall.api.recommendnewuserbagdetails.RecommendNewUserBagDetails; import com.yxt.yythmall.api.shoppingcart.ShoppingCart; import com.yxt.yythmall.api.transferrecords.TransferRecords; import com.yxt.yythmall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDetails; @@ -19,8 +22,11 @@ import com.yxt.yythmall.api.vegetablecellar.*; import com.yxt.yythmall.biz.empcard.EmpCardService; import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService; import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; +import com.yxt.yythmall.biz.newcomerrecorecord.NewcomerRecoRecordService; import com.yxt.yythmall.biz.ordorder.OrdOrderService; import com.yxt.yythmall.biz.ordorderdetails.OrdOrderDetailService; +import com.yxt.yythmall.biz.recommendnewuserbag.RecommendNewUserBagService; +import com.yxt.yythmall.biz.recommendnewuserbagdetails.RecommendNewUserBagDetailsService; import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService; import com.yxt.yythmall.biz.transferrecords.TransferRecordsService; import com.yxt.yythmall.biz.transferrecordsgoodsdetails.TransferRecordsGoodsDetailsService; @@ -28,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -52,6 +59,12 @@ public class VegetableCellarService extends MybatisBaseService().eq("recommendedSid",ordOrder.getUserSid()).eq("state","1")); LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper().eq("sid",ordOrder.getUserSid())); +// if(n!=null){ +// aa(n.getGiftBagSid(),n.getRecommendSid()); +// customer.setIsNewUser("0"); +// n.setState("2"); +// newcomerRecoRecordService.updateById(n); +// } customer.setIsPurchase("0"); lpkCustomerService.updateById(customer); ordOrder.setPayStatus(4); @@ -84,6 +104,22 @@ public class VegetableCellarService extends MybatisBaseServicelist=recommendNewUserBagDetailsService.list(new QueryWrapper().eq("giftbagSid",giftBagSid)); + VegetableCellarDto dto1=new VegetableCellarDto(); + dto1.setCustomerSid(customerSid); + List vos=new ArrayList<>(); + for (RecommendNewUserBagDetails appletGiftBagGoods : list) { + LpkGoods a=lpkGoodsService.getOne(new QueryWrapper().eq("sid",appletGiftBagGoods.getGoodsSid())); + vegeVo vo=new vegeVo(); + vo.setGoodsSid(appletGiftBagGoods.getGoodsSid()); + vo.setGoodsNumber(appletGiftBagGoods.getGoodsNumber()); + vo.setBrandId(String.valueOf(a.getBrandId())); + vos.add(vo); + } + dto1.setVos(vos); + vegetableCellarService.save1Goods(dto1); + } @Transactional(rollbackFor = Exception.class) public ResultBean saveGoods(VegetableCellarDto dto) { ResultBean rb = ResultBean.fireFail(); 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 9441882..f49b4ab 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 @@ -82,6 +82,8 @@ public class PmsBrand extends BaseEntity implements Serializable { @TableField("dgxy") private String dgxy; + @TableField("qdxy") + private String qdxy; public Long getId() { return id; @@ -186,7 +188,13 @@ public class PmsBrand extends BaseEntity implements Serializable { public void setDgxy(String dgxy) { this.dgxy = dgxy; } + public String getQdxy() { + return qdxy; + } + public void setQdxy(String qdxy) { + this.qdxy = qdxy; + } @Override public String toString() { return "PmsBrand{" + 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 a47fab7..0193b9a 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 @@ -19,5 +19,7 @@ public class BrandVo { private String qssl; @ApiModelProperty("订购协议") private String dgxy; + @ApiModelProperty("起订协议") + private String qdxy; private String count; } 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 b302dd7..34e3787 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 @@