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

1/15

Browse Source
This commit is contained in:
wangpengfei
2024-01-15 12:31:36 +08:00
parent 38b9bee4e0
commit 58f3816cc5
6 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExport.java
View File

@@ -29,26 +29,29 @@ public class ReserveOrderExport {
@ExcelProperty(value = "提货门店",index = 2) @ExcelProperty(value = "提货门店",index = 2)
private String store; private String store;
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty(value = "礼包名称",index = 3) @ExcelProperty(value = "卡类型",index = 3)
private String cardType;
@ColumnWidth(20)
@ExcelProperty(value = "礼包名称",index = 4)
private String bagName; private String bagName;
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty(value = "提货卡序列号",index = 4) @ExcelProperty(value = "提货卡序列号",index = 5)
private String serialNumber; private String serialNumber;
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty(value = "姓名",index = 5) @ExcelProperty(value = "姓名",index = 6)
private String userName; private String userName;
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty(value = "联系方式",index = 6) @ExcelProperty(value = "联系方式",index = 7)
private String userPhone; private String userPhone;
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty(value = "商品名称",index = 7) @ExcelProperty(value = "商品名称",index = 8)
private String goodsName; private String goodsName;
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty(value = "商品数量(份)",index = 8) @ExcelProperty(value = "商品数量(份)",index = 9)
private String goodsNumber; private String goodsNumber;
@ExcelIgnore @ExcelIgnore
private String sid; private String sid;

2
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
View File

@@ -1163,6 +1163,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
} }
} }
} }
order.setPayStatus(4);
ordOrderService.update(order,new QueryWrapper<OrdOrder>().eq("mainSid",mainSid));
return rb.success(); return rb.success();
} }
/// ///

6
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
View File

@@ -181,4 +181,10 @@ public class LpkGiftCardRest {
public ResultBean cardShareGoodsDetail(@PathVariable("sid") String sid) { public ResultBean cardShareGoodsDetail(@PathVariable("sid") String sid) {
return lpkGiftCardService.cardShareGoodsDetail(sid); return lpkGiftCardService.cardShareGoodsDetail(sid);
} }
// @ApiOperation("共享家庭卡详情")
// @GetMapping("/cardShareDetail/{sid}")
// public ResultBean cardShareDetail(@PathVariable("sid") String sid) {
// return lpkGiftCardService.cardShareDetail(sid);
// }
} }

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

