mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
1、新增定价规则折扣限制为整数;2、修正三方支付的回调:作废旧支付中购买记录状态;
This commit is contained in:
+2
@@ -6,6 +6,7 @@ import com.cf.imes.module.system.validation.products.ProductType;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.DecimalMax;
|
||||
import jakarta.validation.constraints.DecimalMin;
|
||||
import jakarta.validation.constraints.Digits;
|
||||
import lombok.Data;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
@@ -55,6 +56,7 @@ public class ProductDetailsSaveReqVO {
|
||||
@Schema(description = "折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "0.8")
|
||||
@DecimalMax(value = "100", message = "折扣必须小于等于100")
|
||||
@DecimalMin(value = "0", message = "折扣必须大于等于0")
|
||||
@Digits(integer = 3, fraction = 0, message = "折扣必须是0 ~ 100间的整数")
|
||||
private BigDecimal discount;
|
||||
|
||||
@Schema(description = "产品现价", requiredMode = Schema.RequiredMode.REQUIRED, example = "80")
|
||||
|
||||
+1
-1
@@ -350,7 +350,7 @@ public class PurchaseServiceImpl implements PurchaseService {
|
||||
purchaseRecordMapper.update(new LambdaUpdateWrapper<PurchaseRecordDO>()
|
||||
.eq(PurchaseRecordDO::getOrganId, organId)
|
||||
.eq(PurchaseRecordDO::getId, purchaseRecordId)
|
||||
.eq(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.ACTIVE.getStatus())
|
||||
.eq(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.PENDING.getStatus())
|
||||
.eq(PurchaseRecordDO::getDeleted, false)
|
||||
.set(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.INACTIVE.getStatus()));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user