From 58f3816cc51b6a54d686c2c4cab947e90e4fb073 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 15 Jan 2024 12:31:36 +0800 Subject: [PATCH] 1/15 --- .../lpkreserveorder/ReserveOrderExport.java | 15 ++-- .../biz/empcardgift/EmpCardGiftService.java | 2 + .../yyth/biz/lpkgiftcard/LpkGiftCardRest.java | 6 ++ .../lpkreserveorder/LpkReserveOrderMapper.xml | 78 +++++++++---------- .../LpkReserveOrderService.java | 12 +-- .../yyth/biz/ordorder/OrdOrderService.java | 2 +- 6 files changed, 60 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExport.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExport.java index 9699d76..589555f 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExport.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExport.java @@ -29,26 +29,29 @@ public class ReserveOrderExport { @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 bagName; @ColumnWidth(20) - @ExcelProperty(value = "提货卡序列号",index = 4) + @ExcelProperty(value = "提货卡序列号",index = 5) private String serialNumber; @ColumnWidth(20) - @ExcelProperty(value = "姓名",index = 5) + @ExcelProperty(value = "姓名",index = 6) private String userName; @ColumnWidth(20) - @ExcelProperty(value = "联系方式",index = 6) + @ExcelProperty(value = "联系方式",index = 7) private String userPhone; @ColumnWidth(20) - @ExcelProperty(value = "商品名称",index = 7) + @ExcelProperty(value = "商品名称",index = 8) private String goodsName; @ColumnWidth(20) - @ExcelProperty(value = "商品数量(份)",index = 8) + @ExcelProperty(value = "商品数量(份)",index = 9) private String goodsNumber; @ExcelIgnore private String sid; diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java index 294a4a5..5bb8aff 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java @@ -1163,6 +1163,8 @@ public class EmpCardGiftService extends MybatisBaseService().eq("mainSid",mainSid)); return rb.success(); } /// diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java index 4728a14..4fe1624 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java @@ -181,4 +181,10 @@ public class LpkGiftCardRest { public ResultBean cardShareGoodsDetail(@PathVariable("sid") String sid) { return lpkGiftCardService.cardShareGoodsDetail(sid); } +// @ApiOperation("共享家庭卡详情") +// @GetMapping("/cardShareDetail/{sid}") +// public ResultBean cardShareDetail(@PathVariable("sid") String sid) { +// return lpkGiftCardService.cardShareDetail(sid); +// } + } 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 3f63b63..83a3423 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml @@ -431,7 +431,9 @@ case o.cardType when 1 then '家庭菜窖' end cardType, - t.goodsSid as goodsSid + t.goodsSid as goodsSid, + t.goodsNumber as goodsNumber, + e.name as goodsName FROM lpk_reserve_order AS o LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid @@ -439,14 +441,11 @@ LEFT JOIN lpk_giftcard 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 + left join lpk_goods e on e.sid= t.goodsSid 1=1 - - and o.cardType='1' - - - and o.cardType=#{qw.cardType} - + and o.cardType='1' + and s.name=#{qw.store} @@ -473,7 +472,9 @@ case o.cardType when 2 then '亲情菜窖' end cardType, - t.goodsSid as goodsSid + t.goodsSid as goodsSid, + t.goodsNumber as goodsNumber, + e.name as goodsName FROM lpk_reserve_order AS o LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid @@ -481,14 +482,11 @@ LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid + left join lpk_goods e on e.sid= t.goodsSid 1=1 - - and o.cardType='2' - - - and o.cardType=#{qw.cardType} - + and o.cardType='2' + and s.bankSid=#{qw.bankSid} @@ -518,7 +516,9 @@ case o.cardType when 3 then '企业菜窖' end cardType, - t.goodsSid as goodsSid + t.goodsSid as goodsSid, + t.goodsNumber as goodsNumber, + e.name as goodsName FROM lpk_reserve_order AS o LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid @@ -526,14 +526,11 @@ 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 + left join lpk_goods e on e.sid= t.goodsSid 1=1 - - and o.cardType='3' - - - and o.cardType=#{qw.cardType} - + and o.cardType='3' + and s.bankSid=#{qw.bankSid} @@ -566,7 +563,9 @@ case o.cardType when 1 then '家庭菜窖' end cardType, - t.goodsSid as goodsSid + t.goodsSid as goodsSid, + t.goodsNumber as goodsNumber, + e.name as goodsName FROM lpk_reserve_order AS o LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid @@ -574,14 +573,11 @@ LEFT JOIN lpk_giftcard 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 + left join lpk_goods e on e.sid= t.goodsSid 1=1 - - and o.cardType='1' - - - and o.cardType=#{qw.cardType} - + and o.cardType='1' + and s.name=#{qw.store} @@ -611,7 +607,9 @@ case o.cardType when 2 then '亲情菜窖' end cardType, - t.goodsSid as goodsSid + t.goodsSid as goodsSid, + t.goodsNumber as goodsNumber, + e.name as goodsName FROM lpk_reserve_order AS o LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid @@ -619,14 +617,11 @@ LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid + left join lpk_goods e on e.sid= t.goodsSid 1=1 - - and o.cardType='2' - - - and o.cardType=#{qw.cardType} - + and o.cardType='2' + and s.bankSid=#{qw.bankSid} @@ -658,7 +653,9 @@ case o.cardType when 3 then '企业菜窖' end cardType, - t.goodsSid as goodsSid + t.goodsSid as goodsSid, + t.goodsNumber as goodsNumber, + e.name as goodsName FROM lpk_reserve_order AS o LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid @@ -666,14 +663,11 @@ 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 + left join lpk_goods e on e.sid= t.goodsSid 1=1 - - and o.cardType='3' - - - and o.cardType=#{qw.cardType} - + and o.cardType='3' + and s.bankSid=#{qw.bankSid} diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java index efd05e6..227e006 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java @@ -386,10 +386,10 @@ public class LpkReserveOrderService extends MybatisBaseService exportList1 = new ArrayList<>(); - if (!exportList.isEmpty()) { - exportList.forEach(s -> { - LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); - s.setGoodsName(lpkGoods.getName()); +// 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(); @@ -428,8 +428,8 @@ public class LpkReserveOrderService extends MybatisBaseService