Commit 6f0ca4a8 by huluobin

非组合方式 清空multiPaymentType

parent d2db3d36
......@@ -182,6 +182,7 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
.customerId(customer.getId())
.status(1)
.build();
this.save(chargeOrder);
}
......
......@@ -789,6 +789,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
orderManage.setPaymentType(payType);
orderManage.setMultiplePaymentType(null);
orderManageMapper.updateById(orderManage);
} else if (payType.equals(5)) {
log.info("**美甲师pos机收款**,订单id: {}", orderId);
......@@ -796,6 +797,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
orderManage.setPaymentType(payType);
orderManage.setMultiplePaymentType(null);
orderManageMapper.updateById(orderManage);
} else if (payType.equals(10)) {
......@@ -804,6 +806,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
//状态更新为待评论
orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
orderManage.setPaymentType(OrderManage.PAYMENT_FREE);
orderManage.setMultiplePaymentType(null);
this.updateById(orderManage);
}
......
package com.gogirl.domain.order.serve;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
import com.gogirl.domain.market.coupon.CouponOrderRelevance;
......@@ -144,6 +141,7 @@ public class OrderManage implements Serializable {
private String createUser;
@ApiModelProperty("多选支付方式 200-pos机 100-现金 50-微信扫码")
@TableField(strategy = FieldStrategy.IGNORED)
private String multiplePaymentType;
@ApiModelProperty("支付方式:1#微信 2#会员 3#其他4#充值5#pos机6#现金7#大众点评8#微信扫码支付9#团购10#免单11#会员帮付12#余额抵扣微信支付13#余额抵扣pos支付")
......
......@@ -36,14 +36,19 @@ public class OrderServe implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.AUTO)
private Integer id;
@ApiModelProperty("订单id")
private Integer orderId;
@ApiModelProperty("服务美甲顾问id")
private String technicianId;
@ApiModelProperty("订单美甲师姓名")
private String technicianName;
@ApiModelProperty("业绩")
private BigDecimal achievement;
@ApiModelProperty("服务评价状态 1-未评价 2-已评价")
private Integer commentStatus;
......
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