公司初始化完成

Api/src/main/java/com/java110/api/listener/store/SaveStoreServiceListener.java

@@ -0,0 +1,140 @@
+package com.java110.api.listener.store;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiDataFlowListener;
+import com.java110.common.cache.MappingCache;
+import com.java110.common.constant.*;
+import com.java110.common.util.Assert;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+
+/**
+ * 保存商户信息
+ * Created by Administrator on 2019/3/29.
+ */
+public class SaveStoreServiceListener extends AbstractServiceApiDataFlowListener {
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_SAVE_STORE_INFO;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    /**
+     * 协议：
+     * {
+     *
+     *     "businessStore": {
+     "storeId": "-1",
+     "userId": "用户ID",
+     "name": "齐天超时（王府井店）",
+     "address": "青海省西宁市城中区129号",
+     "password": "ERCBHDUYFJDNDHDJDNDJDHDUDHDJDDKDK",
+     "tel": "15897089471",
+     "storeTypeCd": "M",
+     "nearbyLandmarks": "王府井内",
+     "mapX": "101.801909",
+     "mapY": "36.597263"
+     },
+     "businessStoreAttr": [{
+     "storeId": "-1",
+     "attrId":"-1",
+     "specCd":"1001",
+     "value":"01"
+     }],
+     "businessStorePhoto":[{
+     "storePhotoId":"-1",
+     "storeId":"-1",
+     "storePhotoTypeCd":"T",
+     "photo":"12345678.jpg"
+     }],
+     "businessStoreCerdentials":[{
+     "storeCerdentialsId":"-1",
+     "storeId":"-1",
+     "credentialsCd":"1",
+     "value":"632126XXXXXXXX2011",
+     "validityPeriod":"有效期，长期有效请写3000/01/01",
+     "positivePhoto":"正面照片地址，1234567.jpg",
+     "negativePhoto":"反面照片地址，没有不填写"
+     }]
+     * }
+     * @param event
+     */
+    @Override
+    public void soService(ServiceDataFlowEvent event) {
+
+
+        //获取数据上下文对象
+        DataFlowContext dataFlowContext = event.getDataFlowContext();
+        AppService service = event.getAppService();
+        String paramIn = dataFlowContext.getReqData();
+        Assert.isJsonObject(paramIn,"添加员工时请求参数有误，不是有效的json格式 "+paramIn);
+
+        //校验json 格式中是否包含 name,email,levelCd,tel
+        Assert.jsonObjectHaveKey(paramIn,"businessStore","请求参数中未包含businessStore 节点，请确认");
+
+
+        JSONObject business = JSONObject.parseObject("{}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_STORE_INFO);
+        business.put(CommonConstant.HTTP_SEQ,1);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL,CommonConstant.HTTP_INVOKE_MODEL_S);
+
+        business.put(CommonConstant.HTTP_BUSINESS_DATAS,refreshParamIn(paramIn));
+        HttpHeaders header = new HttpHeaders();
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID,"-1");
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD,"D");
+        String paramInObj = super.restToCenterProtocol(business,dataFlowContext.getRequestCurrentHeaders()).toJSONString();
+
+        //将 rest header 信息传递到下层服务中去
+        super.freshHttpHeader(header,dataFlowContext.getRequestCurrentHeaders());
+
+        HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj, header);
+        //http://user-service/test/sayHello
+        super.doRequest(dataFlowContext, service, httpEntity);
+
+        super.doResponse(dataFlowContext);
+
+    }
+
+
+    /**
+     * 对请求报文处理
+     * @param paramIn
+     * @return
+     */
+    private JSONObject refreshParamIn(String paramIn){
+        JSONObject paramObj = JSONObject.parseObject(paramIn);
+        if(paramObj.containsKey("businessStore")){
+            JSONObject businessStoreObj = paramObj.getJSONObject("businessStore");
+            businessStoreObj.put("storeId","-1");
+            if(!businessStoreObj.containsKey("password")){
+                String staffDefaultPassword = MappingCache.getValue(MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
+                Assert.hasLength(staffDefaultPassword,"映射表中未设置员工默认密码，请检查"+MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
+                businessStoreObj.put("password",staffDefaultPassword);
+            }
+
+            if(!businessStoreObj.containsKey("mapX")){
+                businessStoreObj.put("mapX","");
+            }
+
+            if(!businessStoreObj.containsKey("mapY")){
+                businessStoreObj.put("mapY","");
+            }
+        }
+
+        return paramObj;
+    }
+
+}

WebService/src/main/java/com/java110/web/components/CompanyComponent.java

@@ -33,6 +33,22 @@ public class CompanyComponent {
         }
     }
 