@@ -431,7 +431,9 @@
case o.cardType case o.cardType
when 1 then '家庭菜窖' when 1 then '家庭菜窖'
end cardType, end cardType,
t.goodsSid as goodsSid t.goodsSid as goodsSid,
t.goodsNumber as goodsNumber,
e.name as goodsName
FROM FROM
lpk_reserve_order AS o lpk_reserve_order AS o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid 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_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.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_bank AS d ON d.sid = s.bankSid
left join lpk_goods e on e.sid= t.goodsSid
<where> <where>
1=1 1=1
<if test="qw.cardType =='' and qw.cardType ==null "> and o.cardType='1'
and o.cardType='1'
</if>
<if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='1'">
and o.cardType=#{qw.cardType}
</if>
<if test="qw.store !='' and qw.store!=null"> <if test="qw.store !='' and qw.store!=null">
and s.name=#{qw.store} and s.name=#{qw.store}
</if> </if>
@@ -473,7 +472,9 @@
case o.cardType case o.cardType
when 2 then '亲情菜窖' when 2 then '亲情菜窖'
end cardType, end cardType,
t.goodsSid as goodsSid t.goodsSid as goodsSid,
t.goodsNumber as goodsNumber,
e.name as goodsName
FROM FROM
lpk_reserve_order AS o lpk_reserve_order AS o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid 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 emp_card_gift AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.sid = b.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_bank AS d ON d.sid = s.bankSid
left join lpk_goods e on e.sid= t.goodsSid
<where> <where>
1=1 1=1
<if test="qw.cardType =='' and qw.cardType ==null "> and o.cardType='2'
and o.cardType='2'
</if>
<if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='2'">
and o.cardType=#{qw.cardType}
</if>
<if test="qw.bankSid !='' and qw.bankSid!=null"> <if test="qw.bankSid !='' and qw.bankSid!=null">
and s.bankSid=#{qw.bankSid} and s.bankSid=#{qw.bankSid}
</if> </if>
@@ -518,7 +516,9 @@
case o.cardType case o.cardType
when 3 then '企业菜窖' when 3 then '企业菜窖'
end cardType, end cardType,
t.goodsSid as goodsSid t.goodsSid as goodsSid,
t.goodsNumber as goodsNumber,
e.name as goodsName
FROM FROM
lpk_reserve_order AS o lpk_reserve_order AS o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid 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 emp_card AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.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_bank AS d ON d.sid = s.bankSid
left join lpk_goods e on e.sid= t.goodsSid
<where> <where>
1=1 1=1
<if test="qw.cardType =='' and qw.cardType ==null "> and o.cardType='3'
and o.cardType='3'
</if>
<if test="qw.cardType !='' and qw.cardType!=null and qw.cardType=='3'">
and o.cardType=#{qw.cardType}
</if>
<if test="qw.bankSid !='' and qw.bankSid!=null"> <if test="qw.bankSid !='' and qw.bankSid!=null">
and s.bankSid=#{qw.bankSid} and s.bankSid=#{qw.bankSid}
</if> </if>
@@ -566,7 +563,9 @@
case o.cardType case o.cardType
when 1 then '家庭菜窖' when 1 then '家庭菜窖'
end cardType, end cardType,
t.goodsSid as goodsSid t.goodsSid as goodsSid,
t.goodsNumber as goodsNumber,
e.name as goodsName
FROM FROM
lpk_reserve_order AS o lpk_reserve_order AS o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid 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_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.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_bank AS d ON d.sid = s.bankSid
left join lpk_goods e on e.sid= t.goodsSid
<where> <where>
1=1 1=1
<if test="qw.cardType =='' and qw.cardType ==null "> and o.cardType='1'
and o.cardType='1'
</if>
<if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='1'">
and o.cardType=#{qw.cardType}
</if>
<if test="qw.store !='' and qw.store!=null"> <if test="qw.store !='' and qw.store!=null">
and s.name=#{qw.store} and s.name=#{qw.store}
</if> </if>
@@ -611,7 +607,9 @@
case o.cardType case o.cardType
when 2 then '亲情菜窖' when 2 then '亲情菜窖'
end cardType, end cardType,
t.goodsSid as goodsSid t.goodsSid as goodsSid,
t.goodsNumber as goodsNumber,
e.name as goodsName
FROM FROM
lpk_reserve_order AS o lpk_reserve_order AS o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid 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 emp_card_gift AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.sid = b.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_bank AS d ON d.sid = s.bankSid
left join lpk_goods e on e.sid= t.goodsSid
<where> <where>
1=1 1=1
<if test="qw.cardType =='' and qw.cardType ==null "> and o.cardType='2'
and o.cardType='2'
</if>
<if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='2'">
and o.cardType=#{qw.cardType}
</if>
<if test="qw.bankSid !='' and qw.bankSid!=null"> <if test="qw.bankSid !='' and qw.bankSid!=null">
and s.bankSid=#{qw.bankSid} and s.bankSid=#{qw.bankSid}
</if> </if>
@@ -658,7 +653,9 @@
case o.cardType case o.cardType
when 3 then '企业菜窖' when 3 then '企业菜窖'
end cardType, end cardType,
t.goodsSid as goodsSid t.goodsSid as goodsSid,
t.goodsNumber as goodsNumber,
e.name as goodsName
FROM FROM
lpk_reserve_order AS o lpk_reserve_order AS o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid 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 emp_card AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.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_bank AS d ON d.sid = s.bankSid
left join lpk_goods e on e.sid= t.goodsSid
<where> <where>
1=1 1=1
<if test="qw.cardType =='' and qw.cardType ==null "> and o.cardType='3'
and o.cardType='3'
</if>
<if test="qw.cardType !='' and qw.cardType!=null and qw.cardType=='3'">
and o.cardType=#{qw.cardType}
</if>
<if test="qw.bankSid !='' and qw.bankSid!=null"> <if test="qw.bankSid !='' and qw.bankSid!=null">
and s.bankSid=#{qw.bankSid} and s.bankSid=#{qw.bankSid}
</if> </if>

12
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
View File

@@ -386,10 +386,10 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
exportList= baseMapper.exportExcel3( query); exportList= baseMapper.exportExcel3( query);
} }
List<ReserveOrderExport> exportList1 = new ArrayList<>(); List<ReserveOrderExport> exportList1 = new ArrayList<>();
if (!exportList.isEmpty()) { // if (!exportList.isEmpty()) {
exportList.forEach(s -> { // exportList.forEach(s -> {
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid()); // LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
s.setGoodsName(lpkGoods.getName()); // s.setGoodsName(lpkGoods.getName());
// if (StringUtils.isNotBlank(s.getUserPhone())) { // if (StringUtils.isNotBlank(s.getUserPhone())) {
//// String phone = s.getUserPhone().substring(0, 3) + "****" + s.getUserPhone().substring(7); //// String phone = s.getUserPhone().substring(0, 3) + "****" + s.getUserPhone().substring(7);
// String phone = s.getUserPhone(); // String phone = s.getUserPhone();
@@ -428,8 +428,8 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
// } // }
// } // }
// } // }
}); // });
} // }
//定义导出的excel名字 //定义导出的excel名字
//定义导出的excel名字 //定义导出的excel名字
String excelName = "订单明细.xlsx"; String excelName = "订单明细.xlsx";

2
src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java
View File

@@ -49,7 +49,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
BeanUtil.copyProperties(dto, order, "id", "sid"); BeanUtil.copyProperties(dto, order, "id", "sid");
order.setMainSid(rb2.get("mainSid").toString()); order.setMainSid(rb2.get("mainSid").toString());
order.setPayStatus(1); order.setPayStatus(2);
order.setPayTime(new Date()); order.setPayTime(new Date());
order.setCardNumber(dto.getCardNumber()); order.setCardNumber(dto.getCardNumber());
order.setSource(0); order.setSource(0);