From a075cdd2f76fae321ecf95dce363141ade30f0f1 Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期五, 12 四月 2024 22:37:58 +0800 Subject: [PATCH] 新增加功能 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 180 +++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 107 insertions(+), 73 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java index 1d64ae8..fb8e8bc 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java @@ -81,9 +81,6 @@ @Autowired private IOrderCrossCityService orderCrossCityService; - /*@Autowired - private ICBCPayUtil icbcPayUtil;*/ - @Autowired private IOrderLogisticsService orderLogisticsService; @@ -117,12 +114,15 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<List<OrderStatusWarpper>> queryServingOrder(HttpServletRequest request){ + public ResultUtil<List<OrderStatusWarpper>> queryServingOrder(Integer language, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } + UserInfo userInfo = userInfoService.selectById(uid); + userInfo.setLanguage(language); + userInfoService.updateById(userInfo); List<OrderStatusWarpper> data = new ArrayList<>(); List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12); for(OrderPrivateCar orderPrivateCar : orderPrivateCars){ @@ -193,19 +193,19 @@ List<Map<String, Object>> list = null; switch (type){ case 1: - list = orderPrivateCarService.queryMyOrderList(uid, pageNum, size); + list = orderPrivateCarService.queryMyOrderList(language, uid, pageNum, size); break; case 2: - list = orderTaxiService.queryMyOrderList(uid, pageNum, size); + list = orderTaxiService.queryMyOrderList(language, uid, pageNum, size); break; case 3: - list = orderCrossCityService.queryMyOrderList(uid, pageNum, size); + list = orderCrossCityService.queryMyOrderList(language, uid, pageNum, size); break; case 4: list = orderLogisticsService.queryMyOrderList(uid, pageNum, size, language); break; case 5: - list = orderCharteredCarService.queryMyOrderList(uid, pageNum, size); + list = orderCharteredCarService.queryMyOrderList(language, uid, pageNum, size); break; } return ResultUtil.success(OrderWarpper.getOrderWarpper(list)); @@ -238,22 +238,22 @@ } String name = language == 1 ? "打车" : language == 2 ? "Ride" : "Course"; pageNum = (pageNum - 1) * size; - List<Map<String, Object>> maps = orderCancelService.queryCancel(uid, 2); + List<Map<String, Object>> maps = orderCancelService.queryCancel(language, uid, 2); for (Map<String, Object> map : maps) { Integer orderType = Integer.valueOf(map.get("orderType").toString()); if(1 == orderType){ map.put("name", language == 1 ? "打车订单取消" : language == 2 ? "Ride order cancelled" : "Commande de trajet annulée"); } if(4 == orderType){ - map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de colis"); + map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de livraison"); } } - List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(uid);//专车 + List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(language, uid);//专车 for (Map<String, Object> map : list) { map.put("name", name); } - name = language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison"; - List<Map<String, Object>> list3 = orderLogisticsService.queryMyTravelRecord(uid);//小件物流 + name = language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison"; + List<Map<String, Object>> list3 = orderLogisticsService.queryMyTravelRecord(language, uid);//小件物流 for (Map<String, Object> map : list3) { map.put("name", name); } @@ -264,7 +264,7 @@ for(TransactionDetails transactionDetails1 : transactionDetails){ Map<String, Object> map = new HashMap<>(); map.put("money", transactionDetails1.getMoney()); - map.put("time", sdf.format(transactionDetails1.getInsertTime())); + map.put("time", DateUtil.conversionFormat(language, sdf.format(transactionDetails1.getInsertTime()))); map.put("name", "跨城订单取消退款"); map.put("insertTime", Double.valueOf(transactionDetails1.getInsertTime().getTime() / 1000).intValue()); list4.add(map); @@ -320,7 +320,7 @@ @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<List<OrderWarpper>> queryInvoiceOrder(Integer type, Integer orderType, Date startTime, + public ResultUtil<List<OrderWarpper>> queryInvoiceOrder(Integer language, Integer type, Integer orderType, Date startTime, Date endTime, Double startMoney, Double endMoney, Integer pageNum, Integer size, HttpServletRequest request){ pageNum = (pageNum - 1) * size; @@ -333,7 +333,7 @@ if(null != orderType){ switch (orderType){ case 1://专车 - list = orderPrivateCarService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid); + list = orderPrivateCarService.queryInvoiceOrder(language, type, startTime, endTime, startMoney, endMoney, uid); break; // case 2://出租车 // list = orderTaxiService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid); @@ -342,7 +342,7 @@ // list = orderCrossCityService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid); // break; case 4://同城小件物流 - list = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType); + list = orderLogisticsService.queryInvoiceOrder(language, type, startTime, endTime, startMoney, endMoney, uid, orderType); break; // case 5://跨城小件物流 // list = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType); @@ -350,7 +350,7 @@ } }else{ //专车 - List<Map<String, Object>> maps = orderPrivateCarService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid); + List<Map<String, Object>> maps = orderPrivateCarService.queryInvoiceOrder(language, type, startTime, endTime, startMoney, endMoney, uid); list.addAll(maps); // //出租车 // List<Map<String, Object>> list1 = orderTaxiService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid); @@ -359,7 +359,7 @@ // List<Map<String, Object>> list2 = orderCrossCityService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid); // list.addAll(list2); //同城小件物流 - List<Map<String, Object>> list3 = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType); + List<Map<String, Object>> list3 = orderLogisticsService.queryInvoiceOrder(language, type, startTime, endTime, startMoney, endMoney, uid, orderType); list.addAll(list3); // //跨城小件物流 // List<Map<String, Object>> list4 = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType); @@ -439,33 +439,33 @@ Map<String, Object> map = null; switch (orderType){ case 1://专车 - map = orderPrivateCarService.queryOrderInfo(orderId); + map = orderPrivateCarService.queryOrderInfo(language, orderId); break; case 2://出租车 - map = orderTaxiService.queryOrderInfo(orderId); + map = orderTaxiService.queryOrderInfo(language, orderId); break; case 3://跨城 - map = orderCrossCityService.queryOrderInfo(orderId); + map = orderCrossCityService.queryOrderInfo(language, orderId); break; case 4://同城小件 - map = orderLogisticsService.queryOrderInfo(orderId); + map = orderLogisticsService.queryOrderInfo(language, orderId); break; case 5://跨城小件 - map = orderLogisticsService.queryOrderInfo(orderId); + map = orderLogisticsService.queryOrderInfo(language, orderId); break; } if(map.get("telX") != null){ map.put("driverPhone", map.get("telX")); } OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map); - String driverName = orderInfoWarpper.getDriverName(); - if(language == 2){ - driverName = "Master " + driverName.replace("师傅", ""); - } - if(language == 3){ - driverName = "Maître " + driverName.replace("师傅", ""); - } - orderInfoWarpper.setDriverName(driverName); +// String driverName = orderInfoWarpper.getDriverName(); +// if(language == 2){ +// driverName = "Master " + driverName.replace("师傅", ""); +// } +// if(language == 3){ +// driverName = "Maître " + driverName.replace("师傅", ""); +// } +// orderInfoWarpper.setDriverName(driverName); File file = new File(filePath + orderId + "_1.txt"); if(file.exists()){ @@ -507,33 +507,33 @@ Map<String, Object> map = null; switch (orderType){ case 1://专车 - map = orderPrivateCarService.queryOrderInfo(orderId); + map = orderPrivateCarService.queryOrderInfo(language, orderId); break; case 2://出租车 - map = orderTaxiService.queryOrderInfo(orderId); + map = orderTaxiService.queryOrderInfo(language, orderId); break; case 3://跨城 - map = orderCrossCityService.queryOrderInfo(orderId); + map = orderCrossCityService.queryOrderInfo(language, orderId); break; case 4://同城小件 - map = orderLogisticsService.queryOrderInfo(orderId); + map = orderLogisticsService.queryOrderInfo(language, orderId); break; case 5://跨城小件 - map = orderLogisticsService.queryOrderInfo(orderId); + map = orderLogisticsService.queryOrderInfo(language, orderId); break; } if(null != map.get("telX")){ map.put("driverPhone", map.get("telX")); } OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map); - String driverName = orderInfoWarpper.getDriverName(); - if(language == 2){ - driverName = "Master " + driverName.replace("师傅", ""); - } - if(language == 3){ - driverName = "Maître " + driverName.replace("师傅", ""); - } - orderInfoWarpper.setDriverName(driverName); +// String driverName = orderInfoWarpper.getDriverName(); +// if(language == 2){ +// driverName = "Master " + driverName.replace("师傅", ""); +// } +// if(language == 3){ +// driverName = "Maître " + driverName.replace("师傅", ""); +// } +// orderInfoWarpper.setDriverName(driverName); return ResultUtil.success(orderInfoWarpper); }catch (Exception e){ e.printStackTrace(); @@ -555,7 +555,7 @@ @ApiOperation(value = "获取订单取消支付页面详情", tags = {"用户端-服务中"}, notes = "") @ApiImplicitParams({ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"), - @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=城际)", name = "orderType", required = true, dataType = "int"), + @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=城际,4=同城小件物流)", name = "orderType", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<OrderInfoWarpper> queryCancelPage(Integer orderId, Integer orderType, Integer language){ @@ -563,30 +563,27 @@ Map<String, Object> map = null; switch (orderType) { case 1://专车 - map = orderPrivateCarService.queryOrderInfo(orderId); - ResultUtil<BaseWarpper> res = orderPrivateCarService.queryCancleAmount(orderId); + map = orderPrivateCarService.queryOrderInfo(language, orderId); + ResultUtil<BaseWarpper> res = orderPrivateCarService.queryCancleAmount(orderId, language); map.put("cancelPayMoney", res.getData().getAmount()); break; case 2://出租车 - map = orderTaxiService.queryOrderInfo(orderId); + map = orderTaxiService.queryOrderInfo(language, orderId); ResultUtil<BaseWarpper> re = orderTaxiService.queryCancleAmount(orderId); map.put("cancelPayMoney", re.getData().getAmount()); break; case 3://跨城 - map = orderCrossCityService.queryOrderInfo(orderId); + map = orderCrossCityService.queryOrderInfo(language, orderId); ResultUtil<BaseWarpper> r = orderCrossCityService.queryCancleAmount(orderId); map.put("cancelPayMoney", r.getData().getAmount()); break; + case 4://同城小件物流 + map = orderLogisticsService.queryOrderInfo(language, orderId); + ResultUtil<BaseWarpper> r1 = orderLogisticsService.queryCancleAmount(orderId, language); + map.put("cancelPayMoney", r1.getData().getAmount()); + break; } OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map); - String driverName = orderInfoWarpper.getDriverName(); - if(language == 2){ - driverName = "Master " + driverName.replace("师傅", ""); - } - if(language == 3){ - driverName = "Maître " + driverName.replace("师傅", ""); - } - orderInfoWarpper.setDriverName(driverName); return ResultUtil.success(orderInfoWarpper); }catch (Exception e){ e.printStackTrace(); @@ -833,18 +830,20 @@ @ApiOperation(value = "获取取消订单需要支付的费用金额", tags = {"用户端-出租车", "用户端-专车"}, notes = "返回金额为0则不需要支付") @ApiImplicitParams({ @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "int"), - @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=跨城)", name = "orderType", required = true, dataType = "int"), + @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=跨城, 4=同城小件物流)", name = "orderType", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer orderType){ + public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer orderType, Integer language){ try { switch (orderType){ case 1: - return orderPrivateCarService.queryCancleAmount(id); + return orderPrivateCarService.queryCancleAmount(id, language); case 2: return orderTaxiService.queryCancleAmount(id); case 3: return orderCrossCityService.queryCancleAmount(id); + case 4: + return orderLogisticsService.queryCancleAmount(id, language); } return ResultUtil.success(); }catch (Exception e){ @@ -866,16 +865,19 @@ */ @ResponseBody @PostMapping("/api/taxi/addCancle") - @ApiOperation(value = "添加取消记录", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城"}, notes = "") + @ApiOperation(value = "添加取消记录【2.0】", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城"}, notes = "") @ApiImplicitParams({ @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "int"), @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=跨城)", name = "orderType", required = true, dataType = "int"), @ApiImplicitParam(value = "取消原因", name = "reason", required = true, dataType = "string"), + @ApiImplicitParam(value = "当前经度", name = "lon", required = true, dataType = "Double"), + @ApiImplicitParam(value = "当前纬度", name = "lat", required = true, dataType = "Double"), + @ApiImplicitParam(value = "详细地址", name = "address", required = true, dataType = "string"), @ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"), @ApiImplicitParam(value = "语言类型(1=简体中文,2=英语,3=法语)", name = "language", required = false, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil addCancle(Integer id, Integer orderType, String reason, String remark, Integer language, HttpServletRequest request){ + public ResultUtil addCancle(Integer id, Integer orderType, String reason, String remark, Double lon, Double lat, String address, Integer language, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ @@ -883,13 +885,13 @@ } switch (orderType){ case 1: - return orderPrivateCarService.addCancle(id, reason, remark, uid, language); + return orderPrivateCarService.addCancle(id, reason, remark, uid, lon, lat, address, language); // case 2: // return orderTaxiService.addCancle(id, reason, remark, uid); // case 3: // return orderCrossCityService.addCancle(id, reason, remark, uid); case 4: - return orderLogisticsService.addCancle(id, reason, remark, uid, language); + return orderLogisticsService.addCancle(id, reason, remark, uid, lon, lat, address, language); // case 5: // return orderLogisticsService.addCancle(id, reason, remark, uid); // case 6: @@ -953,10 +955,10 @@ */ @ResponseBody @PostMapping("/api/taxi/cancleOrderTaxi") - @ApiOperation(value = "取消操作支付【1.1】", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城"}, notes = "") + @ApiOperation(value = "取消操作支付【1.1】", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城", "用户端-小件物流"}, notes = "") @ApiImplicitParams({ @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "int"), - @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=跨城)", name = "orderType", required = true, dataType = "int"), + @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=跨城,4=同城小件物流)", name = "orderType", required = true, dataType = "int"), @ApiImplicitParam(value = "支付方式(1=手机支付,2=银行卡支付,3=余额)", name = "payType", required = true, dataType = "int"), @ApiImplicitParam(value = "银行卡id", name = "bankCardId", required = false, dataType = "int"), @ApiImplicitParam(value = "取消单id(取消操作返回)", name = "cancleId", required = false, dataType = "int"), @@ -976,6 +978,8 @@ // return orderTaxiService.cancleOrderTaxi(id, payType, cancleId, type); // case 3: // return orderCrossCityService.cancleOrderCrossCity(id, payType, cancleId, type); + case 4: + return orderLogisticsService.cancleOrderPrivateCar(id, payType, bankCardId, cancleId, type, language); } return ResultUtil.success(); }catch (Exception e){ @@ -1085,7 +1089,7 @@ @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil queryCoupon(Integer orderId, Integer orderType, Integer pageNum, Integer size, HttpServletRequest request){ + public ResultUtil queryCoupon(Integer language, Integer orderId, Integer orderType, Integer pageNum, Integer size, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ @@ -1094,7 +1098,7 @@ List<Map<String, Object>> list = new ArrayList<>(); switch (orderType){ case 1: - list = orderPrivateCarService.queryCoupon(orderId, uid, pageNum, size); + list = orderPrivateCarService.queryCoupon(language, orderId, uid, pageNum, size); break; // case 2: // list = orderTaxiService.queryCoupon(orderId, uid, pageNum, size); @@ -1102,9 +1106,9 @@ // case 3: // list = orderCrossCityService.queryCoupon(orderId, uid, pageNum, size); // break; -// case 4: -// list = orderLogisticsService.queryCoupon(orderId, uid, pageNum, size); -// break; + case 4: + list = orderLogisticsService.queryCoupon(language,orderId, uid, pageNum, size); + break; // case 5: // list = orderLogisticsService.queryCoupon(orderId, uid, pageNum, size); // break; @@ -1152,7 +1156,7 @@ // case 3: // return orderCrossCityService.payCrossCityOrder(payType, orderId, couponId, type); case 4: - return orderLogisticsService.payLogisticsOrder(payType, bankCardId, orderId, type, language); + return orderLogisticsService.payLogisticsOrder(payType, bankCardId, orderId,couponId, type, language); // case 5: // return orderLogisticsService.payLogisticsOrder(payType, orderId, type, language); } @@ -1257,6 +1261,7 @@ @ApiImplicitParams({ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"), @ApiImplicitParam(value = "订单类型", name = "orderType", required = true, dataType = "int"), + @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil shareRedEnvelope(Integer orderId, Integer orderType, Integer language){ @@ -1317,6 +1322,9 @@ // case 3: // orderCrossCityService.payCancelOrderCrossCity(id, order_id, 1); // break; + case 4: + orderLogisticsService.payCancelOrderPrivateCar(id, order_id, language); + break; } callbackResponse.setCheckout_request_id(order_id); callbackResponse.setMerchant_transaction_id(out_trade_no); @@ -1591,4 +1599,30 @@ payoutCallbackResponse.setResults(results); return payoutCallbackResponse; } + + + + @ResponseBody + @PostMapping("/api/taxi/updateEndAddress") + @ApiOperation(value = "修改目的地【2.0】", tags = {"用户端-专车", "用户端-小件物流"}, notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"), + @ApiImplicitParam(value = "订单类型", name = "orderType", required = true, dataType = "int"), + @ApiImplicitParam(value = "终点经度", name = "endLon", required = true, dataType = "String"), + @ApiImplicitParam(value = "终点纬度", name = "endLat", required = true, dataType = "String"), + @ApiImplicitParam(value = "终点地址", name = "endAddress", required = true, dataType = "String"), + @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"), + @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil updateEndAddress(Integer orderId, Integer orderType, String endLon, String endLat, String endAddress){ + switch (orderType){ + case 1: + orderPrivateCarService.updateEndAddress(orderId, endLon, endLat, endAddress); + break; + case 4: + orderLogisticsService.updateEndAddress(orderId, endLon, endLat, endAddress); + break; + } + return ResultUtil.success(); + } } -- Gitblit v1.7.1