+    /**
+     * 保存公司信息
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> saveCompanyInfo(IPageData pd){
+        ResponseEntity<String> responseEntity = null;
+        try{
+            responseEntity =  companyServiceSMOImpl.saveCompanyInfo(pd);
+        }catch (Exception e){
+            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }finally {
+            return responseEntity;
+        }
+    }
+
 
     public ICompanyServiceSMO getCompanyServiceSMOImpl() {
         return companyServiceSMOImpl;

WebService/src/main/java/com/java110/web/smo/ICompanyServiceSMO.java

@@ -16,4 +16,11 @@ public interface ICompanyServiceSMO {
      * @return
      */
     public ResponseEntity<String> getStoreType(IPageData pd);
+
+    /**
+     * 保存公司信息
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> saveCompanyInfo(IPageData pd);
 }

WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java

@@ -43,6 +43,30 @@ public class CompanyServiceSMOImpl extends BaseComponentSMO implements ICompanyS
         return responseEntity;
     }
 
+    /**
+     * 保存公司信息
+     * @param pd
+     * @return
+     */
+    @Autowired
+    public ResponseEntity<String> saveCompanyInfo(IPageData pd){
+        ResponseEntity<String> responseEntity = null;
+        Assert.hasLength(pd.getUserId(),"用户还未登录请先登录");
+
+        validateCompanyInfo(pd.getReqData());
+        responseEntity = this.callCenterService(restTemplate,pd,pd.getReqData(), ServiceConstant.SERVICE_API_URL+"/api/query.store.type?type=all", HttpMethod.POST);
+
+        return responseEntity;
+    }
+
+    /**
+     * 校验公司信息
+     * @param param
+     */
+    private void validateCompanyInfo(String param){
+
+    }
+
 
     public RestTemplate getRestTemplate() {
         return restTemplate;

WebService/src/main/resources/components/company-base/company-base.html

@@ -1,28 +1,28 @@
-<fieldset role="tabpanel" aria-labelledby="component-h-0" class="body current" v-bind:class="{no_display:step!=1}" aria-hidden="false">
+ <fieldset role="tabpanel" aria-labelledby="component-h-0" class="body current" v-bind:class="{no_display:step!=1}" aria-hidden="false">
     <h2>公司基本信息</h2>
     <div class="row">
         <div class="col-lg-8">
             <div class="form-group">
                 <label>公司名称 *</label>
-                <input id="name" name="name" type="text" class="form-control required" aria-required="true" />
+                <input id="name" v-model="companyBaseInfo.name" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
                 <label>公司地址 *</label>
-                <input id="address" name="address" type="text" class="form-control required" aria-required="true" />
+                <input  name="address" v-model="companyBaseInfo.address" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
                 <label>联系电话 *</label>
-                <input id="tel" name="tel" type="text" class="form-control required" aria-required="true" />
+                <input name="tel" v-model="companyBaseInfo.tel" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
                 <label>公司业务 *</label>
-                <select id="storeTypeCd" name="storeTypeCd" class="form-control  required" aria-required="true">
-                    <option v-for="storeType in storeTypes" value="storeType.storeTypeCd">{{storeType.name}}</option>
+                <select name="storeTypeCd" v-model="companyBaseInfo.storeTypeCd" class="form-control  required" aria-required="true">
+                    <option v-for="storeType in storeTypes" v-bind:value="storeType.storeTypeCd">{{storeType.name}}</option>
                 </select>
             </div>
             <div class="form-group">
                 <label>附近建筑 *</label>
-                <input id="nearbyLandmarks" name="nearbyLandmarks" type="text" class="form-control required" aria-required="true" />
+                <input name="nearbyLandmarks" v-model="companyBaseInfo.nearbyLandmarks" type="text" class="form-control required" aria-required="true" />
             </div>
         </div>
         <div class="col-lg-4">

WebService/src/main/resources/components/company-base/company-base.js

@@ -8,7 +8,11 @@
         data:{
             storeTypes:[],
             companyBaseInfo:{
-                tel:""
+                name:"",
+                address:"",
+                tel:"",
+                storeTypeCd:"",
+                nearbyLandmarks:""
             }
         },
          _initMethod:function(){
@@ -22,7 +26,12 @@
 
          },
         watch:{
-
+            companyBaseInfo:{
+                deep: true,
+                handler:function(){
+                    vc.component.$emit('companyBaseEvent',vc.component.companyBaseInfo);
+                }
+             }
         },
         methods:{
             initStoreType:function(){
@@ -44,6 +53,68 @@
                                 console.log('请求失败处理',errInfo,error);
                                 vc.component.$emit('errorInfoEvent',errInfo);
                              });
+            },
+            validateBase:function(){
+                return vc.validate.validate({
+                                    companyBaseInfo:vc.component.companyBaseInfo
+                                },{
+                                    'companyBaseInfo.name':[
+                                        {
+                                            limit:"required",
+                                            param:"",
+                                            errInfo:"公司名不能为空"
+                                        },
+                                        {
+                                            limit:"maxLength",
+                                            param:"100",
+                                            errInfo:"用户名长度必须在100位之内"
+                                        },
+                                    ],
+                                    'companyBaseInfo.address':[
+                                        {
+                                            limit:"required",
+                                            param:"",
+                                            errInfo:"地址不能为空"
+                                        },
+                                        {
+                                            limit:"maxLength",
+                                            param:"200",
+                                            errInfo:"地址长度必须在200位之内"
+                                        },
+                                    ],
+                                    'companyBaseInfo.tel':[
+                                        {
+                                            limit:"required",
+                                            param:"",
+                                            errInfo:"手机号不能为空"
+                                        },
+                                        {
+                                            limit:"phone",
+                                            param:"",
+                                            errInfo:"不是有效的手机号"
+                                        }
+                                    ],
+                                    'companyBaseInfo.storeTypeCd':[
+                                        {
+                                            limit:"required",
+                                            param:"",
+                                            errInfo:"商户类型不能为空"
+                                        }
+                                    ],
+                                    'companyBaseInfo.nearbyLandmarks':[
+                                        {
+                                            limit:"required",
+                                            param:"",
+                                            errInfo:"附近建筑不能为空"
+                                        },
+                                        {
+                                            limit:"maxLength",
+                                            param:"200",
+                                            errInfo:"地址长度必须在200位之内"
+                                        }
+                                    ],
+
+                                });
             }
         }
 

