product_platform/yxt-yythmall-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

预约记录

Browse Source
This commit is contained in:
wangpengfei
2024-01-31 18:11:42 +08:00
parent d6bb3836d8
commit c9bb257c29
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
View File

@@ -21,6 +21,8 @@ public class VegeCellarReserveOrderVo implements Vo {
private String store; //门店 private String store; //门店
private String storeSid; //门店 private String storeSid; //门店
private String storeName; //门店 private String storeName; //门店
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd ",timezone="GMT+8") @JsonFormat(pattern = "yyyy-MM-dd ",timezone="GMT+8")
private Date reserveDate; //预约时间 private Date reserveDate; //预约时间
private String bagName; //礼包 private String bagName; //礼包
@@ -41,4 +43,5 @@ public class VegeCellarReserveOrderVo implements Vo {
private String stateValue; private String stateValue;
private String affiliationValue; private String affiliationValue;
private String reserveCode; private String reserveCode;
private boolean showLsit=false;
} }

4
src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
View File

@@ -239,6 +239,7 @@
<!-- </select>--> <!-- </select>-->
<select id="orderListByUserSid" resultType="com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo"> <select id="orderListByUserSid" resultType="com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo">
SELECT SELECT
o.createTime as createTime,
o.reserveCode, o.reserveCode,
o.sid as sid, o.sid as sid,
o.storeName, o.storeName,
@@ -255,7 +256,8 @@
when 1001045 then '企业菜窖' when 1001045 then '企业菜窖'
end affiliationValue, end affiliationValue,
s.name as storeName, s.name as storeName,
s.address as address s.address as address,
s.phone as linkPhone
FROM FROM
vege_cellar_reserve_order AS o vege_cellar_reserve_order AS o
left join lpk_store s on s.sid=o.storeSid left join lpk_store s on s.sid=o.storeSid

20
src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
View File

@@ -290,16 +290,16 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
List<VegeCellarReserveDetails> goods = vegeCellarReserveDetailsService.selByOrderSids(vo.getSid()); List<VegeCellarReserveDetails> goods = vegeCellarReserveDetailsService.selByOrderSids(vo.getSid());
for (VegeCellarReserveDetails goods1 : goods) { for (VegeCellarReserveDetails goods1 : goods) {
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid())); LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid()));
// OrderGoodsVo orderGoodsVo=new OrderGoodsVo(); OrderGoodsVo orderGoodsVo=new OrderGoodsVo();
// orderGoodsVo.setGoodName(lpkGoods.getName()); orderGoodsVo.setGoodName(lpkGoods.getName());
// orderGoodsVo.setNum(Integer.parseInt(goods1.getNum())); orderGoodsVo.setNum(Integer.parseInt(goods1.getNum()));
// orderGoodsVo.setUnitName(lpkGoods.getUnitName()); orderGoodsVo.setUnitName(lpkGoods.getUnitName());
// goodsVo.add(orderGoodsVo); goodsVo.add(orderGoodsVo);
if (StringUtils.isBlank(vo.getGoodss())) { // if (StringUtils.isBlank(vo.getGoodss())) {
vo.setGoodss(lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName()); // vo.setGoodss(lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
} else { // } else {
vo.setGoodss(vo.getGoodss() + " " + lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName()); // vo.setGoodss(vo.getGoodss() + " " + lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
} // }
} }
vo.setGoodsVo(goodsVo); vo.setGoodsVo(goodsVo);
} }