czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单过期返回状态码

Browse Source
This commit is contained in:
wangw
2025-03-25 16:55:19 +08:00
parent ae6b5fcbd1
commit 9a55dcd038
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java
View File

@@ -112,7 +112,7 @@ public class ProductDTO implements Serializable {
/** /**
* 称重 价格/千克 * 称重 价格/千克
*/ */
@NotNull(message = "重量不能为空", groups = DefaultGroup.class) // @NotNull(message = "重量不能为空", groups = DefaultGroup.class)
private BigDecimal weight; private BigDecimal weight;
/** /**
* 是否允许临时改价 * 是否允许临时改价

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -244,7 +244,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
public OrderInfo checkOrderPay(CheckOrderPay param) { public OrderInfo checkOrderPay(CheckOrderPay param) {
OrderInfo orderInfo = getById(param.getOrderId()); OrderInfo orderInfo = getById(param.getOrderId());
if (!orderInfo.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) { if (!orderInfo.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) {
throw new ValidateException("生成支付订单失败，订单不可支付"); throw new OrderCancelException("生成支付订单失败，订单不可支付");
} }
if (!"after-pay".equals(orderInfo.getPayMode())) { if (!"after-pay".equals(orderInfo.getPayMode())) {
if (redisService.hasKey(RedisCst.classKeyExpired.EXPIRED_ORDER + param.getOrderId())) { if (redisService.hasKey(RedisCst.classKeyExpired.EXPIRED_ORDER + param.getOrderId())) {

3
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
View File

@@ -281,6 +281,9 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
} }
Product old = super.getById(dto.getId()); Product old = super.getById(dto.getId());
Product entity = BeanUtil.copyProperties(dto, Product.class); Product entity = BeanUtil.copyProperties(dto, Product.class);
if ("weight".equals(entity.getType()) && (entity.getWeight() == null || entity.getWeight().compareTo(BigDecimal.ZERO) <= 0)) {
throw new CzgException("称重商品重量必须大于0");
}
entity.setImages(JSON.toJSONString(dto.getImages(), JSONWriter.Feature.WriteMapNullValue)); entity.setImages(JSON.toJSONString(dto.getImages(), JSONWriter.Feature.WriteMapNullValue));
entity.setGroupSnap("[]"); entity.setGroupSnap("[]");
//套餐 //套餐