|
@@ -920,8 +920,8 @@
|
|
c.name AS clubName,
|
|
c.name AS clubName,
|
|
cdr.payWay AS payWay,
|
|
cdr.payWay AS payWay,
|
|
a.onlinePayWays,
|
|
a.onlinePayWays,
|
|
- ifnull(cmAccountType,0) as cmAccountType,
|
|
|
|
- ifnull(cmShopOtherFee,0) as cmShopOtherFee,
|
|
|
|
|
|
+ ifnull(a.cmAccountType,0) as cmAccountType,
|
|
|
|
+ ifnull(a.cmShopOtherFee,0) as cmShopOtherFee,
|
|
(select sum((num+presentNum)*cmCostPrice) from cm_order_product where shopOrderId = a.shopOrderId) as
|
|
(select sum((num+presentNum)*cmCostPrice) from cm_order_product where shopOrderId = a.shopOrderId) as
|
|
allServeAmount
|
|
allServeAmount
|
|
from cm_shop_order a
|
|
from cm_shop_order a
|