feat/task1-c-wallet
gongfuxiang 2018-10-30 00:02:53 +08:00
parent bc3c16ae7a
commit 96a331fc7e
4 changed files with 26 additions and 0 deletions

View File

@ -57,5 +57,6 @@ return array(
'alipay_life_message_selected_text' => '已选',
'alipay_life_message_selected_all_text' => '全选',
'alipay_life_message_content_text' => '内容',
'alipay_life_message_detail_text' => '详情',
);
?>

View File

@ -122,6 +122,12 @@
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:U('Admin/AlipayLifeMessage/Delete')}}" data-id="{{$v.id}}"> {{:L('common_operation_delete')}}</button>
</if>
<if condition="in_array($v['status'], [2,3])">
<a href="{{:U('Admin/AlipayLifeMessage/Detail', array('message_id'=>$v['id']))}}">
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-align-left"> {{:L('alipay_life_message_detail_text')}}</button>
</a>
</if>
</td>
</tr>
</foreach>

View File

@ -410,6 +410,25 @@ class AlipayLifeService
return DataReturn('状态不可操作['.$common_send_status_list[$message['status']]['name'].']', -2);
}
// 获取消息内容
$content_count = (int) M('AlipayLifeMessageContent')->where(['alipay_life_message_id'=>$message['id']])->count();
switch($message['send_type'])
{
case 0 :
if($content_count > 1)
{
return DataReturn('消息内容不存在', -1);
}
break;
case 1 :
if($content_count > 10)
{
return DataReturn('群发消息不能超过10条内容', -1);
}
break;
}
// 发送类型
$data = [];
if($message['send_type'] == 1)

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB