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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-12-19 17:20:19 +08:00
parent 460b3b1d40 b0820f5d68
commit b1cc85efdb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/order-server/src/main/java/com/czg/controller/user/UPpOrderController.java
View File

@@ -82,10 +82,12 @@ public class UPpOrderController {
} }
Map<String, Object> resultMap = new HashMap<>(1); Map<String, Object> resultMap = new HashMap<>(1);
resultMap.put("payInfo", mapCzgResult.getData()); resultMap.put("payInfo", mapCzgResult.getData());
resultMap.put("record", detail.getId());
result.setData(resultMap); result.setData(resultMap);
PpPackageOrder order = ppPackageOrderService.getById(param.getRecordId()); PpPackageOrder order = ppPackageOrderService.getById(param.getRecordId());
order.setFinalPrice(price); order.setFinalPrice(price);
ppPackageOrderService.updateById(order);
return result; return result;
} }

7
cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java
View File

@@ -9,6 +9,8 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@@ -18,7 +20,10 @@ import java.util.List;
* @date 2025/12/18 10:22 * @date 2025/12/18 10:22
*/ */
@Data @Data
public class PpPackageVO { public class PpPackageVO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Data @Data
public static class TieredDiscount { public static class TieredDiscount {