志愿者申请提现

leromro-core/src/main/java/com/leromro/core/controller/TencentFaceController.java

@@ -1,6 +1,7 @@
 package com.leromro.core.controller;
 
 
+import com.alibaba.fastjson2.JSONObject;
 import com.leromro.common.core.domain.R;
 import com.leromro.common.utils.EIDUtil;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
@@ -72,7 +73,7 @@ public class TencentFaceController {
         try {
             // Step 3. 调用接口
             GetEidResultResponse response = faceidClient.GetEidResult(request);
-            System.out.println("SDK response: " + GetEidResultResponse.toJsonString(response));
+            System.out.println("SDKResponse: " + GetEidResultResponse.toJsonString(response));
             /** 解密用户姓名和身份证信息 */
             // 上述2.3 查看并保留私钥过程中获取到的priv内容，去掉冒号，即为PrivateKey的值
             String PrivateKeyHex = "4157f6f7151a1d192f9bee771e37c1e5deae53916408ae098968c0d0fa770dce";
@@ -82,7 +83,9 @@ public class TencentFaceController {
             String UserInfo = response.getEidInfo().getUserInfo();
             // 调用EIDUtil解密用户信息
             byte[] b = EIDUtil.decodeUserInfo(PrivateKeyHex, DesKey, UserInfo);
-            System.out.println(new String(b));
+            JSONObject jsonObject = JSONObject.parseObject(new String(b));
+            String name = jsonObject.getString("name");     // 王文龙
+            String idNum = jsonObject.getString("idnum");
             return R.ok("校验成功");
         } catch (TencentCloudSDKException e) {
             // 调用接口异常在这里处理

leromro-core/src/main/java/com/leromro/core/controller/VolunteerTakeRecordController.java

@@ -61,13 +61,13 @@ public class VolunteerTakeRecordController extends BaseController
 
 
     /**
-     * 获取志愿者提现申请记录详细信息
+     * 获取志愿者提现申请详细信息
      */
-    @ApiOperation("获取志愿者提现申请记录详细信息")
+    @ApiOperation("获取志愿者提现申请详细信息")
     @GetMapping(value = "/{volunteerTakeRecordId}")
     public R<VolunteerTakeRecord> getInfo(@PathVariable("volunteerTakeRecordId") Long volunteerTakeRecordId)
     {
-        return R.ok(volunteerTakeRecordService.selectVolunteerTakeRecordByVolunteerTakeRecordId(volunteerTakeRecordId));
+        return R.ok(volunteerTakeRecordService.getById(volunteerTakeRecordId));
     }
 
     /**

leromro-core/src/main/java/com/leromro/core/domain/VolunteerFaceRecord.java

@@ -34,10 +34,6 @@ public class VolunteerFaceRecord extends BaseEntity
     @ApiModelProperty("志愿者id")
     private Long volunteerId;
 
-    @TableField("is_successful")
-    @ApiModelProperty("人脸核身是否成功（0-否；1-是）")
-    private String isSuccessful;
-
     @TableField("name")
     @ApiModelProperty("志愿者姓名")
     private String name;

leromro-core/src/main/java/com/leromro/core/facade/VolunteerAccountFacade.java

@@ -80,7 +80,7 @@ public class VolunteerAccountFacade {
     }
 
 
-    public R getWithdrawStatus() {
+    public R<String> getWithdrawStatus() {
         int count = volunteerTakeRecordService.count(new LambdaQueryWrapper<VolunteerTakeRecord>()
                 .eq(VolunteerTakeRecord::getVolunteerUserId, SecurityUtils.getUserId())
                 .eq(VolunteerTakeRecord::getAppStatus, "1"));

leromro-core/src/main/java/com/leromro/core/mapper/VolunteerTakeRecordMapper.java

@@ -12,13 +12,7 @@ import com.leromro.core.domain.VolunteerTakeRecord;
  */
 public interface VolunteerTakeRecordMapper extends BaseMapper<VolunteerTakeRecord>
 {
-    /**
-     * 查询志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecordId 志愿者提现申请记录主键
-     * @return 志愿者提现申请记录
-     */
-    public VolunteerTakeRecord selectVolunteerTakeRecordByVolunteerTakeRecordId(Long volunteerTakeRecordId);
+
 
     /**
      * 查询志愿者提现申请记录列表
@@ -28,35 +22,6 @@ public interface VolunteerTakeRecordMapper extends BaseMapper<VolunteerTakeRecor
      */
     public List<VolunteerTakeRecord> selectVolunteerTakeRecordList(VolunteerTakeRecord volunteerTakeRecord);
 
-    /**
-     * 新增志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecord 志愿者提现申请记录
-     * @return 结果
-     */
-    public int insertVolunteerTakeRecord(VolunteerTakeRecord volunteerTakeRecord);
 
-    /**
-     * 修改志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecord 志愿者提现申请记录
-     * @return 结果
-     */
-    public int updateVolunteerTakeRecord(VolunteerTakeRecord volunteerTakeRecord);
 
-    /**
-     * 删除志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecordId 志愿者提现申请记录主键
-     * @return 结果
-     */
-    public int deleteVolunteerTakeRecordByVolunteerTakeRecordId(Long volunteerTakeRecordId);
-
-    /**
-     * 批量删除志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecordIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteVolunteerTakeRecordByVolunteerTakeRecordIds(Long[] volunteerTakeRecordIds);
 }

leromro-core/src/main/java/com/leromro/core/service/IVolunteerTakeRecordService.java

@@ -12,13 +12,6 @@ import com.leromro.core.domain.VolunteerTakeRecord;
  */
 public interface IVolunteerTakeRecordService extends IService<VolunteerTakeRecord>
 {
-    /**
-     * 查询志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecordId 志愿者提现申请记录主键
-     * @return 志愿者提现申请记录
-     */
-    public VolunteerTakeRecord selectVolunteerTakeRecordByVolunteerTakeRecordId(Long volunteerTakeRecordId);
 
     /**
      * 查询志愿者提现申请记录列表
@@ -28,35 +21,4 @@ public interface IVolunteerTakeRecordService extends IService<VolunteerTakeRecor
      */
     public List<VolunteerTakeRecord> selectVolunteerTakeRecordList(VolunteerTakeRecord volunteerTakeRecord);
 
-    /**
-     * 新增志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecord 志愿者提现申请记录
-     * @return 结果
-     */
-    public Boolean insertVolunteerTakeRecord(VolunteerTakeRecord volunteerTakeRecord);
-
-    /**
-     * 修改志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecord 志愿者提现申请记录
-     * @return 结果
-     */
-    public Boolean updateVolunteerTakeRecord(VolunteerTakeRecord volunteerTakeRecord);
-
-    /**
-     * 批量删除志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecordIds 需要删除的志愿者提现申请记录主键集合
-     * @return 结果
-     */
-    public int deleteVolunteerTakeRecordByVolunteerTakeRecordIds(Long[] volunteerTakeRecordIds);
-
-    /**
-     * 删除志愿者提现申请记录信息
-     * 
-     * @param volunteerTakeRecordId 志愿者提现申请记录主键
-     * @return 结果
-     */
-    public int deleteVolunteerTakeRecordByVolunteerTakeRecordId(Long volunteerTakeRecordId);
 }

leromro-core/src/main/java/com/leromro/core/service/impl/MainOrderServiceImpl.java

@@ -110,9 +110,9 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<OrderPaymentVO> createOrders(OrderRequestDTO orderRequest) throws Exception {
-        if (1==1) {
-            return R.fail("当前地区志愿者批量认证中,暂时关闭预约功能,请谅解");
-        }
+//        if (1==1) {
+//            return R.fail("当前地区志愿者批量认证中,暂时关闭预约功能,请谅解");
+//        }
         //响应数据
         OrderPaymentVO vo = new OrderPaymentVO();
         //订单信息

leromro-core/src/main/java/com/leromro/core/service/impl/VolunteerFaceRecordServiceImpl.java

@@ -28,14 +28,12 @@ public class VolunteerFaceRecordServiceImpl extends ServiceImpl<VolunteerFaceRec
     public R<Boolean> getFaceStatus(Long volunteerInfoId) {
         //可以通过配置控制是否需要人脸核身
         int count = this.count(new LambdaQueryWrapper<VolunteerFaceRecord>()
-                .eq(VolunteerFaceRecord::getVolunteerId, volunteerInfoId)
-                .eq(VolunteerFaceRecord::getIsSuccessful, "1"));
+                .eq(VolunteerFaceRecord::getVolunteerId, volunteerInfoId));
         return count>0?R.ok(true):R.ok(false);
     }
 
     @Override
     public R<Boolean> addFaceRecord(VolunteerFaceRecord volunteerFaceRecord) {
-        volunteerFaceRecord.setIsSuccessful("1");
         this.save(volunteerFaceRecord);
         return R.ok();
     }

leromro-core/src/main/java/com/leromro/core/service/impl/VolunteerTakeRecordServiceImpl.java

@@ -30,17 +30,7 @@ public class VolunteerTakeRecordServiceImpl extends ServiceImpl<VolunteerTakeRec
     @Autowired
     private SysUserServiceImpl sysUserService;
 
-    /**
-     * 查询志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecordId 志愿者提现申请记录主键
-     * @return 志愿者提现申请记录
-     */
-    @Override
-    public VolunteerTakeRecord selectVolunteerTakeRecordByVolunteerTakeRecordId(Long volunteerTakeRecordId)
-    {
-        return volunteerTakeRecordMapper.selectVolunteerTakeRecordByVolunteerTakeRecordId(volunteerTakeRecordId);
-    }
+
 
     /**
      * 查询志愿者提现申请记录列表
@@ -58,51 +48,6 @@ public class VolunteerTakeRecordServiceImpl extends ServiceImpl<VolunteerTakeRec
         return volunteerTakeRecordMapper.selectVolunteerTakeRecordList(volunteerTakeRecord);
     }
 
-    /**
-     * 新增志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecord 志愿者提现申请记录
-     * @return 结果
-     */
-    @Override
-    public Boolean insertVolunteerTakeRecord(VolunteerTakeRecord volunteerTakeRecord)
-    {
-        return this.save(volunteerTakeRecord);
-    }
 
-    /**
-     * 修改志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecord 志愿者提现申请记录
-     * @return 结果
-     */
-    @Override
-    public Boolean updateVolunteerTakeRecord(VolunteerTakeRecord volunteerTakeRecord)
-    {
-        return this.updateById(volunteerTakeRecord);
-    }
 
-    /**
-     * 批量删除志愿者提现申请记录
-     * 
-     * @param volunteerTakeRecordIds 需要删除的志愿者提现申请记录主键
-     * @return 结果
-     */
-    @Override
-    public int deleteVolunteerTakeRecordByVolunteerTakeRecordIds(Long[] volunteerTakeRecordIds)
-    {
-        return volunteerTakeRecordMapper.deleteVolunteerTakeRecordByVolunteerTakeRecordIds(volunteerTakeRecordIds);
-    }
-
-    /**
-     * 删除志愿者提现申请记录信息
-     * 
-     * @param volunteerTakeRecordId 志愿者提现申请记录主键
-     * @return 结果
-     */
-    @Override
-    public int deleteVolunteerTakeRecordByVolunteerTakeRecordId(Long volunteerTakeRecordId)
-    {
-        return volunteerTakeRecordMapper.deleteVolunteerTakeRecordByVolunteerTakeRecordId(volunteerTakeRecordId);
-    }
 }

leromro-core/src/main/resources/mapper/core/VolunteerAccountChangeMapper.xml

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND lvac.create_time < DATE_ADD(#{createTime}, INTERVAL 1 DAY)
             </if>
         </where>
+        order by lvac.create_time desc
     </select>
 
     <insert id="insertVolunteerAccountChange" parameterType="VolunteerAccountChange" useGeneratedKeys="true" keyProperty="volunteerAccountChangeId">