Merge branch 'develop_T1068_client_apply' of https://pms.globalfreepay.com/source/royalpay.manage into develop_T1068_client_apply

# Conflicts:
#	src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java

src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyService.java

@@ -35,6 +35,8 @@ public interface SimpleClientApplyService {
 
     JSONObject getClientAggregateFile(String username, MultipartFile file,String clean_days) throws IOException;
 
+    JSONObject getPreApplyInfoForAggree(String username ,String clean_days);
+
     JSONObject getBankInfo(String bsb_no);
 
     void checkAccountName(String contact_phone,String nation_code);

src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

@@ -345,6 +345,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         }
     }
 
+    @Override
     public JSONObject getPreApplyInfoForAggree(String username ,String clean_days) {
 
         JSONObject apply = sysClientPreMapperMapper.findByUserName(username);

src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java

@@ -74,12 +74,10 @@ public class SimpleClientApplyController {
         simpleClientApplyService.saveOrUpdateApplyInfo(applyBean.insertObject(), username);
     }
 
-    @PostMapping(value = "/clientCompliance/{clientMoniker}/commit_aggregate_file")
+    @PostMapping(value = "/clientCompliance/{username}/commit_aggregate_file{clean_days}")
     @ResponseBody
-    public JSONObject getClientArregateFile(@RequestParam MultipartFile file, @RequestHeader("User-Agent") String userAgent, HttpServletRequest request) throws IOException {
+    public JSONObject getClientArregateFile(@RequestParam MultipartFile file,@PathVariable String username,@PathVariable String clean_days) throws IOException {
-        //这个是上传合同的接口，现在为了测试方便，返回一个带上传url的JSONObject，需要传入username，clean_days，签名图片
+        //这个是上传合同的接口，现在为了测试方便，返回一个带合同url的JSONObject，需要传入username，clean_days，签名图片
-        String username = "111";
-        String clean_days = "11";
         return simpleClientApplyService.getClientAggregateFile(username, file,clean_days);
     }
 

src/main/ui/merchant_application.html

@@ -351,22 +351,6 @@
                             </div>
                         </div>
 
-                        <div class="form-group">
-                            <label class="control-label col-sm-2">* Logo</label>
-                            <div class="col-sm-8">
-                                <div class="form-control-static">
-                                    <button class="btn btn-success" type="button"
-                                            ngf-select="uploadLogo($file)"
-                                            accept="image/*">
-                                        <i class="fa fa-upload"></i> Upload Logo
-                                    </button>
-                                </div>
-                                <uib-progressbar value="logoProgress.value"
-                                                 ng-if="logoProgress"></uib-progressbar>
-                                <img ng-src="{{partner.logo_url}}" ng-if="partner.logo_url" style="height: 100px;">
-                            </div>
-                        </div>
-
                         <div class="row">
                             <div class="col-xs-12 margin-bottom">
                                 <button type="button" class="btn btn-success btn-block btn-flat"