| @@ -46,7 +46,7 @@ public class TtOrder extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") | @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") | ||||
| private Integer payment; | private Integer payment; | ||||
| @io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime") | @io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime") | ||||
| private Date paymentTime; | |||||
| private String paymentTime; | |||||
| @Excel(name = "订单状态", width = 20, orderNum = "9", replace = {"待付款_0", "已支付_1", "已取消_2", "待退款_3", "已退款_4", "退款失败_5", " _-1"}) | @Excel(name = "订单状态", width = 20, orderNum = "9", replace = {"待付款_0", "已支付_1", "已取消_2", "待退款_3", "已退款_4", "退款失败_5", " _-1"}) | ||||
| @io.swagger.annotations.ApiModelProperty(value="\"待付款_0\", \"已支付_1\", \"已取消_2\", \"待退款_3\", \"已退款_4\", \"退款失败_5\", \" _-1\"",name="orderStatus") | @io.swagger.annotations.ApiModelProperty(value="\"待付款_0\", \"已支付_1\", \"已取消_2\", \"待退款_3\", \"已退款_4\", \"退款失败_5\", \" _-1\"",name="orderStatus") | ||||
| @@ -121,7 +121,7 @@ public class TtOrderServiceImpl implements TtOrderService { | |||||
| order.setPayment(coupon.getSalePrice()); | order.setPayment(coupon.getSalePrice()); | ||||
| if(order.getPayment() == null || order.getPayment().intValue() == 0){ | if(order.getPayment() == null || order.getPayment().intValue() == 0){ | ||||
| order.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | order.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | ||||
| order.setPaymentTime(now); | |||||
| // order.setPaymentTime(now); | |||||
| }else{ | }else{ | ||||
| order.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | order.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | ||||
| } | } | ||||
| @@ -244,6 +244,8 @@ public class TtOrderServiceImpl implements TtOrderService { | |||||
| TtOrder orderSuc = new TtOrder(); | TtOrder orderSuc = new TtOrder(); | ||||
| orderSuc.setId(order.getId()); | orderSuc.setId(order.getId()); | ||||
| orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | ||||
| orderSuc.setWay(orderQueryResult.getWay()); | |||||
| orderSuc.setPaymentTime(orderQueryResult.getPayTime()); | |||||
| orderSuc.setUpdateDate(new Date()); | orderSuc.setUpdateDate(new Date()); | ||||
| ttOrderMapper.updateById(orderSuc); | ttOrderMapper.updateById(orderSuc); | ||||
| return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!"); | return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!"); | ||||
| @@ -306,8 +308,7 @@ public class TtOrderServiceImpl implements TtOrderService { | |||||
| orderSuc.setId(order.getId()); | orderSuc.setId(order.getId()); | ||||
| orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | ||||
| orderSuc.setWay(orderQueryResult.getWay()); | orderSuc.setWay(orderQueryResult.getWay()); | ||||
| // orderSuc.setPaymentTime(orderQueryResult.getPayTime()); | |||||
| logger.info("支付时间格式---"+orderQueryResult.getPayTime()); | |||||
| orderSuc.setPaymentTime(orderQueryResult.getPayTime()); | |||||
| orderSuc.setUpdateDate(new Date()); | orderSuc.setUpdateDate(new Date()); | ||||
| ttOrderMapper.updateById(orderSuc); | ttOrderMapper.updateById(orderSuc); | ||||
| // return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!"); | // return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!"); | ||||
| @@ -16,7 +16,7 @@ | |||||
| <result column="way" jdbcType="TINYINT" property="way"/> | <result column="way" jdbcType="TINYINT" property="way"/> | ||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | ||||
| <result column="payment" jdbcType="INTEGER" property="payment"/> | <result column="payment" jdbcType="INTEGER" property="payment"/> | ||||
| <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | |||||
| <result column="payment_time" jdbcType="VARCHAR" property="paymentTime"/> | |||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| @@ -70,10 +70,10 @@ | |||||
| </if> | </if> | ||||
| <if test="startdate != null"> | <if test="startdate != null"> | ||||
| and o.`payment_time` >= #{startdate} | |||||
| and o.`create_date` >= #{startdate} | |||||
| </if> | </if> | ||||
| <if test="enddate != null"> | <if test="enddate != null"> | ||||
| and o.`payment_time` <= #{enddate} | |||||
| and o.`create_date` <= #{enddate} | |||||
| </if> | </if> | ||||
| <if test=" null != orderStatus "> | <if test=" null != orderStatus "> | ||||
| @@ -175,10 +175,10 @@ | |||||
| </if> | </if> | ||||
| <if test="startdate != null"> | <if test="startdate != null"> | ||||
| and o.`payment_time` >= #{startdate} | |||||
| and o.`create_date` >= #{startdate} | |||||
| </if> | </if> | ||||
| <if test="enddate != null"> | <if test="enddate != null"> | ||||
| and o.`payment_time` <= #{enddate} | |||||
| and o.`create_date` <= #{enddate} | |||||
| </if> | </if> | ||||
| <if test=" null != orderStatus "> | <if test=" null != orderStatus "> | ||||