经停站点

xuhy

6 天以前 f2057bd69558d42de70a4b8a169a2b86e49b9b19

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -448,10 +448,11 @@
                        }

                        if(query.getPayType() == 1){//微信
                            Map<String, String> map1 = payMoneyUtil.wxRefund(query.getCode(), orderCrossCity.getId() + "_3_" + UUIDUtil.getRandomCode(3), query.getAmount().toString(), query.getAmount().toString(), "/user/base/cancleOrderWXPay");
                            if(!"SUCCESS".equals(map1.get("return_code"))){
                                return ResultUtil.error(map1.get("return_msg"));
                            }
                            Map<String, String> map1 = payMoneyUtil.wxRefund(query.getCode(), orderCrossCity.getOrderNum(), String.valueOf(query.getAmount()), String.valueOf(query.getAmount()), "");
//                            if(!"SUCCESS".equals(map1.get("return_code"))){
//                                return ResultUtil.error(map1.get("return_msg"));
//                            }
                            System.err.println("跨城退款数据：：："+map1);
                            //添加交易明细
                            transactionDetailsService.saveData(query.getUserId(), "跨城改派取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                        }else{//支付宝
@@ -500,11 +501,13 @@
                String out_refund_no = sdf.format(new Date()) + "_" + tReassign.getId();
                Double money = tReassign.getMoney();
                if(tReassign.getPayType() == 1){//微信
                    Map<String, String> map = payMoneyUtil.wxRefund(tReassign.getPayOrder(), out_refund_no, money.toString(), money.toString(), "/dispatch/base/order/reassignRefundCallback");
                    if(null == map || !"SUCCESS".equals(map.get("return_code"))){
                        System.err.println(map.get("return_msg"));
                        return ResultUtil.error(map.get("return_msg"));
                    }
//                    Map<String, String> map = payMoneyUtil.wxRefund(tReassign.getPayOrder(), out_refund_no, money.toString(), money.toString(), "/dispatch/base/order/reassignRefundCallback");
//                    if(null == map || !"SUCCESS".equals(map.get("return_code"))){
//                        System.err.println(map.get("return_msg"));
//                        return ResultUtil.error(map.get("return_msg"));
//                    }
                    Map<String, String> map1 = payMoneyUtil.wxRefund(tReassign.getPayOrder(), out_refund_no, String.valueOf(money), String.valueOf(money), "");
                    System.err.println("跨城退款数据：：："+map1);
                    tReassign.setReviewer(ShiroKit.getUser().getId());
                    tReassign.setReviewerType(2);
                    tReassignService.updateById(tReassign);
@@ -563,6 +566,7 @@
        try {
            ShiroUser user = ShiroKit.getUser();
            TReassign tReassign = tReassignService.selectById(tReassignId);
            Integer state = tReassign.getState();
            if (1 == optType){
                tReassign.setState(5);
                tReassignService.updateById(tReassign);
@@ -641,6 +645,47 @@
                    }
                }
            }



            if(state == 2){//退款操作
                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                String out_refund_no = sdf.format(new Date()) + "_" + tReassign.getId();
                Double money = tReassign.getMoney();
                if(tReassign.getPayType() == 1){//微信
//                    Map<String, String> map = payMoneyUtil.wxRefund(tReassign.getPayOrder(), out_refund_no, money.toString(), money.toString(), "/dispatch/base/order/reassignRefundCallback");
//                    if(null == map || !"SUCCESS".equals(map.get("return_code"))){
//                        System.err.println(map.get("return_msg"));
//                        return ResultUtil.error(map.get("return_msg"));
//                    }
                    Map<String, String> map1 = payMoneyUtil.wxRefund(tReassign.getPayOrder(), out_refund_no, String.valueOf(money), String.valueOf(money), "");
                    System.err.println("物流退款数据：：："+map1);
                    tReassign.setReviewer(ShiroKit.getUser().getId());
                    tReassign.setReviewerType(2);
                    tReassignService.updateById(tReassign);
                    //添加交易明细
                    transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "同城小件物流改派拒绝退款", money, 1, 1, 2, 4, tReassign.getOrderId());
                }
                if(tReassign.getPayType() == 2){//支付宝
//                    Map<String, String> map = payMoneyUtil.aliRefund(tReassign.getPayOrder(), money.toString());
//                    if(null != map && "10000".equals(map.get("code"))){
//                        tReassign.setReviewer(ShiroKit.getUser().getId());
//                        tReassign.setReviewerType(2);
//                        tReassignService.updateById(tReassign);
//                        //添加交易明细
//                        transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
//                    }
//                    if(null == map || !"10000".equals(map.get("code"))){
//                        System.err.println(map.get("msg"));
//                        return ResultUtil.error(map.get("msg"));
//                    }
                }
                if(tReassign.getPayType() == 3){//余额
                    TDriver tDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
                    tDriver.setBalance(tDriver.getBalance().add(new BigDecimal(money)));
                    itDriverService.updateById(tDriver);
                }
            }
            //返回驾驶员处罚金
            TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());