Commit f5ae507a by huluobin

update

parent cdffe073
...@@ -960,6 +960,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -960,6 +960,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
customerMessageMapper.insert(customerMessage); customerMessageMapper.insert(customerMessage);
} }
OrderManage orderManage =orderManageMapper.selectById(orderId);
orderManage.setIsFriendPay(1);
} }
@Override @Override
......
...@@ -58,9 +58,11 @@ public class MallOrder { ...@@ -58,9 +58,11 @@ public class MallOrder {
private Integer transportMode; private Integer transportMode;
@ApiModelProperty("支付方式 1-微信支付 2-余额支付 3-余额抵扣微信支付") @ApiModelProperty("支付方式 1-微信支付 2-余额支付 3-余额抵扣微信支付")
private Integer paymentType; private Integer paymentType;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty("是否朋友代付 1-是 2-否") @ApiModelProperty("是否朋友代付 1-是 2-否")
private Integer isFriendPay; private Integer isFriendPay;
@ApiModelProperty("付款客户") @ApiModelProperty("付款客户")
private Integer paymentCustomerId; private Integer paymentCustomerId;
@ApiModelProperty("订单类型") @ApiModelProperty("订单类型")
......
...@@ -265,6 +265,9 @@ public class OrderManage implements Serializable { ...@@ -265,6 +265,9 @@ public class OrderManage implements Serializable {
private Integer payUser; private Integer payUser;
@ApiModelProperty("是否朋友代付 1-是 2-否")
private Integer isFriendPay;
public void addDiscountPrice(BigDecimal discountPrice) { public void addDiscountPrice(BigDecimal discountPrice) {
this.discountPrice = this.discountPrice.add(discountPrice); this.discountPrice = this.discountPrice.add(discountPrice);
this.totalPaymentAmount = this.totalPaymentAmount.subtract(discountPrice); this.totalPaymentAmount = this.totalPaymentAmount.subtract(discountPrice);
......
...@@ -131,6 +131,11 @@ public class OrderManageDTO { ...@@ -131,6 +131,11 @@ public class OrderManageDTO {
private List<Integer> couponCustomerRelevanceIds; private List<Integer> couponCustomerRelevanceIds;
private Integer payUser;
@ApiModelProperty("是否朋友代付 1-是 2-否")
private Integer isFriendPay;
public void setImages() { public void setImages() {
images = orderServeDTOList images = orderServeDTOList
.stream() .stream()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment