代码提交 世界杯修改支付宝资金结算功能

无关风月

7 天以前 4e124926ee6ee682084466067ae37550fca475fa

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -65,6 +65,7 @@
    @Resource
    private UserCouponClient userCouponClient;


    @Resource
    private CouponClient couponClient;

@@ -457,7 +458,7 @@
        return ResultUtil.success();
    }


    private String smidVx = "2088330203191220";//平台微信商户号
    /**
     * 课程微信支付
     *
@@ -469,103 +470,23 @@
        String code = siteBooking.getOrderNo();
        Integer id = siteBooking.getId();
        Site byId = siteService.getById(siteBooking.getSiteId());
        // 是否分账 0否1是
        int isFenZhang= 1;
        String merchantNumber = "";
        if (byId.getOperatorId()==null || byId.getOperatorId()==0){
        Store store = storeService.getById(byId.getStoreId());
        if (store.getOperatorId()==null || store.getOperatorId()==0){
            // 平台
            isFenZhang = 0;
        }
        ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地-"+isFenZhang, id.toString(), code, paymentPrice.toString(),
                    ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地", id.toString(), code, paymentPrice.toString(),
                "/base/site/weChatPaymentSiteCallback", "APP", "");
        if (weixinpay.getCode() == 200) {
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        int num = 1;
                        int wait = 0;
                        while (num <= 10) {
                            int min = 5000;
                            wait += (min * num);
                            Thread.sleep(wait);
                            SiteBooking siteBooking = siteBookingService.getById(id);
                            if (siteBooking.getStatus() != 0) {
                                break;
                            }
                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(siteBooking.getOrderNo(), "");
                            if (resultUtil.getCode() == 200 && siteBooking.getStatus() == 0) {
                                /**
                                 * SUCCESS—支付成功，
                                 * REFUND—转入退款，
                                 * NOTPAY—未支付，
                                 * CLOSED—已关闭，
                                 * REVOKED—已撤销（刷卡支付），
                                 * USERPAYING--用户支付中，
                                 * PAYERROR--支付失败(其他原因，如银行返回失败)
                                 */
                                Map<String, String> data1 = resultUtil.getData();
                                String s = data1.get("trade_state");
                                String transaction_id = data1.get("transaction_id");
                                if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
                                    break;
                                }
                                if ("SUCCESS".equals(s)) {
                                    siteBooking.setPayTime(new Date());
                                    siteBooking.setStatus(1);
                                    siteBooking.setPayOrderNo(transaction_id);
                                    siteBookingService.updateById(siteBooking);

                                    if (byId.getOperatorId()!=null && byId.getOperatorId()!=0){
                                        // 休眠两分钟后再调用分账接口 避免提示订单正在处理中
                                        Thread.sleep(120000);
                                        // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
                                        OperatorUser operatorId = operatorUserService.getOne(
                                                new QueryWrapper<OperatorUser>().eq("operatorId",byId.getOperatorId())
                                        );
                                        if (operatorId.getWechatProportion() == null){
                                            operatorId.setWechatProportion("0");
                                        }
                                        if (operatorId.getAlipayProportion() == null){
                                            operatorId.setAlipayProportion("0");
                                        }
                                        String proportion=  operatorId.getWechatProportion()+","+operatorId.getAlipayProportion();
                                        String[] split = proportion.split(",");
                                        String s1 = split[0];
                                        if (!s1.equals("未设置")){
                                            BigDecimal bigDecimal = new BigDecimal(s1);
                                            // 分账比例
                                            BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
                                            // 微信商户号
                                            String s2 =siteService.getmerchantNumberByOperatorId(byId.getOperatorId());
                                            String nonce_str = UUIDUtil.getRandomCode(16);
                                            BigDecimal bigDecimal2 = new BigDecimal(paymentPrice);
                                            ResultUtil fenzhang = payMoneyUtil.fenzhang(transaction_id, bigDecimal2.multiply(bigDecimal1), s2,nonce_str);
                                            if (!fenzhang.getCode().equals(500)){
                                                System.err.println("分账失败 原因是:"+fenzhang.getMsg());
                                            }else{
                                                siteBooking.setFenzhangNo(fenzhang.getMsg());
                                                siteBooking.setFenzhangOrderNo(nonce_str);
                                                siteBooking.setFenzhangAmount(bigDecimal2.multiply(bigDecimal1));
                                                siteBookingService.updateById(siteBooking);
                                            }
                                        }
                                    }

                                    break;
                                }
                                if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
                                    num++;
                                }
                            }
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
            }).start();
                    return weixinpay;
        }else{
            String smidVx= operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
            if (!StringUtils.hasLength(smidVx)){
                return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
            }
            return payMoneyUtil.weixinpayV3(smidVx,"预约场地"
                    ,code,"/base/site/weChatPaymentSiteCallback1",
                    paymentPrice.toString(),id.toString());
        }
        return weixinpay;


    }

    private String smid = "2088330203191220";//平台支付宝商户号
