ZP/zp-fightwine
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

领取记录详情增加拼团编号

Browse Source
This commit is contained in:
不睡觉的月亮 2025-12-05 09:28:54 +08:00
parent 41af1a5ec3
commit b93c5e0661
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java
View File

@ -45,6 +45,9 @@ public class StoreOrder implements Serializable {
@ApiModelProperty(value = "详细地址")
private String userAddress;
@ApiModelProperty(value = "收货地址ID")
private Integer addressId;
@ApiModelProperty(value = "运费金额")
private BigDecimal freightPrice;

3
fightwine-common/src/main/java/com/yzt/common/response/StoreOrderDetailInfoResponse.java
View File

@ -149,6 +149,9 @@ public class StoreOrderDetailInfoResponse implements Serializable {
@ApiModelProperty(value = "拼团id 0没有拼团")
private Integer pinkId;
@ApiModelProperty(value = "拼团编号（排队码）")
private String queueCode;
// @ApiModelProperty(value = "成本价")
// private BigDecimal cost;

25
fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java
View File

@ -614,6 +614,30 @@ public class OrderServiceImpl implements OrderService {
// 查询发票信息
StoreOrderInvoice invoice = storeOrderInvoiceService.getByOrderId(orderId);
storeOrderDetailResponse.setInvoiceInfo(invoice);
// 查询拼团编号（排队码）
if (StrUtil.isNotBlank(storeOrder.getMark()) && storeOrder.getMark().contains("拼团ID:")) {
try {
// 从 mark 中解析拼团ID，格式：拼团ID:123 达成后免费领取
String mark = storeOrder.getMark();
int startIndex = mark.indexOf("拼团ID:") + "拼团ID:".length();
int endIndex = mark.indexOf(" ", startIndex);
if (endIndex == -1) {
endIndex = mark.length();
}
String pinkIdStr = mark.substring(startIndex, endIndex).trim();
Integer pinkId = Integer.parseInt(pinkIdStr);
// 查询拼团表获取排队码
StorePink storePink = storePinkService.getById(pinkId);
if (ObjectUtil.isNotNull(storePink) && StrUtil.isNotBlank(storePink.getQueueCode())) {
storeOrderDetailResponse.setQueueCode(storePink.getQueueCode());
}
} catch (Exception e) {
logger.warn("解析拼团ID失败，订单号: {}, mark: {}", orderId, storeOrder.getMark(), e);
}
}
return storeOrderDetailResponse;
}
@ -1274,6 +1298,7 @@ public class OrderServiceImpl implements OrderService {
storeOrder.setRealName(request.getRealName());
storeOrder.setUserPhone(request.getPhone());
storeOrder.setUserAddress(userAddressStr);
storeOrder.setAddressId(request.getAddressId());
storeOrder.setVirtualRemark(JSON.toJSONString(virtualRemarkList));
// 如果是自提
if (request.getShippingType() == 2) {

1
fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
View File

@ -873,6 +873,7 @@ public class StorePinkServiceImpl extends ServiceImpl<StorePinkMapper, StorePink
claimOrder.setRealName(userAddress.getRealName());
claimOrder.setUserPhone(userAddress.getPhone());
claimOrder.setUserAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail());
claimOrder.setAddressId(addressId);
// 免费领取
claimOrder.setTotalNum(1); // 送一份