WebService/src/main/resources/components/company-cerdentials/company-cerdentials.html

@@ -4,13 +4,13 @@
         <div class="col-lg-8">
             <div class="form-group">
                 <label>证件号码 *</label>
-                <input id="name" name="name" type="text" class="form-control required" aria-required="true" />
+                <input v-model="companyCerdentialsInfo.value" type="text" class="form-control required" aria-required="true" />
             </div>
         </div>
         <div class="col-lg-8">
             <div class="form-group">
                 <label>有效期 *</label>
-                <input id="email" name="email" type="text" class="form-control required email" aria-required="true" />
+                <input v-model="companyCerdentialsInfo.validityPeriod" type="text" class="form-control required email" aria-required="true" />
             </div>
         </div>
         <div class="col-lg-8">

WebService/src/main/resources/components/company-cerdentials/company-cerdentials.js

@@ -7,23 +7,67 @@
     vc.extends({
         data:{
             companyCerdentialsInfo:{
-                tel:""
+                value:"",
+                validityPeriod:""
             }
         },
          _initMethod:function(){
 
          },
          _initEvent:function(){
-//              vc.component.$on('errorInfoEvent',function(_errorInfo){
-//                     vc.component.registerInfo.errorInfo = _errorInfo;
-//                     console.log('errorInfoEvent 事件被监听',_errorInfo)
-//                 });
+                // 证件信息
+               vc.component.$on('positivePhotoEvent',function(positivePhoto){
+                    for(var positivePhotoKey in positivePhoto){
+                         vc.component.companyCerdentialsInfo[positivePhotoKey] = positivePhoto[positivePhotoKey];
+                     }
+                      vc.component.$emit('companyCerdentialsEvent',vc.component.companyCerdentialsInfo);
+                });
 
          },
         watch:{
-
+            companyCerdentialsInfo:{
+                deep: true,
+                handler:function(){
+                    vc.component.$emit('companyCerdentialsEvent',vc.component.companyCerdentialsInfo);
+                }
+             }
         },
         methods:{
+            validateCerdentials:function(){
+                        if(!vc.component.validatePositivePhoto()){
+                            return false;
+                        }
+                        return vc.validate.validate({
+                                                               companyCerdentialsInfo:vc.component.companyCerdentialsInfo
+                                                           },{
+                                                               'companyCerdentialsInfo.value':[
+                                                                   {
+                                                                       limit:"required",
+                                                                       param:"",
+                                                                       errInfo:"证件号码不能为空"
+                                                                   },
+                                                                   {
+                                                                       limit:"maxLength",
+                                                                       param:"50",
+                                                                       errInfo:"证件号码长度必须在50位之内"
+                                                                   },
+                                                               ],
+
+                                                               'companyCerdentialsInfo.validityPeriod':[
+                                                                   {
+                                                                       limit:"required",
+                                                                       param:"",
+                                                                       errInfo:"成立时间不能为空"
+                                                                   },
+                                                                   {
+                                                                       limit:"date",
+                                                                       param:"",
+                                                                       errInfo:"不是有效的日期，例如：2019-03-29"
+                                                                   }
+                                                               ]
+
+                                                           });
+                    }
 
         }
 

WebService/src/main/resources/components/company-extend/company-extend.html

@@ -4,24 +4,24 @@
         <div class="col-lg-8">
             <div class="form-group">
                 <label>公司法人 *</label>
-                <input  name="name" type="text" class="form-control required" aria-required="true" />
+                <input  v-model="companyExtendInfo.corporation" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
                 <label>注册资本 *</label>
-                <input  name="address" type="text" class="form-control required" aria-required="true" />
+                <input  v-model="companyExtendInfo.registeredCapital" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
                 <label>成立日期 *</label>
-                <input  name="tel" type="text" class="form-control required" aria-required="true" />
+                <input  v-model="companyExtendInfo.foundingTime" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
                 <label>登记机关 *</label>
-                <input  name="tel" type="text" class="form-control required" aria-required="true" />
+                <input  v-model="companyExtendInfo.registrationAuthority" type="text" class="form-control required" aria-required="true" />
 
             </div>
             <div class="form-group">
                 <label>经营范围 *</label>
-                <input  name="nearbyLandmarks" type="text" class="form-control required" aria-required="true" />
+                <input  v-model="companyExtendInfo.scope" type="text" class="form-control required" aria-required="true" />
             </div>
         </div>
         <div class="col-lg-4">

WebService/src/main/resources/components/company-extend/company-extend.js

@@ -8,7 +8,11 @@
         data:{
             storeTypes:[],
             companyExtendInfo:{
-                tel:""
+                corporation:"",
+                registeredCapital:"",
+                foundingTime:"",
+                registrationAuthority:"",
+                scope:""
             }
         },
          _initMethod:function(){
@@ -22,9 +26,81 @@
 
          },
         watch:{
-
+            companyExtendInfo:{
+                deep: true,
+                handler:function(){
+                    vc.component.$emit('companyExtendEvent',vc.component.companyExtendInfo);
+                }
+             }
         },
         methods:{
+            validateExtend:function(){
+                return vc.validate.validate({
+                                                       companyExtendInfo:vc.component.companyExtendInfo
+                                                   },{
+                                                       'companyExtendInfo.corporation':[
+                                                           {
+                                                               limit:"required",
+                                                               param:"",
+                                                               errInfo:"法人不能为空"
+                                                           },
+                                                           {
+                                                               limit:"maxLength",
+                                                               param:"50",
+                                                               errInfo:"法人长度必须在50位之内"
+                                                           },
+                                                       ],
+                                                       'companyExtendInfo.registeredCapital':[
+                                                           {
+                                                               limit:"required",
+                                                               param:"",
+                                                               errInfo:"注册资本不能为空"
+                                                           },
+                                                           {
+                                                               limit:"num",
+                                                               param:"50",
+                                                               errInfo:"注册资本必须是数字"
+                                                           },
+                                                       ],
+                                                       'companyExtendInfo.foundingTime':[
+                                                           {
+                                                               limit:"required",
+                                                               param:"",
+                                                               errInfo:"成立时间不能为空"
+                                                           },
+                                                           {
+                                                               limit:"date",
+                                                               param:"",
+                                                               errInfo:"不是有效的日期，例如：2019-03-29"
+                                                           }
+                                                       ],
+                                                       'companyExtendInfo.registrationAuthority':[
+                                                           {
+                                                               limit:"required",
+                                                               param:"",
+                                                               errInfo:"登记机关不能为空"
+                                                           },
+                                                           {
+                                                               limit:"maxLength",
+                                                               param:"50",
+                                                               errInfo:"登记机关长度必须在50位之内"
+                                                           }
+                                                       ],
+                                                       'companyExtendInfo.scope':[
+                                                           {
+                                                               limit:"required",
+                                                               param:"",
+                                                               errInfo:"经营范围不能为空"
+                                                           },
+                                                           {
+                                                               limit:"maxLength",
+                                                               param:"50",
+                                                               errInfo:"经营范围长度必须在50位之内"
+                                                           }
+                                                       ],
+
+                                                   });
+            }
 
         }
 

WebService/src/main/resources/components/company/company.html

@@ -15,7 +15,9 @@
                     <p>
                         请仔细填写公司相关信息，有利于快速审核
                     </p>
+
                     <form id="component" class="wizard-big wizard clearfix" role="application" novalidate="novalidate">
+                        <p style="color: red;">{{companyInfo.errorInfo}}</p>
                         <div class="steps clearfix">
                             <ul role="tablist">
                                 <li role="tab" v-bind:class="{ current: step==1,disabled:step!=1 }" >

WebService/src/main/resources/components/company/company.js

@@ -8,17 +8,31 @@
         data:{
             step:1,
             companyInfo:{
-                tel:""
+                errorInfo:""
             }
         },
          _initMethod:function(){
              //vc.component.initStoreType();
          },
          _initEvent:function(){
-//              vc.component.$on('errorInfoEvent',function(_errorInfo){
-//                     vc.component.registerInfo.errorInfo = _errorInfo;
-//                     console.log('errorInfoEvent 事件被监听',_errorInfo)
-//                 });
+              //监听 公司基本信息
+              vc.component.$on('companyBaseEvent',function(companyBase){
+                     for(var companyBaseKey in companyBase){
+                          vc.component.companyInfo[companyBaseKey] = companyBase[companyBaseKey];
+                      }
+                 });
+              // 扩展信息
+              vc.component.$on('companyExtendEvent',function(companyExtend){
+                   for(var companyExtendKey in companyExtend){
+                        vc.component.companyInfo[companyExtendKey] = companyExtend[companyExtendKey];
+                    }
+               });
+               // 证件信息
+             vc.component.$on('companyCerdentialsEvent',function(companyCerdentials){
+                  for(var companyCerdentialsKey in companyCerdentials){
+                       vc.component.companyInfo[companyCerdentialsKey] = companyCerdentials[companyCerdentialsKey];
+                   }
+              });
 
          },
         watch:{
@@ -27,7 +41,23 @@
         methods:{
 
             next:function(){
+                //第一步
+                if(vc.component.step == 1 && !vc.component.validateBase()){
+                    vc.component.companyInfo.errorInfo = vc.validate.errInfo;
+                    return ;
+                }
+                //第二步
+                if(vc.component.step == 2 && !vc.component.validateExtend()){
+                    vc.component.companyInfo.errorInfo = vc.validate.errInfo;
+                    return ;
+                }
+                //第三步
+                if(vc.component.step == 3 && !vc.component.validateCerdentials()){
+                    vc.component.companyInfo.errorInfo = vc.validate.errInfo;
+                    return ;
+                }
                 if(vc.component.step<4){
+                    vc.component.companyInfo.errorInfo = '';
                     vc.component.step = vc.component.step+1;
                 }
 
@@ -40,7 +70,28 @@
             },
             finish:function(){
                 //这里写提交代码
-                console.log("提交审核");
+                console.log("提交审核",vc.component.companyInfo);
+                vc.http.post(
+                            'company',
+                            'saveCompanyInfo',
+                            JSON.stringify(vc.component.companyInfo),
+                            {
+                                emulateJSON:true
+                             },
+                             function(json,res){
+                                //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                                if(res.status == 200){
+                                    vc.jumpToPage("/");
+                                    return ;
+                                }
+                                vc.component.companyInfo.errorInfo = json;
+                             },
+                             function(errInfo,error){
+                                console.log('请求失败处理');
+
+                                vc.component.companyInfo.errorInfo = errInfo;
+                             });
+
             }
         }
 

WebService/src/main/resources/components/positive-photo/positive-photo.js

@@ -18,7 +18,12 @@
 
          },
         watch:{
-
+            positivePhotoInfo:{
+                deep: true,
+                handler:function(){
+                    vc.component.$emit('positivePhotoEvent',vc.component.positivePhotoInfo);
+                }
+             }
         },
         methods:{
 
@@ -39,8 +44,21 @@
                             vc.component.positivePhotoInfo.chooseFlag = 1;
                         }
                     }
-            }
+            },
+            validatePositivePhoto:function(){
+                return vc.validate.validate({
+                                                   positivePhotoInfo:vc.component.positivePhotoInfo
+                                               },{
+                                                   'positivePhotoInfo.imgInfo':[
+                                                       {
+                                                           limit:"required",
+                                                           param:"",
+                                                           errInfo:"未上传证件照"
+                                                       }
+                                                   ],
 
+                                               });
+            }
         }
 
     });

WebService/src/main/resources/static/js/vc-validate.js

@@ -100,6 +100,10 @@ vc 校验 工具类 -method
         num:function(text){
             var regNum = /^[0-9]+$/;
             return regNum.test(text);
+        },
+        date:function(str) {
+            var regDate = /^(\d{4})-(\d{2})-(\d{2})$/;
+            return regDate.test(str);
         }
 
     };
@@ -193,6 +197,10 @@ vc 校验 工具类 -method
                     if(configObj.limit == 'num'){
                         validate.setState(validate.num(tmpDataObj),configObj.errInfo);
                     }
+
+                    if(configObj.limit == 'date'){
+                        validate.setState(validate.date(tmpDataObj),configObj.errInfo);
+                    }
                 });
 
             }