You've already forked FrameTour-BE
Compare commits
2 Commits
cdd434317f
...
8745cde2fb
| Author | SHA1 | Date | |
|---|---|---|---|
| 8745cde2fb | |||
| 1d5e4562f2 |
@@ -136,8 +136,10 @@ public class OrderBiz {
|
|||||||
productItem.setPurchaseCount(1);
|
productItem.setPurchaseCount(1);
|
||||||
productItem.setScenicId(scenic.getId().toString());
|
productItem.setScenicId(scenic.getId().toString());
|
||||||
calculationRequest.setProducts(Collections.singletonList(productItem));
|
calculationRequest.setProducts(Collections.singletonList(productItem));
|
||||||
calculationRequest.setUserId(face.getMemberId());
|
if (face != null) {
|
||||||
calculationRequest.setFaceId(face.getId());
|
calculationRequest.setUserId(face.getMemberId());
|
||||||
|
}
|
||||||
|
calculationRequest.setFaceId(goodsId);
|
||||||
PriceCalculationResult priceCalculationResult = iPriceCalculationService.calculatePrice(calculationRequest);
|
PriceCalculationResult priceCalculationResult = iPriceCalculationService.calculatePrice(calculationRequest);
|
||||||
priceObj.setPrice(priceCalculationResult.getFinalAmount());
|
priceObj.setPrice(priceCalculationResult.getFinalAmount());
|
||||||
priceObj.setSlashPrice(priceCalculationResult.getOriginalAmount());
|
priceObj.setSlashPrice(priceCalculationResult.getOriginalAmount());
|
||||||
|
|||||||
@@ -12,15 +12,5 @@ public class BatchConfigRequest {
|
|||||||
@JsonProperty("configs")
|
@JsonProperty("configs")
|
||||||
@NotEmpty(message = "配置列表不能为空")
|
@NotEmpty(message = "配置列表不能为空")
|
||||||
@Valid
|
@Valid
|
||||||
private List<BatchConfigItem> configs;
|
private List<UpdateConfigRequest> configs;
|
||||||
|
|
||||||
@Data
|
|
||||||
public static class BatchConfigItem {
|
|
||||||
@JsonProperty("configKey")
|
|
||||||
@NotEmpty(message = "配置键不能为空")
|
|
||||||
private String configKey;
|
|
||||||
|
|
||||||
@JsonProperty("configValue")
|
|
||||||
private String configValue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.ycwl.basic.integration.scenic.dto.config;
|
package com.ycwl.basic.integration.scenic.dto.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@@ -11,6 +12,9 @@ public class UpdateConfigRequest {
|
|||||||
@JsonProperty("configValue")
|
@JsonProperty("configValue")
|
||||||
private String configValue;
|
private String configValue;
|
||||||
|
|
||||||
|
@JsonProperty("configType")
|
||||||
|
private String configType;
|
||||||
|
|
||||||
@JsonProperty("description")
|
@JsonProperty("description")
|
||||||
private String description;
|
private String description;
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user