1、企业信息表添加背景图片字段

2、获取用户信息接口添加个人实名信息

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/controller/EmployCompanyController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-21
+ * @Date:   2024-12-30
  * @Version: V1.0
  */
 @Api(tags="企业信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/entity/EmployCompany.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-21
+ * @Date:   2024-12-30
  * @Version: V1.0
  */
 @Data
@@ -83,6 +83,10 @@ public class EmployCompany implements Serializable {
 	@Excel(name = "logo", width = 15)
     @ApiModelProperty(value = "logo")
     private java.lang.String logo;
+	/**企业背景图片*/
+	@Excel(name = "企业背景图片", width = 15)
+    @ApiModelProperty(value = "企业背景图片")
+    private java.lang.String imageBackground;
 	/**所属行业*/
 	@Excel(name = "所属行业", width = 15)
     @ApiModelProperty(value = "所属行业")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/mapper/EmployCompanyMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-21
+ * @Date:   2024-12-30
  * @Version: V1.0
  */
 public interface EmployCompanyMapper extends BaseMapper<EmployCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/service/IEmployCompanyService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-21
+ * @Date:   2024-12-30
  * @Version: V1.0
  */
 public interface IEmployCompanyService extends IService<EmployCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/service/impl/EmployCompanyServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-21
+ * @Date:   2024-12-30
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/vue/EmployCompanyList.vue

@@ -181,7 +181,14 @@
           {
             title:'logo',
             align:"center",
-            dataIndex: 'logo'
+            dataIndex: 'logo',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'企业背景图片',
+            align:"center",
+            dataIndex: 'imageBackground',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'所属行业',
@@ -236,6 +243,7 @@
         fieldList.push({type:'string',value:'phone',text:'公司电话',dictCode:''})
         fieldList.push({type:'string',value:'socialCode',text:'统一社会信用代码',dictCode:''})
         fieldList.push({type:'Text',value:'logo',text:'logo',dictCode:''})
+        fieldList.push({type:'Text',value:'imageBackground',text:'企业背景图片',dictCode:''})
         fieldList.push({type:'string',value:'industry',text:'所属行业',dictCode:''})
         fieldList.push({type:'string',value:'financing',text:'融资轮数',dictCode:''})
         this.superFieldList = fieldList

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/vue/modules/EmployCompanyForm.vue

@@ -45,7 +45,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="logo" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logo">
-              <a-input v-model="model.logo" placeholder="请输入logo"  ></a-input>
+              <j-image-upload isMultiple  v-model="model.logo" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="企业背景图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageBackground">
+              <j-image-upload isMultiple  v-model="model.imageBackground" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/vue3/EmployCompany.data.ts

@@ -49,7 +49,14 @@ export const columns: BasicColumn[] = [
    {
     title: 'logo',
     align:"center",
-    dataIndex: 'logo'
+    dataIndex: 'logo',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '企业背景图片',
+    align:"center",
+    dataIndex: 'imageBackground',
+    customRender:render.renderAvatar,
    },
    {
     title: '所属行业',
@@ -120,7 +127,16 @@ export const formSchema: FormSchema[] = [
   {
     label: 'logo',
     field: 'logo',
-    component: 'Input',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '企业背景图片',
+    field: 'imageBackground',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
     label: '所属行业',

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

@@ -8,6 +8,7 @@ import org.jeecg.modules.apiService.CompanyService;
 import org.jeecg.modules.apiService.JobService;
 import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
 import org.jeecg.modules.employCompany.entity.EmployCompany;
+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;
@@ -25,13 +26,13 @@ public class CompanyController {
 
     @ApiOperation(value="查看企业信息", notes="查看企业信息")
     @RequestMapping(value = "/queryCompany", method = {RequestMethod.GET})
-    public Result<?> queryCompany(String token, String companyId){
+    public Result<?> queryCompany(@RequestHeader("X-Access-Token") String token, String companyId){
         return companyService.queryCompany(token, companyId);
     }
 
     @ApiOperation(value="修改企业信息", notes="修改企业信息")
     @RequestMapping(value = "/updateCompany", method = {RequestMethod.POST})
-    public Result<?> updateCompany(String token, EmployCompany company){
+    public Result<?> updateCompany(@RequestHeader("X-Access-Token") String token, EmployCompany company){
         return companyService.updateCompany(token,company);
     }
 

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

@@ -35,7 +35,7 @@ public class JobController {
     //工作信息-根据Id查看工作详情
     @ApiOperation(value="工作信息-根据Id查看工作详情", notes="工作信息-根据Id查看工作详情")
     @RequestMapping(value = "/queryJobById", method = {RequestMethod.GET})
-    public Result<?> queryJobById(String token, String jobId){
+    public Result<?> queryJobById(@RequestHeader("X-Access-Token")String token, String jobId){
         return jobService.queryJobById(token, jobId);
     }
 

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

@@ -48,8 +48,8 @@ public class UserController {
     //获取个人相关信息
     @ApiOperation(value="获取个人相关信息", notes="获取个人相关信息")
     @RequestMapping(value = "/getDataByUserId", method = {RequestMethod.GET})
-    public Result<?> getDataByUserId(@RequestHeader("X-Access-Token") String token){
-        return userInfoService.getDataByUserId(token);
+    public Result<?> getDataByUserId(String userId){
+        return userInfoService.getDataByUserId(userId);
     }
 
 }

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

@@ -6,10 +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;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -32,4 +29,10 @@ public class VipController {
         return vipService.addVIP(token, vipTypeId);
     }
 
+    //支付回调
+    @PostMapping("/payNotify")
+    public Object payNotify(@RequestBody String requestBody){
+        return vipService.payNotify(requestBody);
+    }
+
 }

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

@@ -19,5 +19,5 @@ public interface UserInfoService {
     Result<?> getUserCenterData(String token);
 
     //根据userId查询个人相关信息
-    public Result<?> getDataByUserId(String token);
+    public Result<?> getDataByUserId(String userId);
 }

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

@@ -7,4 +7,7 @@ public interface VipService {
     //开通VIP
     public Result<?> addVIP(String token, String vipTypeId);
 
+    //支付回调
+    Object payNotify(String requestBody);
+
 }

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

@@ -212,9 +212,7 @@ public class UserInfoServiceImpl implements UserInfoService {
     }
 
    //根据招聘人id查询招聘人信息
-   public Result<?> getDataByUserId(String token){
-       //权限验证
-       HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+   public Result<?> getDataByUserId(String userId){
         //返回信息
        String message = "";
        //返回数据
@@ -222,11 +220,18 @@ public class UserInfoServiceImpl implements UserInfoService {
 
        try{
            //招聘者信息
+           HanHaiMember hanHaiMember = hanHaiMemberService.getById(userId);
            map.put("userInfo", hanHaiMember);
+           //获取招聘者实名信息
+           EmployAuthenticationPerson ahthenticationPerson = employAuthenticationPersonService
+                   .lambdaQuery()
+                   .eq(EmployAuthenticationPerson::getUserId, userId)
+                   .one();
+           map.put("ahthenticationPerson", ahthenticationPerson);
            //招聘者企业实名信息
            EmployAhthenticationCompany ahthenticationCompany = employAhthenticationCompanyService
                    .lambdaQuery()
-                   .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId())
+                   .eq(EmployAhthenticationCompany::getUserId, userId)
                    .one();
            map.put("ahthenticationCompany", ahthenticationCompany);
            //招聘者企业信息

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

@@ -1,10 +1,14 @@
 package org.jeecg.modules.apiService.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiService.VipService;
 import org.jeecg.modules.employVipRecord.entity.EmployVipRecord;
+import org.jeecg.modules.employVipRecord.service.IEmployVipRecordService;
 import org.jeecg.modules.employVipType.entity.EmployVipType;
 import org.jeecg.modules.employVipType.service.IEmployVipTypeService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -15,6 +19,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 
+@Slf4j
 @Service
 public class VipServiceImpl implements VipService {
 
@@ -26,9 +31,13 @@ public class VipServiceImpl implements VipService {
     @Resource
     private ShiroRealm shiroRealm;
 
-    //权限验证
+    //会员类型
     @Resource
     private IEmployVipTypeService employVipTypeService;
+
+    //会员订单记录
+    @Resource
+    private IEmployVipRecordService employVipRecordService;
     /******************************************************************************************************************/
 
     @Override
@@ -37,34 +46,62 @@ public class VipServiceImpl implements VipService {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-        //生成订单信息
-        EmployVipRecord vipRecord = new EmployVipRecord();
-        String payNo = IdWorker.getIdStr();//生成订单号
-        vipRecord.setPayNo(payNo);//订单号
-        vipRecord.setUserId(hanHaiMember.getId());//关联用户id
-        vipRecord.setVipTypeId(vipTypeId);//会员类型id
-
-        //根据会员类型查询会员名称
-        EmployVipType vipType = employVipTypeService
-                .lambdaQuery()
-                .eq(EmployVipType::getId, vipTypeId)
-                .one();
-
-        //吊起微信支付
-        BigDecimal price = vipType.getPrice();//价格
-        String productName = vipType.getName();//vip类型
-
-        String s = price.multiply(new BigDecimal(100)).toString();
-        int i1 = Double.valueOf(s).intValue();
-        Object appOrder = mpWxPayService.createOrder(
-                "购买"+ productName ,
-                "127.0.0.1",
-                payNo,
-                i1,
-                payNo,
-                hanHaiMember.getAppletOpenid(),
-                vipRecord.toString());
-
-        return Result.OK("支付成功",appOrder);
+        try{
+            //生成订单信息
+            EmployVipRecord vipRecord = new EmployVipRecord();
+            String payNo = IdWorker.getIdStr();//生成订单号
+            vipRecord.setPayNo(payNo);//订单号
+            vipRecord.setUserId(hanHaiMember.getId());//关联用户id
+            vipRecord.setVipTypeId(vipTypeId);//会员类型id
+
+            //添加订单记录
+            employVipRecordService.save(vipRecord);
+
+            //根据会员类型查询会员名称
+            EmployVipType vipType = employVipTypeService
+                    .lambdaQuery()
+                    .eq(EmployVipType::getId, vipTypeId)
+                    .one();
+
+            //吊起微信支付
+            BigDecimal price = vipType.getPrice();//价格
+            String productName = vipType.getName();//vip类型
+
+            String s = price.multiply(new BigDecimal(100)).toString();
+            int i1 = Double.valueOf(s).intValue();
+            Object appOrder = mpWxPayService.createOrder(
+                    "购买"+ productName ,
+                    "127.0.0.1",
+                    payNo,
+                    i1,
+                    payNo,
+                    hanHaiMember.getAppletOpenid(),
+                    vipRecord.toString());
+
+            return Result.OK("支付成功",appOrder);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("开通vip失败");
+        }
+    }
+
+    //开通vip-支付回调
+    public Result<?> payNotify(String requestBody){
+        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
+        String outTradeNo = notify.getOutTradeNo();
+        log.info("支付回调订单号码："+outTradeNo);
+        //查询订单信息
+        EmployVipRecord vipRecord = employVipRecordService.getById(outTradeNo);
+        //如果订单存在则修改订单状态
+        if (vipRecord!=null){
+            if("0".equals(vipRecord.getStatus())){
+                vipRecord.setStatus("1");
+            }
+            employVipRecordService.updateById(vipRecord);
+        }
+
+        return null;
     }
+
+
 }