From d574d625b118bec3f32e9041d4f24dbdb9a2d410 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 22 Jan 2024 15:58:47 +0800 Subject: [PATCH] 1/22 --- .../api/appletgiftbag/AppletGiftBagVo.java | 2 + .../api/appletgiftbag/GiftBagGoodss.java | 4 +- .../lpkreserveorder/LpkReserveOrderQuery.java | 1 + .../yythmall/api/ordorder/OrdOrderDto.java | 1 + .../appletgiftbag/AppletGiftBagMapper.java | 3 +- .../biz/appletgiftbag/AppletGiftBagMapper.xml | 36 +- .../appletgiftbag/AppletGiftBagService.java | 22 +- .../LpkReserveOrderMapper.java | 8 +- .../lpkreserveorder/LpkReserveOrderMapper.xml | 462 ++++++++++++++---- .../LpkReserveOrderService.java | 36 +- .../yythmall/biz/ordorder/OrdOrderRest.java | 7 +- .../biz/ordorder/OrdOrderService.java | 101 ++++ .../yxt/yythmall/config/SaTokenConfigure.java | 1 + 13 files changed, 556 insertions(+), 128 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java b/src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java index d015f1a..bbcf674 100644 --- a/src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java +++ b/src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java @@ -21,6 +21,7 @@ public class AppletGiftBagVo implements Vo { private String dateStart; private String dateEnd; private String price;//礼包总价格 + private String prefPrice;//优惠价格 private String iconUrl;//图片 private String isEnable; private String isGrounding; @@ -28,6 +29,7 @@ public class AppletGiftBagVo implements Vo { private String remarks; private String count;// private String goodsSid; + private String weight="0";//重量 private List giftBagGoods; private List recordList; diff --git a/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java b/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java index 85b9f8b..42a1e92 100644 --- a/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java +++ b/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java @@ -20,12 +20,14 @@ public class GiftBagGoodss { private String weight; //每份的重量 private String jPrice; //每斤单价 private String specificationUnit; //规格单位 + private String prefPrice;//优惠价格 + private String bagPrice;//礼包价格 private String totalValue; //总价值 private String spec; //总价值 private String count="0"; //总价值 private String mefenPrice="0"; private boolean showCart=false; - private String prefPrice;//优惠价格 + diff --git a/src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrderQuery.java b/src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrderQuery.java index 51a4f1f..8353e95 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrderQuery.java +++ b/src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrderQuery.java @@ -18,4 +18,5 @@ public class LpkReserveOrderQuery implements Query { private String bankSid; private String bankName; private String serialNumber; + private String cardType; //1 家庭 2 亲情卡 3 企业 } diff --git a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java index fda92c8..7674dc4 100644 --- a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java +++ b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java @@ -33,6 +33,7 @@ public class OrdOrderDto implements Dto { private String returnUrl; private String customerSid; private String brandId; + private String bagSid; // private String receivablePrice; private List ordOrderDetailsVoList; diff --git a/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.java b/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.java index 2610c76..0c2022a 100644 --- a/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.java @@ -23,6 +23,7 @@ public interface AppletGiftBagMapper extends BaseMapper { IPage giftBagListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List giftBagList(); - List giftBagGoodsList(@Param("sid")String sid ); + List giftBagGoodsList(); + List getGoodsByBagSid(@Param("bagSid") String bagSid); int saveBags(@Param("bags") List bags); } diff --git a/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.xml b/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.xml index 3133f22..f7b27d3 100644 --- a/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.xml @@ -35,22 +35,28 @@ where isGrounding=1 order by isRecommend desc,createTime desc - select - s.goodsNumber as goodsNumber, - d.`name` , - d.unitName, - d.price as jPrice, - d.price as price, - d.picUrl as iconUrl, - d.specificationUnit, - d.isAppletGrounding, - d.content as remark, - d.weight, - d.sid as goodsSid + a.sid, + a.name , + a.iconUrl, + a.price , + a.preferentialPrice as prefPrice from applet_giftbag a - left join applet_giftbag_goods s on s.giftbagSid=a.sid - left join lpk_goods d on d.sid=s.goodsSid - where a.sid=#{sid} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagService.java b/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagService.java index 56ef1c3..02fbf23 100644 --- a/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagService.java +++ b/src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagService.java @@ -268,18 +268,22 @@ public class AppletGiftBagService extends MybatisBaseService giftBagGoodss=baseMapper.getAllGoodsApplets(query); - - List s=baseMapper.giftBagGoodsList("e49555f2-5370-45b0-9637-aa4d54c22e31"); - for (GiftBagGoodss giftBagGoodss : s) { - giftBagGoodss.setIconUrl(fileUploadComponent.getUrlPrefix() +giftBagGoodss.getIconUrl()); - giftBagGoodss.setMefenPrice(String.valueOf((int)(Double.valueOf(giftBagGoodss.getPrice())*Double.valueOf(giftBagGoodss.getWeight())))); - giftBagGoodss.setPrefPrice(String.valueOf((Integer.valueOf(giftBagGoodss.getMefenPrice())*0.5))); - giftBagGoodss.setPrefPrice(removeZeros(giftBagGoodss.getPrefPrice())); + List s=baseMapper.giftBagGoodsList(); + for (AppletGiftBagVo appletGiftBagVo : s) { + List giftBagGoods=appletGiftBagGoodsService.list(new QueryWrapper().eq("giftbagSid",appletGiftBagVo.getSid())); + for(AppletGiftBagGoods goods:giftBagGoods){ + LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper().eq("sid",goods.getGoodsSid())); + appletGiftBagVo.setWeight(removeZeros(String.valueOf(Double.valueOf(lpkGoods.getWeight())*Double.valueOf(goods.getGoodsNumber())+Double.valueOf(appletGiftBagVo.getWeight())))); + } + appletGiftBagVo.setIconUrl(fileUploadComponent.getUrlPrefix() +appletGiftBagVo.getIconUrl()); } return rb.success().setData(s); } - + public ResultBean> getGoodsByBagSid(String bagSid) { + ResultBean rb=new ResultBean().fail(); + List s=baseMapper.getGoodsByBagSid(bagSid); + return rb.success().setData(s); + } /** * 去除多余.0 * @param num diff --git a/src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.java b/src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.java index 743210a..5240f3d 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.java @@ -18,15 +18,21 @@ import java.util.List; @Mapper public interface LpkReserveOrderMapper extends BaseMapper { IPage orderList(IPage page,@Param("qw") LpkReserveOrderQuery qw); + IPage orderList1(IPage page,@Param("qw") LpkReserveOrderQuery qw); + IPage orderList2(IPage page,@Param("qw") LpkReserveOrderQuery qw); + IPage orderList3(IPage page,@Param("qw") LpkReserveOrderQuery 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(Constants.WRAPPER) QueryWrapper qw); IPage orderListByUserSid(IPage page, @Param("userSid")String userSid); List exportExcel(@Param("qw") LpkReserveOrderQuery qw); + List exportExcel1(@Param("qw") LpkReserveOrderQuery qw); + List exportExcel2(@Param("qw") LpkReserveOrderQuery qw); + List exportExcel3(@Param("qw") LpkReserveOrderQuery qw); List exportExcelByStore(@Param(Constants.WRAPPER) QueryWrapper qw); List exportExcelByBank(@Param(Constants.WRAPPER) QueryWrapper qw); List exportExcelByZ(@Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.xml b/src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.xml index 6f5a887..fbfa2a3 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.xml @@ -32,7 +32,7 @@ s.sid as ssid, c.serialNumber, case o.cardType - when 1 then '家庭卡' + when 1 then '家庭菜窖' end cardType FROM lpk_reserve_order AS o @@ -42,9 +42,6 @@ LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid o.cardType='1' - - and s.bankSid=#{qw.bankSid} - and s.name=#{qw.store} @@ -69,7 +66,7 @@ s.sid as ssid, c.serialNumber, case o.cardType - when 2 then '亲情卡' + when 2 then '亲情菜窖' end cardType FROM lpk_reserve_order AS o @@ -106,7 +103,7 @@ s.sid as ssid, c.serialNumber, case o.cardType - when 3 then '企业卡' + when 3 then '企业菜窖' end cardType FROM lpk_reserve_order AS o @@ -114,7 +111,129 @@ 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' + + o.cardType='3' + + and s.bankSid=#{qw.bankSid} + + + and s.name=#{qw.store} + + + and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d') + + + and date_format(o.reserveDate,'%Y-%m-%d') <= date_format(#{qw.endDate},'%Y-%m-%d') + + + order by reserveDate asc,dsid desc,ssid desc,serialNumber asc + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +