微信小程序登录优化

ruoyi-admin/src/main/resources/application-dev.yml

@@ -119,7 +119,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 6
+    database: 9
     # 密码
     password: songlanyun
     # 连接超时时间

ruoyi-api/src/main/java/com/ruoyi/api/controller/common/ApiJzqOcrController.java

@@ -0,0 +1,52 @@
+package com.ruoyi.api.controller.common;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.tool.request.OcrRequest;
+import com.ruoyi.tool.response.OcrBankResponse;
+import com.ruoyi.tool.response.OcrBusinessLicResponse;
+import com.ruoyi.tool.response.OcrIdentityResponse;
+import com.ruoyi.tool.service.JzqService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(value = "君子签控制器", tags = {"君子签"})
+@RestController
+@RequestMapping("/api/jzq/ocr")
+@RequiredArgsConstructor
+public class ApiJzqOcrController {
+
+    private final JzqService jzqService;
+
+    /**
+     * 身份证识别
+     */
+    @ApiOperation("身份证识别")
+    @GetMapping("/idcard")
+    public R<OcrIdentityResponse> idcard(OcrRequest request) {
+        return R.ok(jzqService.idcard(request));
+    }
+
+    /**
+     * 银行卡识别
+     */
+    @ApiOperation("银行卡识别")
+    @GetMapping("/bank")
+    public R<OcrBankResponse> bank(OcrRequest request) {
+        return R.ok(jzqService.bank(request));
+    }
+
+    /**
+     * 营业执照识别
+     */
+    @ApiOperation("营业执照识别")
+    @GetMapping("/businessLic")
+    public R<OcrBusinessLicResponse> businessLic(OcrRequest request) {
+        return R.ok(jzqService.businessLic(request));
+    }
+
+}
+

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentAccountCodeServiceImpl.java

@@ -283,7 +283,7 @@ public class AgentAccountCodeServiceImpl implements IAgentAccountCodeService {
     @Override
     public AgentAccountCodeVo availableByAccountCode(String accountCode) {
         return baseMapper.selectVoOne(new LambdaQueryWrapper<AgentAccountCode>()
-            .eq(AgentAccountCode::getStatus, Arrays.asList(AccountCodeStatus.UNUSED, AccountCodeStatus.WAIT_USE))
+            .in(AgentAccountCode::getStatus, Arrays.asList(AccountCodeStatus.UNUSED, AccountCodeStatus.WAIT_USE))
             .eq(AgentAccountCode::getAccountCode, accountCode));
     }
 

ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BusinessApplyBo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.business.enums.BusinessType;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
@@ -10,6 +11,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -324,6 +326,22 @@ public class BusinessApplyBo extends BaseEntity {
     @ApiModelProperty(value = "审核结果", required = true)
     private String auditResult;
 
+    /**
+     * 代理审核时间
+     */
+    @ApiModelProperty(value = "代理审核时间", required = true)
+    private Date agentAuditTime;
+    /**
+     * 代理审核人
+     */
+    @ApiModelProperty(value = "代理审核人", required = true)
+    private Long agentAuditUserId;
+    /**
+     * 代理审核结果
+     */
+    @ApiModelProperty(value = "代理审核结果", required = true)
+    private String agentAuditResult;
+
     /**
      * 签名
      */
@@ -339,8 +357,13 @@ public class BusinessApplyBo extends BaseEntity {
     private Integer agentAuditStatus;
     private List<Integer> agentAuditStatusList;
 
-    /**
-     * 代理审核人
-     */
-    private Long agentAuditUserId;
+    @ApiModelProperty(value = "开始时间", required = true)
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间", required = true)
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 }

ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BusinessApplyVo.java

@@ -353,4 +353,23 @@ public class BusinessApplyVo {
     @FilePathValue
     @ApiModelProperty(value = "签名", required = true)
     private String signImage;
+
+    /**
+     * 代理审核时间
+     */
+    @ApiModelProperty(value = "代理审核时间", required = true)
+    private Date agentAuditTime;
+    /**
+     * 代理审核人
+     */
+    @ApiModelProperty(value = "代理审核人", required = true)
+    private Long agentAuditUserId;
+    /**
+     * 代理审核结果
+     */
+    @ApiModelProperty(value = "代理审核结果", required = true)
+    private String agentAuditResult;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
 }

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessApplyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -130,6 +131,14 @@ public class BusinessApplyServiceImpl implements IBusinessApplyService {
         lqw.eq(StringUtils.isNotBlank(bo.getAuditResult()), BusinessApply::getAuditResult, bo.getAuditResult());
         lqw.eq(bo.getAgentAuditStatus() != null, BusinessApply::getAgentAuditStatus, bo.getAgentAuditStatus());
         lqw.in(CollUtil.isNotEmpty(bo.getAgentAuditStatusList()), BusinessApply::getAgentAuditStatus, bo.getAgentAuditStatusList());
+        Date startTime = bo.getStartTime();
+        if (ObjectUtil.isNotNull(startTime)) {
+            lqw.ge(BusinessApply::getCreateTime, DateUtil.beginOfDay(startTime));
+        }
+        Date endTime = bo.getEndTime();
+        if (ObjectUtil.isNotNull(endTime)) {
+            lqw.le(BusinessApply::getCreateTime, DateUtil.endOfDay(endTime));
+        }
         lqw.orderByDesc(BusinessApply::getCreateTime);
         return lqw;
     }

ruoyi-tool/src/main/java/com/ruoyi/tool/service/JzqService.java

@@ -93,6 +93,8 @@ public class JzqService {
             response.setIssuingTime(data.get("issuingTime") != null ? data.get("issuingTime").toString() : null);
             response.setOverdueTime(data.get("overdueTime") != null ? data.get("overdueTime").toString() : null);
             response.setOrderNo(data.get("orderNo") != null ? data.get("orderNo").toString() : null);
+        } else {
+            log.info("身份证识别错误：{}", ri.getMsg());
         }
         return response;
     }
@@ -115,6 +117,8 @@ public class JzqService {
             response.setBankName(data.get("bankName") != null ? data.get("bankName").toString() : null);
             response.setOrderNo(data.get("orderNo") != null ? data.get("orderNo").toString() : null);
             response.setValidDate(data.get("validDate") != null ? data.get("validDate").toString() : null);
+        } else {
+            log.info("银行卡识别错误：{}", ri.getMsg());
         }
         return response;
     }
@@ -139,6 +143,8 @@ public class JzqService {
             response.setLegalPerson(data.get("legalPerson") != null ? data.get("legalPerson").toString() : null);
             response.setName(data.get("name") != null ? data.get("name").toString() : null);
             response.setValidity(data.get("validity") != null ? data.get("validity").toString() : null);
+        } else {
+            log.info("营业执照识别错误：{}", ri.getMsg());
         }
         return response;
     }

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -776,8 +776,8 @@ public class UserServiceImpl implements IUserService {
                     AlipayUserInfoShareRequest alipayUserInfoShareRequest = new AlipayUserInfoShareRequest();
                     AlipayUserInfoShareResponse response = alipayClient.execute(alipayUserInfoShareRequest, responseToken.getAccessToken());
                     if (response.isSuccess()) {
-                        //新商户建议使用open_id替代该字段。对于新商户，user_id字段未来计划逐步回收，存量商户可继续使用。如使用open_id，请确认 应用-开发配置-openid配置管理 已启用。无该配置项
-                        return response.getOpenId();
+                        //付贝需要userid
+                        return response.getUserId();
                     } else {
                         throw new ServiceException("获取用户信息调用失败");
                     }