master
yuan 7 years ago
parent 7e2e560e54
commit 28c714d9c8

@ -334,6 +334,9 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
clientConfig.put("common_sub_merchant_id", 1);
clientConfigMapper.save(clientConfig);
apply.put("client_moniker",clientMoniker);
sysClientPreMapperMapper.update(apply);
JSONObject sysRate = new JSONObject();
sysRate.put("client_id", clientId);
sysRate.put("clean_days", apply.getIntValue("clean_days"));
@ -370,6 +373,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
};
pool.execute(task2);
}
private String generateClientMoniker() {

@ -28,12 +28,11 @@
<table class="table table-striped">
<thead>
<tr>
<th>Name</th>
<th>Phone</th>
<th>Email</th>
<!-- <th>Approve Status</th>-->
<th>Company Name</th>
<th style="max-width: 20%">Company Name</th>
<th>Status</th>
<th>Create Time</th>
<th>Operation</th>
@ -44,9 +43,9 @@
<td ng-bind="apply.contact_person"></td>
<td ng-bind="apply.contact_phone"></td>
<td ng-bind="apply.contact_email"></td>
<td ng-bind="apply.company_name |cut:true:10:' ....'"></td>
<td ng-bind="apply.company_name |cut:true:15:' ....'"></td>
<td>
<if ng-if="apply.agree">已申请</if>
<if ng-if="apply.agree">已申请 <span ng-if="apply.client_moniker">({{apply.client_moniker}})</span></if>
<if ng-if="!apply.agree">未申请
<span ng-if="apply.username && !apply.company_name">(<em class="text-danger">step2</em>)</span>
<span ng-if="apply.company_name && !apply.bank_no">(<em class="text-danger">step3</em>)</span>
@ -54,13 +53,6 @@
</if>
</td>
<td ng-bind="apply.create_time"></td>
<!-- <td>
<span ng-if="apply.apply_approve_result==0||partner.apply_approve_result==null">Waiting Approving</span>
<span ng-if="apply.apply_approve_result==1" style="color: blue"> BD Approaching ({{partner.bd_user_name}})</span>
<span ng-if="apply.apply_approve_result==2" style="color: green">Pass ({{partner.bd_user_name}} {{partner.apply_approve_time}})</span>
<span ng-if="apply.apply_approve_result==3||partner.apply_approve_result==4"
style="color: red">Not Pass</span>
</td>-->
<td>
<a class="text-primary" role="button" title="Detail"
ui-sref="apply_detail({client_pre_apply_id:apply.client_pre_apply_id})">

Loading…
Cancel
Save