黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liujie
8 天以前 ef6a71053515543ed2fd3fddeec7c7f7c32884ec 
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java


@@ -17,6 +17,7 @@


import com.stylefeng.guns.modular.system.model.*;


import com.stylefeng.guns.modular.system.service.*;


import com.stylefeng.guns.modular.system.util.*;


import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallback;


import com.stylefeng.guns.modular.system.warpper.*;


import com.stylefeng.guns.modular.taxi.model.OrderTaxi;


import com.stylefeng.guns.modular.taxi.model.PaymentRecord;


@@ -28,13 +29,11 @@


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.ResponseBody;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


@@ -47,7 +46,7 @@


 * 订单控制器（综合）


 */


@Api


//@CrossOrigin


@Slf4j


@RestController


@RequestMapping("")


public class OrderController {


@@ -1568,15 +1567,12 @@


            System.out.println("完成订单微信支付回调");


            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);


            System.out.println("wx支付信息："+map);






            if(null != map){


                String order_id = map.get("transaction_id");


                String out_trade_no = map.get("out_trade_no");


                String result = map.get("result");


                String total_fee = map.get("total_fee");


                String transaction_id = map.get("transaction_id");




                if(ToolUtil.isNotEmpty(out_trade_no) && ToolUtil.isNotEmpty(order_id)){


                    PrintWriter out = response.getWriter();


                    out.write(result);


@@ -1991,65 +1987,46 @@


            e.printStackTrace();


        }


    }






    


    


    /**


     * 管理后台推单


     *


     * @param orderType


     * @return


     */


    @ResponseBody


    @PostMapping("/base/taxi/pushOrder")


    public ResultUtil pushOrder(Integer orderId, Integer orderType){


    public ResultUtil pushOrder(Integer orderId, Integer orderType) {


        try {


            switch (orderType){


            switch (orderType) {


                case 1:


                    return orderPrivateCarService.pushOrderPrivateCar(orderId);


                case 2:


                    return orderTaxiService.pushOrderTaxi(orderId);


            }


            return ResultUtil.success();


        }catch (Exception e){


        } catch (Exception e) {


            e.printStackTrace();


            return ResultUtil.runErr();


        }


    }






//    public  void cloudPay(String total_fee,String transaction_id,int type) {


//        if(type==1){


//            BigDecimal divide = new BigDecimal(total_fee).divide(new BigDecimal(100));


//            total_fee=divide.toString();


//        }


//        Company company = companyService.selectOne(new EntityWrapper<Company>()


//                .eq("type", 1)


//                .last("LIMIT 1"));


//        // 查询平台开户信息


//        TEnterpriseWithdrawal enterpriseWithdrawal = enterpriseWithdrawalService.selectOne(new EntityWrapper<TEnterpriseWithdrawal>()


//                .eq("companyId", company.getId()));


//        DepositReq depositReq = new DepositReq();


//        depositReq.setOutOrderNo(ToolUtil.getRandomString(32));


//        depositReq.setTotalAmount(new BigDecimal(total_fee).multiply(new BigDecimal(100)).intValue()); // 总金额


//        depositReq.setAmount(new BigDecimal(total_fee).multiply(new BigDecimal(100)).intValue()); // 支付金额


//        depositReq.setDiscountAmount(0); // 优惠金额


//        depositReq.setBalanceAcctId(enterpriseWithdrawal.getBalanceAcctId());


//        depositReq.setDepositType("1");


//        depositReq.setPaymentType(PaymentTypeEnum.CUP_APP.getCode());


//        depositReq.setPaymentTradeNo(transaction_id); // 系统交易流水号


//        depositReq.setPaymentSucceededAt(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(new Date()));


//        depositReq.setOrderNo(transaction_id);


//        depositReq.setOrderAmount(new BigDecimal(total_fee).multiply(new BigDecimal(100)).longValue());


//        depositReq.setProductName("用户支付充值");


//        depositReq.setProductCount(1);


//


//        try {


//            DepositResp depositResp = DepositExample.create(depositReq);


//            System.err.println(depositResp);


//        } catch (Exception e) {


//            e.printStackTrace();


//        }


//    }








    


    


    /**


     * 黔云通支付回调通知


     *


     * @param qytPaymentCallback


     * @return


     */


    @ResponseBody


    @PostMapping("/base/order/qytPaymentCallback")


    public String qytPaymentCallback(@RequestBody QYTPaymentCallback qytPaymentCallback) {


        log.info("【黔云通支付回调通知】请求参数:" + JSON.toJSONString(qytPaymentCallback));


        if (null == qytPaymentCallback) {


            return "error";


        }


        return "success";


    }


    


}