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

12/4

Browse Source
This commit is contained in:
wangpengfei
2023-12-04 22:35:59 +08:00
parent 5f84c955d4
commit d010a304d5
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java
View File

@@ -32,6 +32,7 @@ public class LpkReserveOrderCardVo implements Vo {
private String state;//提货状态 private String state;//提货状态
private List<GoodsVo> goodsVos; private List<GoodsVo> goodsVos;
private String goods; private String goods;
private String serialNumber;
public String getState() { public String getState() {
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");

2
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java
View File

@@ -31,7 +31,7 @@ public interface LpkGiftCardMapper extends BaseMapper<LpkGiftCard> {
" end stateValue,\n" + " end stateValue,\n" +
" bag.dateStart as dateStart\n" + " bag.dateStart as dateStart\n" +
" ,bag.dateEnd as dateEnd\n" + " ,bag.dateEnd as dateEnd\n" +
" ,bag.name as pname,card.state as states\n" + " ,bag.name as pname,card.state as states,card.serialNumber as serialNumber\n" +
" FROM\n" + " FROM\n" +
" lpk_giftcard card\n" + " lpk_giftcard card\n" +
" LEFT JOIN lpk_giftbag bag on card.giftbagSid=bag.sid" + " LEFT JOIN lpk_giftbag bag on card.giftbagSid=bag.sid" +

2
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
View File

@@ -55,7 +55,7 @@
o.cardSid as cardSid, o.cardSid as cardSid,
o.sid as orderSid, o.sid as orderSid,
o.userName, o.userName,
o.userPhone, o.userPhone,c.serialNumber as serialNumber,
o.sid o.sid
FROM lpk_reserve_order AS o FROM lpk_reserve_order AS o
LEFT JOIN lpk_store AS s ON o.storeSid = s.sid LEFT JOIN lpk_store AS s ON o.storeSid = s.sid