Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -82,10 +82,12 @@ public class UPpOrderController {
|
||||
}
|
||||
Map<String, Object> resultMap = new HashMap<>(1);
|
||||
resultMap.put("payInfo", mapCzgResult.getData());
|
||||
resultMap.put("record", detail.getId());
|
||||
result.setData(resultMap);
|
||||
|
||||
PpPackageOrder order = ppPackageOrderService.getById(param.getRecordId());
|
||||
order.setFinalPrice(price);
|
||||
ppPackageOrderService.updateById(order);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
@@ -18,7 +20,10 @@ import java.util.List;
|
||||
* @date 2025/12/18 10:22
|
||||
*/
|
||||
@Data
|
||||
public class PpPackageVO {
|
||||
public class PpPackageVO implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Data
|
||||
public static class TieredDiscount {
|
||||
|
||||
Reference in New Issue
Block a user