提交

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/AuthenticationController.java

@@ -47,6 +47,26 @@ public class AuthenticationController {
         return authenticationService.addAuthenticationPerson(token, employAuthenticationPerson);
     }
 
+    //lzx:我的服务-查询实名认证信息
+    @ApiOperation(value="我的服务-查询实名认证信息", notes="我的服务-查询实名认证信息")
+    @RequestMapping(value = "/getAuthenticationPerson", method = {RequestMethod.GET})
+    public Result<?> getAuthenticationPerson(@RequestHeader("X-Access-Token") String token){
+        //业务处理
+        return authenticationService.getAuthenticationPerson(token);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
     //我的服务-企业实名认证
     @ApiOperation(value="我的服务-企业实名认证", notes="我的服务-企业实名认证")
     @RequestMapping(value = "/addAuthenticationCompany", method = {RequestMethod.POST})

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java

@@ -37,4 +37,12 @@ public class UserController {
         return userInfoService.updateUserInfo(token, nickName, phone, headImage);
     }
 
+
+    //获取个人中心基础数据信息
+    @ApiOperation(value="获取个人中心基础数据信息", notes="获取个人中心基础数据信息")
+    @RequestMapping(value = "/getUserCenterData", method = {RequestMethod.GET})
+    public Result<?> getUserCenterData(@RequestHeader("X-Access-Token") String token){
+    	return userInfoService.getUserCenterData(token);
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiService.ShareService;
 import org.jeecg.modules.apiService.VipService;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,7 +28,7 @@ public class VipController {
     //开通VIP
     @ApiOperation(value="开通VIP", notes="开通VIP")
     @RequestMapping(value = "/addVIP", method = {RequestMethod.POST})
-    public Result<?> addVIP(String token){
+    public Result<?> addVIP(@RequestHeader("X-Access-Token") String token){
         return vipService.addVIP(token);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AuthenticationService.java

@@ -15,6 +15,10 @@ public interface AuthenticationService {
      */
     public Result<?> addAuthenticationPerson(@RequestHeader("X-Access-Token") String token, EmployAuthenticationPerson employAuthenticationPerson);
 
+    //lzx:我的服务-查询实名认证信息
+    public Result<?> getAuthenticationPerson(@RequestHeader("X-Access-Token") String token);
+
+
     /**
      * 我的服务-企业实名认证
      * @param token

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.apiService;
 
 
 import org.jeecg.common.api.vo.Result;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * 个人信息接口补充：lzx
@@ -9,8 +10,11 @@ import org.jeecg.common.api.vo.Result;
 public interface UserInfoService {
 
     //lzx:查询个人信息接口
-    public Result<?> queryUserInfo(String token);
+    Result<?> queryUserInfo(String token);
 
     //lzx:修改个人信息接口
-    public Result<?> updateUserInfo(String token,String nickName,String phone,String headImage);
+    Result<?> updateUserInfo(String token,String nickName,String phone,String headImage);
+
+    //lzx：获取个人中心基础数据信息
+    Result<?> getUserCenterData(String token);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java

@@ -35,18 +35,34 @@ public class AuthenticationServiceImpl implements AuthenticationService {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-        employAuthenticationPerson.setUserId(hanHaiMember.getId());
-        boolean result = employAuthenticationPersonService.save(employAuthenticationPerson);
-
-        if(result){
-            message = "个人实名添加成功！";
+        EmployAuthenticationPerson one = employAuthenticationPersonService.lambdaQuery()
+                .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId())
+                .one();
+        //如果存在则修改信息
+        if(null != one){
+            employAuthenticationPerson.setId(one.getId());
+            employAuthenticationPersonService.updateById(employAuthenticationPerson);
+            message = "个人实名修改成功！";
         }else {
-            message = "个人实名添加失败！";
+            employAuthenticationPerson.setUserId(hanHaiMember.getId());
+            boolean result = employAuthenticationPersonService.save(employAuthenticationPerson);
+            message = "个人实名添加成功！";
         }
-
         return Result.OK(message);
     }
 
+
+    //lzx:我的服务-查询实名认证信息
+    @Override
+    public Result<?> getAuthenticationPerson(String token) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        EmployAuthenticationPerson one = employAuthenticationPersonService.lambdaQuery()
+                .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId())
+                .one();
+        return Result.OK("实名认证信息", one);
+    }
+
     //会员中心-企业实名认证
     @Override
     public Result<?> addAuthenticationCompany(String token, EmployAhthenticationCompany employAhthenticationCompany) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java

@@ -10,6 +10,8 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class UserInfoServiceImpl implements UserInfoService {
@@ -22,6 +24,9 @@ public class UserInfoServiceImpl implements UserInfoService {
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
 
+
+
+
     @Override
     public Result<?> queryUserInfo(String token){
         //权限验证
@@ -30,6 +35,7 @@ public class UserInfoServiceImpl implements UserInfoService {
         return Result.OK(byId);
     }
 
+    @Override
     public Result<?> updateUserInfo(String token,String nickName,String phone,String headImage){
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
@@ -41,11 +47,25 @@ public class UserInfoServiceImpl implements UserInfoService {
             return Result.error("头像不能为空");
         }
 
-        hanHaiMember.setName(nickName);
+        hanHaiMember.setNickName(nickName);
         hanHaiMember.setPhone(phone);
         hanHaiMember.setHeadImage(headImage);
         hanHaiMemberService.updateById(hanHaiMember);
 
         return Result.OK("修改成功");
     }
+
+
+
+    //lzx：获取个人中心基础数据信息
+    @Override
+    public Result<?> getUserCenterData(String token){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Map map = new HashMap();
+        map.put("integerNum",hanHaiMember.getIntegerPrice());
+        map.put("scNum",0);
+        map.put("lxNum",0);
+        return Result.OK("获取个人中心基础数据信息",map);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java

@@ -32,7 +32,7 @@ public class VipServiceImpl implements VipService {
         //吊起微信支付
         BigDecimal price = BigDecimal.valueOf(0.01);//价格
         String productName = "VIP";
-        String orderId = "";
+        String orderId = System.currentTimeMillis()+"";
 
         String s = price.multiply(new BigDecimal(100)).toString();
         int i1 = Double.valueOf(s).intValue();
@@ -43,7 +43,7 @@ public class VipServiceImpl implements VipService {
                 i1,
                 orderId,
                 hanHaiMember.getAppletOpenid(),
-                "订单对象");
+                "{}");
 
         return Result.OK("支付成功",appOrder);
     }