预约记录

This commit is contained in:
2024-01-31 18:11:42 +08:00
parent d6bb3836d8
commit c9bb257c29
3 changed files with 16 additions and 11 deletions

View File

@@ -21,6 +21,8 @@ public class VegeCellarReserveOrderVo implements Vo {
private String store; //门店
private String storeSid; //门店
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")
private Date reserveDate; //预约时间
private String bagName; //礼包
@@ -41,4 +43,5 @@ public class VegeCellarReserveOrderVo implements Vo {
private String stateValue;
private String affiliationValue;
private String reserveCode;
private boolean showLsit=false;
}

View File

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

View File

@@ -290,16 +290,16 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
List<VegeCellarReserveDetails> goods = vegeCellarReserveDetailsService.selByOrderSids(vo.getSid());
for (VegeCellarReserveDetails goods1 : goods) {
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().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());
}
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);
}