元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wuzeyu
2024-10-22 53536843f067715404e2da2af9f39babe994b318 
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java


@@ -6,6 +6,7 @@


import com.dy.common.webUtil.BaseResponse;


import com.dy.common.webUtil.BaseResponseUtils;


import com.dy.common.webUtil.ResultCodeMsg;


import com.dy.pipIrrGlobal.cert.WxCertUtil;


import com.dy.pipIrrGlobal.pojoSe.*;


import com.dy.pipIrrGlobal.voSe.VoClient;


import com.dy.pipIrrWechat.result.WechatResultCode;


@@ -32,13 +33,13 @@


import jakarta.validation.Valid;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.springframework.core.io.ResourceLoader;


import org.springframework.http.HttpHeaders;


import org.springframework.http.MediaType;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.validation.BindingResult;


import org.springframework.web.bind.annotation.*;




import javax.crypto.NoSuchPaddingException;


import java.io.BufferedReader;


import java.io.IOException;


import java.security.GeneralSecurityException;


@@ -65,11 +66,11 @@


@RequestMapping(path="payment")


@RequiredArgsConstructor


public class PaymentCtrl {


    private final ResourceLoader resourceLoader;


    private final PaymentSv paymentSv;


    private final RestTemplateUtil restTemplateUtil;


    private final PayHelper payHelper;


    private final VirtualCardSv virtualCardSv;


    private final String privateCertFileName = com.dy.pipIrrWechat.wechatpay.PayInfo.privateCertFileName;


    private final String appid = com.dy.pipIrrWechat.wechatpay.PayInfo.appid;


    private final String secret = com.dy.pipIrrWechat.wechatpay.PayInfo.secret;


    private final String mchid = com.dy.pipIrrWechat.wechatpay.PayInfo.mchid;


@@ -166,7 +167,8 @@


        String nonceStr = payHelper.generateRandomString();


        Long timestamp = System.currentTimeMillis() / 1000;




        String header = schema + " " + payHelper.getToken(method, httpUrl, "", nonceStr, timestamp, privateCertFileName);


        byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;


        String header = schema + " " + payHelper.getToken(method, httpUrl, "", nonceStr, timestamp, certFileBs);




        Map<String, String> headers = new HashMap<>();


        headers.put("Authorization", header);


@@ -184,7 +186,7 @@


        // 构造验签名串


        String signatureStr = payHelper.responseSign(wechatpayTimestamp, wechatpayNonce, job_body.toJSONString());


        // 验证签名


        Boolean valid = payHelper.responseSignVerify(wechatpaySerial, signatureStr, wechatpaySignature);


        Boolean valid = payHelper.responseSignVerify(wechatpaySerial, signatureStr, wechatpaySignature, certFileBs);




        return BaseResponseUtils.buildSuccess();


    }


@@ -197,7 +199,7 @@


     */


    @PostMapping(path = "placeOrder")


    @Transactional(rollbackFor = Exception.class)


    public BaseResponse<Boolean> placeOrder(@RequestBody @Valid DtoOrder order, BindingResult bindingResult) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, IOException, SignatureException, InvalidKeyException {


    public BaseResponse<Boolean> placeOrder(@RequestBody @Valid DtoOrder order, BindingResult bindingResult) throws NoSuchAlgorithmException, InvalidKeySpecException, IOException, SignatureException, InvalidKeyException, Exception {


        if(bindingResult != null && bindingResult.hasErrors()){


            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());


        }


@@ -237,8 +239,26 @@


        virtualCard.setClientId(clientId);


        virtualCard.setOrderNumber(orderNumber);


        virtualCard.setRechargeAmount(rechargeAmount);


        BaseResponse result = virtualCardSv.insertVCRecharge(virtualCard);


        if(!result.getCode().equals("0001")) {




        // -1：虚拟卡不存在，0：添加充值记录失败


        Long rechargeId = virtualCardSv.insertVCRecharge(virtualCard);


        if(rechargeId.equals(-1)) {


            return BaseResponseUtils.buildFail(WechatResultCode.NO_ACCOUNT.getMessage());


        }


        if(rechargeId.equals(0)) {


            return BaseResponseUtils.buildFail(WechatResultCode.RECHARGE_FAIL.getMessage());


        }




        // 生成充值操作记录，充值操作人为农户


        SeVcOperate seVcOperate = new SeVcOperate();


        seVcOperate.setVcId(virtualId);


        seVcOperate.setClientId(clientId);


        seVcOperate.setOperateType(LastOperateENUM.RECHARGE.getCode());


        seVcOperate.setRechargeId(rechargeId);


        seVcOperate.setOperator(clientId);


        seVcOperate.setOperateTime(new Date());


        Long vcOperateId = virtualCardSv.insertVcOperate(seVcOperate);


        if(vcOperateId == null) {


            return BaseResponseUtils.buildErrorMsg(WechatResultCode.RECHARGE_ADD_FAIL.getMessage());


        }




@@ -269,7 +289,8 @@


        String httpUrl = "/v3/pay/transactions/jsapi";




        String body = job_body.toJSONString();


        String header = schema + " " + payHelper.getToken(method, httpUrl, body, nonceStr, timestamp, privateCertFileName);


        byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;


        String header = schema + " " + payHelper.getToken(method, httpUrl, body, nonceStr, timestamp, certFileBs);




        Map<String, String> headers = new HashMap<>();


        headers.put("Authorization", header);


@@ -310,7 +331,8 @@


        String nonceStr = payHelper.generateRandomString();


        String pkg = "prepay_id=" + prepayId;


        String message = payHelper.buildMessage_signAgain(appid, timeStamp, nonceStr, pkg);


        String paySign = payHelper.sign(message.getBytes("utf-8"), privateCertFileName);


        byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;


        String paySign = payHelper.sign(message.getBytes("utf-8"), certFileBs);




        JSONObject job_result = new JSONObject();


        job_result.put("timeStamp", timeStamp);


@@ -342,7 +364,7 @@


    })


    @PostMapping(path = "orderNotify", consumes = MediaType.APPLICATION_JSON_VALUE)


    @Transactional(rollbackFor = Exception.class)


    public JSONObject orderNotify(@RequestHeader HttpHeaders headers, HttpServletRequest request, HttpServletResponse response) throws IOException, GeneralSecurityException {


    public JSONObject orderNotify(@RequestHeader HttpHeaders headers, HttpServletRequest request, HttpServletResponse response) throws IOException, GeneralSecurityException, Exception {


        JSONObject result = new JSONObject();




        /**


@@ -380,8 +402,9 @@




        // 构造验签名串


        String signatureStr = payHelper.responseSign(wechatpayTimestamp, wechatpayNonce, bodyStr);


        byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;


        // 验证签名


        Boolean valid = payHelper.responseSignVerify(wechatpaySerial, signatureStr, wechatpaySignature);


        Boolean valid = payHelper.responseSignVerify(wechatpaySerial, signatureStr, wechatpaySignature, certFileBs);


        if(!valid) {


            response.setStatus(500);


            result.put("code", "FAIL");