|
|
|
@ -609,7 +609,7 @@ class PaymentMerchantController extends ThinkController
|
|
|
|
|
]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$startTime = $params['start_time'] == '' ? 0 : strtotime($params['start_time'] . ' 00:00:00');
|
|
|
|
|
/* $startTime = $params['start_time'] == '' ? 0 : strtotime($params['start_time'] . ' 00:00:00');
|
|
|
|
|
$endTime = $params['end_time'] == '' ? PaymentRuleService::FOREVER_TIME : strtotime($params['end_time'] . ' 23:59:59');
|
|
|
|
|
|
|
|
|
|
if (date('Ymd', $rule['start_time']) <= date('Ymd') && $startTime != $rule['start_time']) {
|
|
|
|
@ -637,14 +637,14 @@ class PaymentMerchantController extends ThinkController
|
|
|
|
|
'status' => 0,
|
|
|
|
|
'message' => '最后生效时间在今日之前,不可修改'
|
|
|
|
|
]);
|
|
|
|
|
}
|
|
|
|
|
} */
|
|
|
|
|
|
|
|
|
|
$item = [
|
|
|
|
|
'alipay_merchant_id' => $params['alipay_merchant_id'],
|
|
|
|
|
'weixin_merchant_id' => $params['weixin_merchant_id'],
|
|
|
|
|
'express_merchant_id' => $params['express_merchant_id'],
|
|
|
|
|
'start_time' => $startTime,
|
|
|
|
|
'end_time' => $endTime,
|
|
|
|
|
// 'start_time' => $startTime,
|
|
|
|
|
// 'end_time' => $endTime,
|
|
|
|
|
'update_time' => time()
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
@ -667,6 +667,11 @@ class PaymentMerchantController extends ThinkController
|
|
|
|
|
|
|
|
|
|
public function deleteRule()
|
|
|
|
|
{
|
|
|
|
|
$this->ajaxReturn([
|
|
|
|
|
'status' => 0,
|
|
|
|
|
'message' => '暂不支持删除'
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
$id = I('id', 0);
|
|
|
|
|
$rule = M('payment_rule', 'tab_')->where(['id' => $id])->find();
|
|
|
|
|
|
|
|
|
|