@@ -594,12 +515,13 @@
        }else if (operatorId == 0){
            smid1 = smid;
        }else{
            smid1 = siteService.getSMIDByOperatorId(operatorId);
            smid1 = siteService.getmerchantNumberAliByOperatorId(operatorId);

        }
        ResultUtil alipay = payMoneyUtil.alipay(smid1,"预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
        System.out.println("预约场地----" + alipay.getCode());
        if (alipay.getCode() == 200) {
            String finalSmid = smid1;
            new Thread(new Runnable() {
                @Override
                public void run() {
@@ -636,21 +558,8 @@
                                    siteBooking.setPayOrderNo(tradeNo);
                                    siteBookingService.updateById(siteBooking);
                                    System.err.println("======完成支付");
                                    // 判断预约的门店 属于哪个运营商
                                    Integer storeId = siteBooking.getStoreId();
                                    Store byId = storeService.getById(storeId);
                                    Integer operatorId = byId.getOperatorId();
                                    String smid1 = "";
                                    if (operatorId == null || operatorId == 0){
                                        // 平台的门店 不冻结资金不做分账处理
                                        payMoneyUtil.confirm1(smid1,code,tradeNo,paymentPrice.toString());
                                    }else{
                                        smid1 = siteService.getSMIDByOperatorId(operatorId);
                                        payMoneyUtil.confirm(smid1,code,tradeNo,paymentPrice.toString());
                                        // 分账
                                        extracted(operatorId, new BigDecimal(paymentPrice.toString()), tradeNo);
                                    }

                                    Thread.sleep(30000);
                                    payMoneyUtil.confirm(finalSmid, code, tradeNo, paymentPrice.toString());
                                    break;
                                }
                                if ("WAIT_BUYER_PAY".equals(s)) {
@@ -800,44 +709,39 @@
        if (siteBooking.getStatus() != 1 && siteBooking.getStatus() != 2) {
            return ResultUtil.error("不能进行取消操作");
        }
        Integer storeId = siteBooking.getStoreId();
        Store store = storeService.getById(storeId);

        if (siteBooking.getPayType() == 1) {//微信支付
            if (StringUtils.hasLength(siteBooking.getFenzhangNo())){
                // 是分账订单 如果分账金额不为0 那么回退分账金额
                if (siteBooking.getFenzhangAmount()!=null && siteBooking.getFenzhangAmount().compareTo(BigDecimal.ZERO)>0){
                    String randomCode = UUIDUtil.getRandomCode(16);
                    String randomCode1 = UUIDUtil.getRandomCode(16);
                    if (byId.getOperatorId()!=null && byId.getOperatorId()!=0){
                        // 休眠两分钟后再调用分账接口 避免提示订单正在处理中
                        // 微信商户号
                        String s2 =siteService.getmerchantNumberByOperatorId(byId.getOperatorId());
                        ResultUtil resultUtil = payMoneyUtil.fenzhangRefund(siteBooking.getFenzhangNo(), siteBooking.getFenzhangAmount(), s2, randomCode, randomCode1);
                        if (!resultUtil.getCode().equals(500)){
                            System.err.println("分账回退失败 原因是:"+resultUtil.getMsg());
                        }else{
                            siteBooking.setFenzhangRefundNo(resultUtil.getMsg());
                            siteBookingService.updateById(siteBooking);
                        }

                    }
            if (store.getOperatorId()!=null && store.getOperatorId()!=0){
                String smidVx= operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
                if (!StringUtils.hasLength(smidVx)){
                    return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
                }
            }
            Map<String, String> map = payMoneyUtil.wxRefund(siteBooking.getPayOrderNo(), siteBooking.getOrderNo(), siteBooking.getPayMoney().toString(),
                    siteBooking.getPayMoney().toString(), "/base/site/cancelMySiteCallback");
            if (null == map) {
                return ResultUtil.error("取消退款异常");
            }
            String return_code = map.get("return_code");
            if (!"SUCCESS".equals(return_code)) {
                return ResultUtil.error(map.get("return_msg"));
            }
            siteBooking.setCancelUserId(uid);
            siteBookingService.updateById(siteBooking);
                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);// 退款单号
                // 运营商退款
                payMoneyUtil.weixinRefundV3(smidVx, code, siteBooking.getPayOrderNo(), siteBooking.getPayMoney().toString(), "/base/site/cancelMySiteCallback1");
            }else{
                Map<String, String> map = payMoneyUtil.wxRefund(siteBooking.getPayOrderNo(), siteBooking.getOrderNo(), siteBooking.getPayMoney().toString(),
                        siteBooking.getPayMoney().toString(), "/base/site/cancelMySiteCallback");
                if (null == map) {
                    return ResultUtil.error("取消退款异常");
                }
                String return_code = map.get("return_code");
                if (!"SUCCESS".equals(return_code)) {
                    return ResultUtil.error(map.get("return_msg"));
                }
                siteBooking.setCancelUserId(uid);
                siteBookingService.updateById(siteBooking);

            TBackRecord tBackRecord = new TBackRecord();
            tBackRecord.setMoney(siteBooking.getPayMoney());
            tBackRecord.setUserId(siteBooking.getAppUserId());
            tBackRecord.setTime(new Date());
            backRecordService.save(tBackRecord);
                TBackRecord tBackRecord = new TBackRecord();
                tBackRecord.setMoney(siteBooking.getPayMoney());
                tBackRecord.setUserId(siteBooking.getAppUserId());
                tBackRecord.setTime(new Date());
                backRecordService.save(tBackRecord);
            }


        }
        if (siteBooking.getPayType() == 2) {//支付宝
@@ -1046,4 +950,9 @@
    public String getmerchantNumberByOperatorId(Integer id) {
        return siteMapper.getmerchantNumberByOperatorId(id);
    }

    @Override
    public String getmerchantNumberAliByOperatorId(Integer id) {
        return siteMapper.getmerchantNumberAliByOperatorId(id);
    }
}