管理后台二期

xuhy

昨天 e56db093f5dc2d2a7d317add44498982da5702d2

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

@@ -15,6 +15,7 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.BeanUtils;
@@ -258,7 +259,8 @@
    @Autowired
    private IIncomeService incomeService;


    @Autowired
    private PayMoneyUtil payMoneyUtil;


    /**
@@ -321,6 +323,23 @@
                    return ResultUtil.error("订单还未进行支付");
                }

                if(query.getPayType() == 1){//微信
                    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{//支付宝
//                            Map<String, String> map1 = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
//                            if(!"10000".equals(map1.get("code"))){
//                                return ResultUtil.error(map1.get("msg"));
//                            }
//                            //添加交易明细
//                            transactionDetailsService.saveData(query.getUserId(), "跨城改派取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                }

            }

            //添加负的收入明细
@@ -329,8 +348,8 @@
                if(income.getUserType() == 2){//处理司机的收入
                    TDriver driver = tDriverService.selectById(income.getObjectId());
                    driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
                    driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
                    driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
//                    driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
//                    driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
                    tDriverService.updateById(driver);
                }
                Income income1 = new Income();