liurunyu
2024-10-29 fd2b3181d120ee1c5fd628309a2d0f405e08dc21
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
@@ -14,6 +14,7 @@
import com.dy.pipIrrWechat.sms.AliyunSmsSv;
import com.dy.pipIrrWechat.sms.RandomCode;
import com.dy.pipIrrWechat.util.RestTemplateUtil;
import com.dy.pipIrrWechat.wechatpay.PayInfo;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -42,8 +43,8 @@
    private final ClientSv clientSv;
    private final AliyunSmsSv aliyunSmsSv;
    private final RestTemplateUtil restTemplateUtil;
    private final String appid = PayInfo.appid;
    private final String secret = PayInfo.secret;
    //private final String appid = PayInfo.appid;
    //private final String secret = PayInfo.secret;
    private final String mchid = PayInfo.mchid;
    private final String schema = PayInfo.schema;
    private final String signType = PayInfo.signType;
@@ -68,8 +69,8 @@
        // 登录凭证校验
        Map<String, Object> queryParams = new HashMap<>();
        queryParams.put("appid", appid);
        queryParams.put("secret", secret);
        queryParams.put("appid", PayInfo.appid);
        queryParams.put("secret", PayInfo.secret);
        queryParams.put("js_code", code);
        queryParams.put("grant_type", grantType);
        Map<String, String> headerParams = new HashMap<>();
@@ -110,6 +111,12 @@
        if(phoneNumber == null || phoneNumber.length() <= 0) {
            return BaseResponseUtils.buildErrorMsg(WechatResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage());
        }
        Long clientId = clientSv.getClientIdByPhone(phoneNumber);
        if(clientId == null) {
            return BaseResponseUtils.buildErrorMsg("该手机号对应的农户不存在");
        }
        // 生成6位验证码并转为Json格式
        String securityCode = String.valueOf(RandomCode.genCode());
@@ -177,8 +184,8 @@
        // 校验通过,进行登录凭证校验
        Map<String, Object> queryParams = new HashMap<>();
        queryParams.put("appid", appid);
        queryParams.put("secret", secret);
        queryParams.put("appid", PayInfo.appid);
        queryParams.put("secret", PayInfo.secret);
        queryParams.put("js_code", code);
        queryParams.put("grant_type", grantType);
        Map<String, String> headerParams = new HashMap<>();
@@ -206,7 +213,7 @@
            }
            JSONObject job_result = new JSONObject();
            job_result.put("clientId", clientId);
            job_result.put("clientId", String.valueOf(clientId));
            job_result.put("sessionId", sessionId);
            return BaseResponseUtils.buildSuccess(job_result);