This commit is contained in:
2025-12-18 18:13:02 +08:00
parent cdcaa22f60
commit 877881dfd5
3 changed files with 9 additions and 1 deletions

View File

@@ -43,6 +43,10 @@ public class GbOrderDetailVO extends GbOrderDetail {
* 商品拼团价
*/
private BigDecimal wareGroupPrice;
/**
* 拼团状态
*/
private String wareGroupStatus;
/**
* 店铺地址
*/

View File

@@ -115,6 +115,9 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
} else {
gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong());
gbOrderDetail.setGroupOrderNo(groupOrderNo);
if (!"ing".equals(gbOrderDetail.getWareGroupStatus())) {
throw new CzgException("拼团已结束");
}
}
List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo());
gbOrderDetail.setUsers(users);
@@ -277,6 +280,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
wareJson.put("wareImgs", ware.getWareImgs());
wareJson.put("wareDetail", ware.getWareDetail());
wareJson.put("wareCommentImgs", ware.getWareCommentImgs());
wareJson.put("limitBuyNum", ware.getLimitBuyNum());
order.setWareJson(wareJson.toJSONString());
order.setWareGroupPrice(ware.getGroupPrice());
order.setWareOriginalPrice(ware.getOriginalPrice());

View File

@@ -92,7 +92,7 @@
<select id="getDetailByGroupNo" resultType="com.czg.order.vo.GbOrderDetailVO">
SELECT
detail.* ,`order`.ware_json as wareJson,`order`.group_end_time as groupEndTime,`order`.group_people_num as groupPeopleNum,`order`.ware_group_price as wareGroupPrice,
`order`.ware_original_price as wareOriginalPrice,`user`.nick_name as userName,`user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress
`order`.ware_original_price as wareOriginalPrice,`order`.status as wareGroupStatus,`user`.nick_name as userName,`user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress
FROM
gb_order `order`
LEFT JOIN gb_order_detail detail on detail.group_order_no = `order`.group_order_no and `detail`.shop_id = #{shopId} and `detail`.user_id = #{userId} and `detail`.is_del = 0