diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java index e286582..77b3fd3 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java @@ -3,6 +3,7 @@ package cn.chjyj.szwh.controller.admin; import cn.chjyj.szwh.bean.AccountRatioDetail; import cn.chjyj.szwh.controller.BaseController; import cn.chjyj.szwh.service.AccountCloseService; +import cn.chjyj.szwh.service.UserService; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +22,8 @@ import java.util.Map; public class AdminAccountCloseController extends BaseController { @Autowired private AccountCloseService accountCloseService; - + @Autowired + private UserService userService; /** * 资金结算对账账单列表 @@ -81,7 +83,9 @@ public class AdminAccountCloseController extends BaseController { */ @RequestMapping("/getCloseAccountInfo") public JSONObject getCloseAccountInfo(@RequestParam("user_isli") String userIsli){ - + // 返回用户的信息 + Map usinfo = userService.getUserInfo(userIsli); + jsonObject.put("data",usinfo); jsonObject.put("code",200); jsonObject.put("msg","成功"); return jsonObject; diff --git a/src/main/java/cn/chjyj/szwh/service/UserService.java b/src/main/java/cn/chjyj/szwh/service/UserService.java index b8b954f..5ca19b8 100644 --- a/src/main/java/cn/chjyj/szwh/service/UserService.java +++ b/src/main/java/cn/chjyj/szwh/service/UserService.java @@ -37,4 +37,11 @@ public interface UserService { * @return */ int addUser(User user); + + /** + * 返回用户信息 + * @param userIsli + * @return + */ + Map getUserInfo(String userIsli); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java index bcc4631..6f11833 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java @@ -79,4 +79,52 @@ public class UserServiceImpl implements UserService { public int addUser(User user) { return userMapper.addUser(user); } + + @Override + public Map getUserInfo(String userIsli) { + String token = SignUtils.createSign("user_real"); + Map apimap = getApiUser(userIsli,token); + String utype= (String)apimap.get("userType"); + // + Map retmap =new HashMap(); + if("机构".equals(utype)){ + retmap.put("agency_type", 2); + retmap.put("attest_status",(Integer)apimap.get("state") + 1); + retmap.put("user_isli",apimap.get("islicode")); + retmap.put("username",apimap.get("name")); + retmap.put("institution_code",apimap.get("uscc")); + retmap.put("legals_name" ,apimap.get("legalsName")); + retmap.put("legals_type" ,apimap.get("legalsType")); + retmap.put("legals_idnum" ,apimap.get("legalsIdnum")); + retmap.put("legals_phone" ,apimap.get("legalsCellPhone")); + retmap.put("bank_account" ,apimap.get("publicAccount")); + retmap.put("bank_card_type" ,apimap.get("bankCardType")); + retmap.put("bank_name" ,apimap.get("bankName")); + retmap.put("bank_type" ,apimap.get("bankType")); + retmap.put("bank_username" ,apimap.get("bankAccountName")); + retmap.put("bank_userid" ,apimap.get("certIdnum")); + retmap.put("bank_userphone" ,apimap.get("bankCellPhone")); + retmap.put("bank_address" ,apimap.get("bankAddress")); + }else{ + retmap.put("agency_type",1); + retmap.put("attest_status",(Integer)apimap.get("state") + 1); + retmap.put("user_isli",apimap.get("islicode")); + retmap.put("username",apimap.get("name")); + retmap.put("user_isli",apimap.get("islicode")); + retmap.put("username" ,apimap.get("name")); + retmap.put("cert_type" ,apimap.get("certType")); + retmap.put("idNumber" ,apimap.get("idNumber")); + retmap.put("cell_phone" ,apimap.get("cellPhone")); + retmap.put("bank_account" ,apimap.get("publicAccount")); + retmap.put("bank_card_type" ,apimap.get("bankCardType")); + retmap.put("bank_name" ,apimap.get("bankName")); + retmap.put("bank_type" ,apimap.get("bankType")); + retmap.put("bank_username" ,apimap.get("bankAccountName")); + retmap.put("bank_userid" ,apimap.get("certIdnum")); + retmap.put("bank_userphone" ,apimap.get("bankCellPhone")); + retmap.put("bank_address" ,apimap.get("bankAddress")); + + } + return retmap; + } }