记得上下班打卡 | git大法好,push需谨慎

Commit c511d011 authored by jiangxiulong's avatar jiangxiulong

refund

parent 94ed4c07
...@@ -249,7 +249,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -249,7 +249,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE}; orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
break; break;
case "reject": case "reject":
orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE}; orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
break; break;
case "unfilled": case "unfilled":
orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR}; orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
......
...@@ -417,7 +417,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -417,7 +417,7 @@ public class KylinRefundsStatusServiceImpl {
params.add("paymentId", oderInfo.getPaymentId()); params.add("paymentId", oderInfo.getPaymentId());
params.add("paymentType", oderInfo.getPaymentType()); params.add("paymentType", oderInfo.getPaymentType());
params.add("price", String.valueOf(refundPrice)); params.add("price", String.valueOf(refundPrice));
params.add("priceTotal", String.valueOf(refundPrice)); params.add("priceTotal", String.valueOf(oderInfo.getPriceTotal()));
params.add("reason", refund.getReason()); params.add("reason", refund.getReason());
/*String sign = StringUtils.Ksort(params); /*String sign = StringUtils.Ksort(params);
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<where> <where>
AND a.order_tickets_id = #{orderTicketsId} AND a.order_tickets_id = #{orderTicketsId}
AND a.status != ${orderRefundStatusCancel} AND a.status != ${orderRefundStatusCancel}
AND a.status != 5
AND b.order_ticket_entities_id = #{orderTicketEntitiesId} AND b.order_ticket_entities_id = #{orderTicketEntitiesId}
</where> </where>
</select> </select>
......
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