From f56e5a4877d522fa9ace4926dcd5a35da24aa01c Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 11 Jan 2024 12:02:33 +0800 Subject: [PATCH] 1/11 --- .../api/appletgiftbag/AppletGiftBagVo.java | 4 + .../api/appletgiftbag/recommendRecord.java | 12 ++ .../yxt/yyth/api/lpkgiftbag/LpkGiftBagVo.java | 4 + .../yxt/yyth/api/lpkgiftcard/AppletVo.java | 9 +- .../lpkreserveorder/LpkReserveOrderVo.java | 1 + .../ReserveOrderExportByBank.java | 13 +- .../ReserveOrderExportByStore.java | 14 +- .../ReserveOrderExportByZ.java | 9 +- .../biz/appletgiftbag/AppletGiftBagRest.java | 6 +- .../appletgiftbag/AppletGiftBagService.java | 23 ++- .../biz/lpkgiftcard/LpkGiftCardService.java | 4 +- .../lpkreserveorder/LpkReserveOrderMapper.xml | 120 +++++++++++++-- .../LpkReserveOrderService.java | 145 +++++++++--------- 13 files changed, 259 insertions(+), 105 deletions(-) create mode 100644 src/main/java/com/yxt/yyth/api/appletgiftbag/recommendRecord.java diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java index c192798..ff12c95 100644 --- a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java @@ -28,9 +28,13 @@ public class AppletGiftBagVo implements Vo { private String remarks; private String count;// private List giftBagGoods; + private List recordList; public String getPrice() { DecimalFormat decimalFormat = new DecimalFormat("#0.00"); + if(null==price){ + price="0"; + } return price=decimalFormat.format(Double.valueOf(price)); } } diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/recommendRecord.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/recommendRecord.java new file mode 100644 index 0000000..2d020fe --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/recommendRecord.java @@ -0,0 +1,12 @@ +package com.yxt.yyth.api.appletgiftbag; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/1/11 9:29 + */ +@Data +public class recommendRecord { + private String content; +} diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftbag/LpkGiftBagVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftbag/LpkGiftBagVo.java index ed2c62c..a88ab04 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftbag/LpkGiftBagVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftbag/LpkGiftBagVo.java @@ -1,10 +1,13 @@ package com.yxt.yyth.api.lpkgiftbag; import com.yxt.common.core.vo.Vo; +import com.yxt.yyth.api.appletgiftbag.recommendRecord; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @author wangpengfei * @date 2023/11/21 15:12 @@ -22,4 +25,5 @@ public class LpkGiftBagVo implements Vo { private String iconUrl; private String isEnable; private String isGrounding; + private String remarks; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java index b7fe6eb..490d72a 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -67,15 +67,16 @@ public class AppletVo { ZoneId zoneId = ZoneId.systemDefault(); Date date = Date.from(dateAndTime.atZone(zoneId).toInstant()); + Date nowDate=new Date(); +// Date nowDate=DateUtil.parse("2024-01-03 11:43:52"); // System.out.println(date); //1>2 1 、1<2 -1 、1=2 0 - int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date))))); + int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(nowDate)))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date))))); if(String.valueOf(k).equals("1")){ - start=sdf.format(DateUtil.offsetDay(new Date(),+2)); + start=sdf.format(DateUtil.offsetDay(nowDate,+2)); }else{ - start=sdf.format(DateUtil.offsetDay(new Date(),+1)); + start=sdf.format(DateUtil.offsetDay(nowDate,+1)); } - if(StringUtils.isNotBlank(dateEnd)){ int i=DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd)))); if(String.valueOf(i).equals("-1")){ diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java index 47beec5..b15419f 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java @@ -35,4 +35,5 @@ public class LpkReserveOrderVo implements Vo { private String linker; private String linkPhone; private String address; + private String cardType; } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByBank.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByBank.java index 1e32414..2343a3b 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByBank.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByBank.java @@ -22,19 +22,22 @@ public class ReserveOrderExportByBank { @ExcelProperty(value = "支行",index = 1) private String bankName; @ColumnWidth(20) - @ExcelProperty(value = "商品名称",index = 2) + @ExcelProperty(value = "卡类型",index = 2) + private String cardType; + @ColumnWidth(20) + @ExcelProperty(value = "商品名称",index = 3) private String goodsName; @ColumnWidth(20) - @ExcelProperty(value = "商品数量(份)",index = 3) + @ExcelProperty(value = "商品数量(份)",index = 4) private String goodsNumber; @ColumnWidth(20) - @ExcelProperty(value = "联系人",index = 4) + @ExcelProperty(value = "联系人",index = 5) private String linker; @ColumnWidth(20) - @ExcelProperty(value = "联系电话",index = 5) + @ExcelProperty(value = "联系电话",index = 6) private String linkPhone; @ColumnWidth(50) - @ExcelProperty(value = "地址",index = 6) + @ExcelProperty(value = "地址",index = 7) private String address; @ExcelIgnore diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByStore.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByStore.java index fe9f307..4a2b181 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByStore.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByStore.java @@ -28,21 +28,23 @@ public class ReserveOrderExportByStore { @ColumnWidth(20) @ExcelProperty(value = "提货门店",index = 2) private String store; - @ColumnWidth(20) - @ExcelProperty(value = "商品名称",index = 3) + @ExcelProperty(value = "卡类型",index = 3) + private String cardType; + @ColumnWidth(20) + @ExcelProperty(value = "商品名称",index = 4) private String goodsName; @ColumnWidth(20) - @ExcelProperty(value = "商品数量(份)",index = 4) + @ExcelProperty(value = "商品数量(份)",index = 5) private String goodsNumber; @ColumnWidth(20) - @ExcelProperty(value = "联系人",index = 5) + @ExcelProperty(value = "联系人",index = 6) private String linker; @ColumnWidth(20) - @ExcelProperty(value = "联系电话",index = 6) + @ExcelProperty(value = "联系电话",index = 7) private String linkPhone; @ColumnWidth(50) - @ExcelProperty(value = "地址",index = 7) + @ExcelProperty(value = "地址",index = 8) private String address; @ExcelIgnore diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByZ.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByZ.java index a772660..2b71ca2 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByZ.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByZ.java @@ -18,13 +18,16 @@ public class ReserveOrderExportByZ { @ColumnWidth(20) @ExcelProperty(value = "预约时间",index = 0) private String reserveDate; - @ColumnWidth(20) - @ExcelProperty(value = "商品名称",index = 1) + @ExcelProperty(value = "卡类型",index = 1) + private String cardType; + @ColumnWidth(20) + @ExcelProperty(value = "商品名称",index = 2) private String goodsName; @ColumnWidth(20) - @ExcelProperty(value = "商品数量(份)",index = 2) + @ExcelProperty(value = "商品数量(份)",index = 3) private String goodsNumber; + @ExcelIgnore private String storeSid; @ExcelIgnore diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java index fdd67c0..325c895 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java @@ -70,5 +70,9 @@ public class AppletGiftBagRest { public ResultBean getGiftBagBySid(@PathVariable String sid) { return AppletGiftBagService.getGiftBagBySid(sid); } - + @ApiOperation("共享家庭卡蔬菜详情") + @GetMapping("/recommendRecord/{sid}") + public ResultBean recommendRecord(@PathVariable("sid") String sid) { + return AppletGiftBagService.recommendRecord(sid); + } } diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java index 0f03d6d..9e72949 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -15,6 +14,8 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.yyth.api.appletgiftbag.*; import com.yxt.yyth.api.appletgiftbaggoods.AppletGiftBagGoods; import com.yxt.yyth.api.appletgiftbag.GiftBagGoods; +import com.yxt.yyth.api.lpkgiftbag.LpkGiftBagVo; +import com.yxt.yyth.api.appletgiftbag.recommendRecord; import com.yxt.yyth.api.lpkgoods.LpkGoods; import com.yxt.yyth.biz.appletgiftbaggoods.AppletGiftBagGoodsService; import com.yxt.yyth.biz.lpkgoods.LpkGoodsService; @@ -245,5 +246,23 @@ public class AppletGiftBagService extends MybatisBaseService().eq("sid",sid)); + vo.setRemarks(bag.getRemarks()); + vo.setIconUrl(fileUploadComponent.getUrlPrefix() +bag.getIconUrl()); + recommendRecord recommendRecord=new recommendRecord(); + recommendRecord.setContent("梧桐居助力您获得7斤白菜"); + recommendRecord recommendRecord1=new recommendRecord(); + recommendRecord1.setContent("龙助力您获得7斤白菜"); + recommendRecord recommendRecord2=new recommendRecord(); + recommendRecord2.setContent("美人助力您获得15斤土豆"); + List list=new ArrayList<>(); + list.add(recommendRecord); + list.add(recommendRecord1); + list.add(recommendRecord2); + vo.setRecordList(list); + return rb.success().setData(vo); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java index 38168f3..5b7af9a 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -37,9 +37,7 @@ import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord; import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordDto; import com.yxt.yyth.api.lpkcardqrcode.LpkCardQrcode; import com.yxt.yyth.api.lpkcardqrcode.LpkCardQrcodeDto; -import com.yxt.yyth.api.lpkgiftbag.GiftBagGoods; -import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag; -import com.yxt.yyth.api.lpkgiftbag.LpkGiftBagDto; +import com.yxt.yyth.api.lpkgiftbag.*; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGifGoodsVo; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoods; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo; diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml index c767749..e17a1c9 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml @@ -30,7 +30,10 @@ c.`code`, d.sid as dsid, s.sid as ssid, - c.serialNumber + c.serialNumber, + case o.cardType + when 1 then '家庭卡' + end cardType FROM lpk_reserve_order AS o LEFT JOIN lpk_store AS s ON o.storeSid = s.sid @@ -64,7 +67,10 @@ c.`code`, d.sid as dsid, s.sid as ssid, - c.serialNumber + c.serialNumber, + case o.cardType + when 2 then '亲情卡' + end cardType FROM lpk_reserve_order AS o LEFT JOIN lpk_store AS s ON o.storeSid = s.sid @@ -86,6 +92,29 @@ and date_format(o.reserveDate,'%Y-%m-%d') <= date_format(#{qw.endDate},'%Y-%m-%d') + union + SELECT + o.sid, + date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate, + o.userName, + o.userPhone, + s.`name` AS store, + b.`name` AS bagName, + d.NAME AS bankName, + c.`code`, + d.sid as dsid, + s.sid as ssid, + c.serialNumber, + case o.cardType + when 3 then '企业卡' + end cardType + FROM + lpk_reserve_order AS o + LEFT JOIN lpk_store AS s ON o.storeSid = s.sid + LEFT JOIN emp_card AS c ON o.cardSid = c.sid + LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid + LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid + WHERE o.cardType='3' order by reserveDate asc,dsid desc,ssid desc,serialNumber asc