|
@@ -188,7 +188,7 @@ class stat_refill
|
|
$params['profit_amounts'] = $item['mch_amounts'] - $item['channel_amounts'];
|
|
$params['profit_amounts'] = $item['mch_amounts'] - $item['channel_amounts'];
|
|
|
|
|
|
if($cur_mchid != 0 && $cur_mchid == $mchid) {
|
|
if($cur_mchid != 0 && $cur_mchid == $mchid) {
|
|
- Model('')->table('refill_stats')->where(['time_stamp' => $day_time, 'cid' => $cur_mchid, 'type' => 'merchant'])->update($params);
|
|
|
|
|
|
+ Model('')->table('refill_stats')->where(['time_stamp' => $day_time, 'cid' => $cur_mchid, 'type' => 'merchant', 'order_time_type' => $order_time_type])->update($params);
|
|
}else{
|
|
}else{
|
|
Model('')->table('refill_stats')->insert($params);
|
|
Model('')->table('refill_stats')->insert($params);
|
|
}
|
|
}
|
|
@@ -235,7 +235,7 @@ class stat_refill
|
|
$params['profit_amounts'] = $item['mch_amounts'] - $item['channel_amounts'];
|
|
$params['profit_amounts'] = $item['mch_amounts'] - $item['channel_amounts'];
|
|
|
|
|
|
if($cur_storeid != 0 && $cur_storeid == $store_id) {
|
|
if($cur_storeid != 0 && $cur_storeid == $store_id) {
|
|
- Model('')->table('refill_stats')->where(['time_stamp' => $day_time, 'cid' => $cur_storeid, 'type' => 'provider'])->update($params);
|
|
|
|
|
|
+ Model('')->table('refill_stats')->where(['time_stamp' => $day_time, 'cid' => $cur_storeid, 'type' => 'provider', 'order_time_type' => $order_time_type])->update($params);
|
|
}else{
|
|
}else{
|
|
Model('')->table('refill_stats')->insert($params);
|
|
Model('')->table('refill_stats')->insert($params);
|
|
}
|
|
}
|