|
|
@@ -554,6 +554,7 @@ func checkAllCompleteTmp(eg *xorm.Engine, user *md.User, acqCfg *md.AcquisitionC |
|
|
|
} |
|
|
|
} |
|
|
|
if acqCfg.SuccessConditions.OrderPay.Open == "1" { |
|
|
|
//AcqOrderPay(eg, user, acqCfg) |
|
|
|
res = res && AcqOrderPay(eg, user, acqCfg) |
|
|
|
if res { |
|
|
|
str += ",OrderPay" |
|
|
@@ -653,6 +654,8 @@ func commAmount(eg *xorm.Engine, uid string, endTime, types int, acqCfg *md.Acqu |
|
|
|
count := sqlSelect(eg, uid, endTime, types, acqCfg, arr) |
|
|
|
arr = []string{"ol.paid_price", "privilege_card_ord", "ord_list_relate", "ol.ord_id", "ol.uid", " and ol.state=1"} |
|
|
|
count += sqlSelect(eg, uid, endTime, types, acqCfg, arr) |
|
|
|
arr = []string{"ol.money", "express_order", "ord_list_relate", "ol.oid", "ol.uid", " and ol.status in('待取件','运输中','已完成')"} |
|
|
|
count += sqlSelect(eg, uid, endTime, types, acqCfg, arr) |
|
|
|
arr = []string{"ol.commission", "duoyou_ord_list", "ord_list_relate", "ol.oid", "ol.uid", " and ol.id>0"} |
|
|
|
count += sqlSelect(eg, uid, endTime, types, acqCfg, arr) |
|
|
|
arr = []string{"ol.amount", "recharge_order", "ord_list_relate", "ol.oid", "ol.uid", " and ol.status<>'已退款'"} |
|
|
|