mall/huimai
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成积分支付和余额支付

Browse Source
This commit is contained in:
axindata
2025-02-20 17:30:20 +08:00
parent c4cb4a5a4a
commit 6939311e6f
5 changed files with 226 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mall-dao/src/main/java/com/buy507/mall/model/OmsOrder.java
View File

@@ -45,7 +45,7 @@ public class OmsOrder implements Serializable {
@ApiModelProperty(value = "管理员后台调整订单使用的折扣金额")
private BigDecimal discountAmount;
@ApiModelProperty(value = "支付方式：0->未支付；1->支付宝；2->微信；3->线下支付")
@ApiModelProperty(value = "支付方式：0->未支付；1->支付宝；2->微信；3->线下支付；4->积分支付；5—>余额支付")
private Integer payType;
@ApiModelProperty(value = "订单来源：0->PC订单；1->app订单")

6
mall-dao/src/main/java/com/buy507/mall/model/OmsOrderItem.java
View File

@@ -62,7 +62,7 @@ public class OmsOrderItem implements Serializable {
@ApiModelProperty(value = "该商品经过优惠后的分解金额")
private BigDecimal realAmount;
private Integer giftIntegration;
private BigDecimal giftIntegration;
private Integer giftGrowth;
@@ -239,11 +239,11 @@ public class OmsOrderItem implements Serializable {
this.realAmount = realAmount;
}
public Integer getGiftIntegration() {
public BigDecimal getGiftIntegration() {
return giftIntegration;
}
public void setGiftIntegration(Integer giftIntegration) {
public void setGiftIntegration(BigDecimal giftIntegration) {
this.giftIntegration = giftIntegration;
}