msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 自助进件优化

Browse Source
master
luoyang 5 years ago
parent 3546e8e3b7
commit cde203a969
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
Unescape View File

@ -30,6 +30,7 @@ import au.com.royalpay.payment.tools.utils.TimeZoneUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -459,16 +460,14 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
@Override @Override
public List<JSONObject> getSysRate(JSONObject sysConfig){ public List<JSONObject> getSysRate(JSONObject sysConfig){
JSONObject sysConfigs = JSONObject.parseObject(sysConfig.getString("sys_apply_rates")); HashMap<String, JSONObject> map = JSON.parseObject(sysConfig.getString("sys_apply_rates"),LinkedHashMap.class, Feature.OrderedField);
List<JSONObject> rates= new ArrayList<>(); List<JSONObject> rates= new ArrayList<>();
JSONObject tName = new JSONObject(); JSONObject tName = new JSONObject();
tName.put("t1","T+1"); tName.put("t1","T+1");
tName.put("t2","T+2"); tName.put("t2","T+2");
tName.put("t3","T+3"); tName.put("t3","T+3");
for( String strt:map.keySet()){
for(String strt:sysConfigs.keySet()){ JSONObject t = map.get(strt);
JSONObject t = sysConfigs.getJSONObject(strt);
List<JSONObject> data = new ArrayList<>(); List<JSONObject> data = new ArrayList<>();
for(String str:t.keySet()){ for(String str:t.keySet()){
JSONObject rate = new JSONObject(); JSONObject rate = new JSONObject();
@ -477,7 +476,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
data.add(rate); data.add(rate);
} }
JSONObject temp = new JSONObject(); JSONObject temp = new JSONObject();
data = data.stream().sorted((log1, log2) -> log1.getString("channel").compareTo(log2.getString("channel"))).collect(Collectors.toList());
temp.put("data",data); temp.put("data",data);
temp.put("name",tName.getString(strt)); temp.put("name",tName.getString(strt));
rates.add(temp); rates.add(temp);
@ -755,7 +753,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
sysRate.put("remark", "自主申请"); sysRate.put("remark", "自主申请");
sysRate.put("create_time", new Date()); sysRate.put("create_time", new Date());
sysRate.put("update_time", new Date()); sysRate.put("update_time", new Date());
sysRate.put("active_time", DateFormatUtils.format(new Date(), "yyyy-MM-dd")); sysRate.put("active_time", DateFormatUtils.format(DateUtils.addDays(new Date(),-1), "yyyy-MM-dd"));
sysRate.put("expiry_time", DateFormatUtils.format(DateUtils.addYears(new Date(), 1), "yyyy-MM-dd")); sysRate.put("expiry_time", DateFormatUtils.format(DateUtils.addYears(new Date(), 1), "yyyy-MM-dd"));
JSONObject rateConfig = JSONObject.parseObject(sysConfig.getString("sys_apply_rates")); JSONObject rateConfig = JSONObject.parseObject(sysConfig.getString("sys_apply_rates"));

8
src/main/ui/static/payment/partner/partner.js
Unescape View File

@ -321,7 +321,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
}; };
//修改邮箱 //修改邮箱
$scope.updateEmail = function () { $scope.updateEmail = function () {
$http.put('/client/partner_info/complianceAudit').then( $http.put('/client/partner_info/compliance_audit').then(
); );
}; };
@ -355,7 +355,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
}).then(function (choice) { }).then(function (choice) {
$scope.submitted = true; $scope.submitted = true;
if (choice == 1) { if (choice == 1) {
$http.post('/client/partner_info/complianceAudit').then(function () { $http.post('/client/partner_info/compliance_audit').then(function () {
commonDialog.alert({title: 'Success', content: '已提交至合规，请耐心等待审核！', type: 'info'}); commonDialog.alert({title: 'Success', content: '已提交至合规，请耐心等待审核！', type: 'info'});
$state.reload(); $state.reload();
}, function () { }, function () {
@ -834,7 +834,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
$scope.commitPartner = function () { $scope.commitPartner = function () {
if ($scope.file) { if ($scope.file) {
if ($scope.file.file_bank_info != null && $scope.file.file_company_info != null && $scope.file.file_id_info != null && $scope.file_apply_info != null) { if ($scope.file.file_bank_info != null && $scope.file.file_company_info != null && $scope.file.file_id_info != null && $scope.file_apply_info != null) {
$http.put('/client/partner_info/complianceAudit').then(function (resp) { $http.put('/client/partner_info/compliance_audit').then(function (resp) {
}); });
} else { } else {
@ -1142,7 +1142,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
$scope.commitPartner = function () { $scope.commitPartner = function () {
if ($scope.file) { if ($scope.file) {
if ($scope.file.file_bank_info != null && $scope.file.file_company_info != null && $scope.file.file_id_info != null && $scope.file_apply_info != null) { if ($scope.file.file_bank_info != null && $scope.file.file_company_info != null && $scope.file.file_id_info != null && $scope.file_apply_info != null) {
$http.put('/client/partner_info/complianceAudit').then(function (resp) { $http.put('/client/partner_info/compliance_audit').then(function (resp) {
}); });
} else { } else {

Write Preview
Loading…
Cancel
Save