咸宁二期用户端

xuhy

2025-01-08 107556b29d023b4ddd30a477b83204da32fd6c20

咸宁二期用户端

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/TransactionDetails.java

@@ -63,6 +63,11 @@
     */
    @TableField("orderId")
    private Integer orderId;
    /**
     * 下单方式 1=语音下单 2=一键下单 3=后台添加订单 4=普通订单
     */
    @TableField("placeOrderWay")
    private Integer placeOrderWay;

    public Integer getId() {
        return id;
@@ -143,7 +148,13 @@
    public void setOrderId(Integer orderId) {
        this.orderId = orderId;
    }
    public void setPlaceOrderWay(Integer placeOrderWay) {
        this.placeOrderWay = placeOrderWay;
    }

    public Integer getPlaceOrderWay() {
        return placeOrderWay;
    }
    @Override
    public String toString() {
        return "TransactionDetails{" +

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/ITransactionDetailsService.java

@@ -20,4 +20,19 @@
     */
    void saveData(Integer userId, String remark, Double money, Integer state,
                  Integer type, Integer userType, Integer orderType, Integer orderId) throws Exception;
    /**
     * 添加数据
     * @param userId    对象id
     * @param remark    备注
     * @param money     金额
     * @param state     状态（1=添加，2=减少）
     * @param type      类型（1=金额，2=积分）
     * @param userType  用户类型（1=用户，2=司机）
     * @param orderType 订单类型（1=专车，2=出租车，3=城际，4=小件物流，5=余额充值，6=余额提现，7=积分兑换）
     * @param placeOrderWay 下单方式 1=语音下单 2=一键下单 3=后台添加订单 4=普通订单
     * @param orderId
     * @throws Exception
     */
    void saveDataTaxi(Integer userId, String remark, Double money, Integer state,
                  Integer type, Integer userType, Integer orderType, Integer orderId, Integer placeOrderWay) throws Exception;
}

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -559,8 +559,26 @@
                }

                userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                Integer placeOrderWay = null;
                switch (orderTaxi.getOrderSource()){
                    case 2:
                        placeOrderWay = 4;
                        break;
                    case 3:
                        placeOrderWay = 4;
                        break;
                    case 6:
                        placeOrderWay = 1;
                        break;
                    case 7:
                        placeOrderWay = 2;
                        break;
                    case 5:
                        placeOrderWay = 3;
                        break;
                }
                //添加交易明细
                transactionDetailsService.saveData(uid, "取消订单", query.getMoney(), 2, 1, 1, 2, id);
                transactionDetailsService.saveDataTaxi(uid, "取消订单", query.getMoney(), 2, 1, 1, 2, id,placeOrderWay);
                userInfoService.updateById(userInfo);

                //解除小号绑定
@@ -758,9 +776,26 @@

            SysIntegral query1 = sysIntegralMapper.query(orderTaxi.getCompanyId());
            userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分

            Integer placeOrderWay = null;
            switch (orderTaxi.getOrderSource()){
                case 2:
                    placeOrderWay = 4;
                    break;
                case 3:
                    placeOrderWay = 4;
                    break;
                case 6:
                    placeOrderWay = 1;
                    break;
                case 7:
                    placeOrderWay = 2;
                    break;
                case 5:
                    placeOrderWay = 3;
                    break;
            }
            //添加交易明细
            transactionDetailsService.saveData(uid, "完成订单", orderMoney, 2, 1, 1, 2, orderId);
            transactionDetailsService.saveDataTaxi(uid, "完成订单", orderMoney, 2, 1, 1, 2, orderId,placeOrderWay);
            userInfoService.updateById(userInfo);

            orderTaxi.setState(8);
