|
|
@@ -40,7 +40,7 @@
|
|
|
AND cdr.receiptStatus IN (2, 3)
|
|
|
AND cdr.payWay != 3)
|
|
|
, 0) AS receiptAmount,
|
|
|
- (ifnull(a.realPay,0) - ifnull(a.receiptAmount,0)) as restAmount,
|
|
|
+ (ifnull(a.realPay,a.needPayAmount) - ifnull(a.receiptAmount,0)) as restAmount,
|
|
|
a.receiptStatus as shopReceiptStatus,
|
|
|
a.receiptStatus as ReceiptStatus,
|
|
|
a.canRefundAmount AS canRefundAmount,
|
|
|
@@ -740,7 +740,6 @@
|
|
|
<select id="findPayOrderList" resultType="newShopOrder">
|
|
|
select<include refid="shopOrderColumns"/>,
|
|
|
co.payTotalFee AS payTotalFee,
|
|
|
-
|
|
|
bou.name AS buyer,
|
|
|
s.name AS shopName,
|
|
|
c.name AS clubName,
|
zhijiezhao