商业街支付修改

puhanshu

2022-01-12 20a4bfcee1976c43304c7fc5a17e2183efe75243

商业街支付修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java

@@ -92,4 +92,7 @@

    @ApiModelProperty("订单取消剩余倒计时")
    private Long cancelCountdown;

    @ApiModelProperty(value = "用户真实ip", hidden = true)
    private String clientIp;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java

@@ -77,7 +77,7 @@
        return parameters;
    }
    public static String h5pay(String appid, String mchId, String payKey, String notifyUrl, String body,
                                         String openid, String outTradeNo, BigDecimal money, String tradeType) {
                               String openid, String outTradeNo, BigDecimal money, String tradeType, String clientIp) {
        String nonceStr = PayUtil.makeUUID(32);
        SortedMap<Object, Object> params = new TreeMap<>();
        params.put("appid", appid);
@@ -87,7 +87,7 @@
        params.put("notify_url", notifyUrl);
        params.put("openid", openid);
        params.put("out_trade_no", outTradeNo);// 商品订单号
        params.put("spbill_create_ip", PayUtil.getLocalIp());// 服务部署的ip
        params.put("spbill_create_ip", clientIp);// 用户真实ip
        params.put("total_fee", PayUtil.moneyToIntegerStr(money));// 费用的参数转型
        params.put("trade_type", tradeType);// 对接类型
        params.put("sign", PayUtil.createSign(PayCpmstant.DEFAULT_ENCODING, params, payKey));// MD5签名

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java

@@ -90,7 +90,7 @@
                }
                // 调用wx支付
                String result = WxPayUtils.h5pay(appid, mchId, payKey, notifyUrl, "点亮支付", mcsOrderVO.getOpenId(),
                        mcsOrder.getOrderNo(), money,mcsOrderVO.getTradeType());
                        mcsOrder.getOrderNo(), money,mcsOrderVO.getTradeType(), mcsOrderVO.getClientIp());
                if (mcsOrderVO.getTradeType().equals("NATIVE")) {
                    JSONObject jsonObjectResult = JSONObject.parseObject(result);
                    result = QRCodeUtil.getBase64QRCode(jsonObjectResult.get("codeUrl").toString());

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/McsOrderApi.java

@@ -103,6 +103,8 @@
    @ApiOperation("微信支付")
    @PostMapping("/wxPay")
    public R wxPay(@RequestBody McsOrderVO mcsOrderVO){
        String clientIp = this.getRequest().getHeader("X-Real-IP");
        mcsOrderVO.setClientIp(clientIp);
        return communityService.wxPayMscOrder(mcsOrderVO);
    }