@@ -1170,8 +1205,26 @@
        OrderTaxi orderTaxi = this.selectById(id);
        PaymentRecord query = paymentRecordService.query(1, orderTaxi.getUserId(), 1, Integer.valueOf(id), 2, type, 1);
        if(null != query){
            Integer placeOrderWay = null;
            switch (orderTaxi.getOrderSource()){
                case 2:
                    placeOrderWay = 4;
                    break;
                case 3:
                    placeOrderWay = 4;
                    break;
                case 6:
                    placeOrderWay = 1;
                    break;
                case 7:
                    placeOrderWay = 2;
                    break;
                case 5:
                    placeOrderWay = 3;
                    break;
            }
            //添加交易明细
            transactionDetailsService.saveData(orderTaxi.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 2, query.getOrderId());
            transactionDetailsService.saveDataTaxi(orderTaxi.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 2, query.getOrderId(),placeOrderWay);
            orderTaxi.setState(8);
            orderTaxi.setPayType(type);
            orderTaxi.setPayMoney(query.getAmount());
@@ -1264,8 +1317,26 @@
        OrderTaxi orderTaxi = this.selectById(id);
        PaymentRecord query = paymentRecordService.query(1, orderTaxi.getUserId(), 1, Integer.valueOf(id), 2, type, 1);
        if(null != query){
            Integer placeOrderWay = null;
            switch (orderTaxi.getOrderSource()){
                case 2:
                    placeOrderWay = 4;
                    break;
                case 3:
                    placeOrderWay = 4;
                    break;
                case 6:
                    placeOrderWay = 1;
                    break;
                case 7:
                    placeOrderWay = 2;
                    break;
                case 5:
                    placeOrderWay = 3;
                    break;
            }
            //添加交易明细
            transactionDetailsService.saveData(orderTaxi.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 2, query.getOrderId());
            transactionDetailsService.saveDataTaxi(orderTaxi.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 2, query.getOrderId(),placeOrderWay);
            orderTaxi.setState(10);
            //解除小号绑定
            if(orderTaxi.getBindId() != null){

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/TransactionDetailsServiceImpl.java

@@ -45,4 +45,33 @@
        transactionDetails.setUserType(userType);
        this.insert(transactionDetails);
    }

    /**
     * 添加数据
     * @param userId    对象id
     * @param remark    备注
     * @param money     金额
     * @param state     状态（1=添加，2=减少）
     * @param type      类型（1=金额，2=积分）
     * @param userType  用户类型（1=用户，2=司机）
     * @param orderType 订单类型（1=专车，2=出租车，3=城际，4=小件物流，5=余额充值，6=余额提现，7=积分兑换）
     * @param placeOrderWay 下单方式 1=语音下单 2=一键下单 3=后台添加订单 4=普通订单
     * @param orderId
     * @throws Exception
     */
    @Override
    public void saveDataTaxi(Integer userId, String remark, Double money, Integer state, Integer type, Integer userType, Integer orderType, Integer orderId, Integer placeOrderWay) throws Exception {
        TransactionDetails transactionDetails = new TransactionDetails();
        transactionDetails.setInsertTime(new Date());
        transactionDetails.setMoney(money);
        transactionDetails.setOrderId(orderId);
        transactionDetails.setOrderType(orderType);
        transactionDetails.setRemark(remark);
        transactionDetails.setState(state);
        transactionDetails.setType(type);
        transactionDetails.setUserId(userId);
        transactionDetails.setUserType(userType);
        transactionDetails.setPlaceOrderWay(placeOrderWay);
        this.insert(transactionDetails);
    }
}

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/warpper/OrderTaxiWarpper.java

@@ -39,7 +39,7 @@
    private String passengersPhone;
    @ApiModelProperty(dataType = "int", required = true, value = "订单类型（1=普通，2=预约）")
    private Integer orderType;
    @ApiModelProperty(dataType = "int", required = true, value = "订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单)")
    @ApiModelProperty(dataType = "int", required = true, value = "订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单，6：电话下单，7：一键下单)")
    private Integer orderSource;
    @ApiModelProperty(dataType = "string", required = true, value = "出行时间(2020-06-06 08:47)")
    private Date travelTime;