UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1427,7 +1427,7 @@ case 2: return orderTaxiService.payTaxiOrder1(payType, orderId, objectId, objectType, type, path, ip); case 3: ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type); ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type, path, ip); orderCrossCityService.promotion(orderId); @@ -2186,6 +2186,11 @@ orderTaxiService.payOrderTaxiCallback(Integer.valueOf(orderNo), payId, 1, 0); orderTaxiService.promotion(Integer.valueOf(orderNo)); } //跨城出行 if (orderNo.contains("CC")) { orderNo = orderNo.substring(2); orderCrossCityService.payOrderCrossCityCallback(Integer.valueOf(orderNo), payId, 1, null); } } catch (Exception e) { e.printStackTrace(); return "error"; @@ -2380,8 +2385,7 @@ @ApiImplicitParam(value = "行程单信息", name = "tripSheet", required = false, dataType = "com.stylefeng.guns.modular.system.model.vo.TripSheetVo"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil sendTripSheetEmail(@RequestBody TripSheetVo tripSheet, HttpServletRequest request) { public ResultUtil sendTripSheetEmail(@RequestBody TripSheetVo tripSheet, HttpServletRequest request) { try { // 从Redis中获取当前用户ID Integer uid = userInfoService.getUserIdFormRedis(request); UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java
@@ -391,6 +391,40 @@ private String promotionUser; private String promotionPhone; /** * 中台行程id */ private String travelId; /** * 中台是否已创建订单（0=否，1=是） */ private Integer isCreated; /** * 是否是追缴单（0=否，1=是） */ private Integer recoveryOrder; /** * 是否生成追缴单（0=否，1=是） */ private Integer isGenerateRecoveryOrder; /** * 原始订单id */ private Integer oldOrderId; private Integer abnormalStatus; private String abnormalRemark; private BigDecimal responsibilityMoney; private String voice; private Date voiceTime; private Date recoveryOrderCreateDate; private Date payTime; public String getPromotionUser() { return promotionUser; @@ -1023,6 +1057,102 @@ this.splitAllocation = splitAllocation; } public String getTravelId() { return travelId; } public void setTravelId(String travelId) { this.travelId = travelId; } public Integer getIsCreated() { return isCreated; } public void setIsCreated(Integer isCreated) { this.isCreated = isCreated; } public Integer getRecoveryOrder() { return recoveryOrder; } public void setRecoveryOrder(Integer recoveryOrder) { this.recoveryOrder = recoveryOrder; } public Integer getIsGenerateRecoveryOrder() { return isGenerateRecoveryOrder; } public void setIsGenerateRecoveryOrder(Integer isGenerateRecoveryOrder) { this.isGenerateRecoveryOrder = isGenerateRecoveryOrder; } public Integer getOldOrderId() { return oldOrderId; } public void setOldOrderId(Integer oldOrderId) { this.oldOrderId = oldOrderId; } public Integer getAbnormalStatus() { return abnormalStatus; } public void setAbnormalStatus(Integer abnormalStatus) { this.abnormalStatus = abnormalStatus; } public String getAbnormalRemark() { return abnormalRemark; } public void setAbnormalRemark(String abnormalRemark) { this.abnormalRemark = abnormalRemark; } public BigDecimal getResponsibilityMoney() { return responsibilityMoney; } public void setResponsibilityMoney(BigDecimal responsibilityMoney) { this.responsibilityMoney = responsibilityMoney; } public String getVoice() { return voice; } public void setVoice(String voice) { this.voice = voice; } public Date getVoiceTime() { return voiceTime; } public void setVoiceTime(Date voiceTime) { this.voiceTime = voiceTime; } public Date getRecoveryOrderCreateDate() { return recoveryOrderCreateDate; } public void setRecoveryOrderCreateDate(Date recoveryOrderCreateDate) { this.recoveryOrderCreateDate = recoveryOrderCreateDate; } public Date getPayTime() { return payTime; } public void setPayTime(Date payTime) { this.payTime = payTime; } @Override public String toString() { return "OrderCrossCity{" + UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
@@ -96,7 +96,7 @@ * @return * @throws Exception */ ResultUtil payCrossCityOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type)throws Exception; ResultUtil payCrossCityOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type, String path, String ip)throws Exception;
@@ -25,6 +25,8 @@ import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO; import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.*; import com.stylefeng.guns.modular.system.warpper.*; import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper; import com.stylefeng.guns.modular.taxi.model.OrderTaxi; @@ -54,6 +56,9 @@ import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -197,8 +202,10 @@ //存储摆渡车无接单后推送标识，实现多个类型的摆渡车订单无人接单后只给前端推送一次 public static Map<Integer, Boolean> pushEndMap = new HashMap<>(); @Autowired private ICompanyService iCompanyService; /** * 计算支付金额 * @@ -842,7 +849,7 @@ @Override @Transactional(propagation = Propagation.REQUIRES_NEW) public ResultUtil payCrossCityOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type) throws Exception { public ResultUtil payCrossCityOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type, String path, String ip) throws Exception { OrderCrossCity orderCrossCity = this.selectById(orderId); if (orderCrossCity.getState() != 7) { return ResultUtil.error("订单已完成支付，不允许重复支付", ""); @@ -1011,9 +1018,119 @@ if (orderMoney == 0) { return ResultUtil.error("请使用余额支付"); } String app = type == 1 ? "APP" : "JSAPI"; resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_3_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId()); // String app = type == 1 ? "APP" : "JSAPI"; // resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_3_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId()); //创建订单并拉起支付（这里不需要创建行程单，由三方处理） Driver driver = driverService.selectById(orderCrossCity.getDriverId()); if(null == orderCrossCity.getIsCreated() || 0 == orderCrossCity.getIsCreated()){ //调用中台创建订单及拉起支付接口 TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData(); tradeOrderCreateData.setTreatShopId(driver.getEmpId().toString()); //追缴单不要分账 if(0 == orderCrossCity.getRecoveryOrder()){ tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isCompensate\":\"0\",\"isPromote\":\"" + (orderCrossCity.getPromotion() == 2 ? 1 : 0) + "\"}"); }else{ tradeOrderCreateData.setField1("{\"profitSharing\":\"0\",\"isCompensate\":\"1\",\"isPromote\":\"0\"}"); } tradeOrderCreateData.setCharge(new BigDecimal(orderMoney)); tradeOrderCreateData.setOrderNo("CC" + orderCrossCity.getId()); tradeOrderCreateData.setCustomerId(userInfo.getOnconUUID()); tradeOrderCreateData.setPartnerPayId(orderCrossCity.getTravelId()); tradeOrderCreateData.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + ""); tradeOrderCreateData.setOrderDesc("完成订单"); tradeOrderCreateData.setRetUrl(path); tradeOrderCreateData.setClientIp(ip); tradeOrderCreateData.setServiceType(3); if(null != orderCrossCity.getPromotionDriverId()){ Driver driver1 = driverService.selectById(orderCrossCity.getPromotionDriverId()); Company company = companyService.selectById(driver1.getCompanyId()); tradeOrderCreateData.setPromoterId(driver1.getEmpId().toString()); tradeOrderCreateData.setSupplierShopId(company.getEnterCode()); } List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId()); if(0 == orderCrossCity.getRecoveryOrder()){ goodsInfoRequest.setProfitSharing("1"); }else{ goodsInfoRequest.setProfitSharing("0"); } goodsInfo.add(goodsInfoRequest); tradeOrderCreateData.setGoodsInfo(goodsInfo); TradeOrderCreate tradeOrderCreate = OrderUtil.tradeOrderCreate1(tradeOrderCreateData, orderCrossCity.getRecoveryOrder()); PayInfo payInfo = tradeOrderCreate.getPayInfo(); if(!"000000".equals(payInfo.getRetCode())){ return ResultUtil.error(payInfo.getRetMsg()); } orderCrossCity.setIsCreated(1); orderCrossCity.setTrackId(tradeOrderCreate.getOrderInfo().getOrderId()); resultUtil = ResultUtil.success(payInfo.getData().getRedirectUrl()); }else{ //拉起支付 TradePayOff1Data tradePayOff1Data = new TradePayOff1Data(); tradePayOff1Data.setPartnerPayId(orderCrossCity.getTravelId()); tradePayOff1Data.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + ""); tradePayOff1Data.setRetUrl(path); tradePayOff1Data.setClientIp(ip); tradePayOff1Data.setOrderDesc("完成订单"); List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId()); if(0 == orderCrossCity.getRecoveryOrder()){ goodsInfoRequest.setProfitSharing("1"); }else{ goodsInfoRequest.setProfitSharing("0"); } goodsInfo.add(goodsInfoRequest); tradePayOff1Data.setGoodsInfo(goodsInfo); PayInfo payInfo = OrderUtil.tradePayOff1(tradePayOff1Data, orderCrossCity.getRecoveryOrder()); if(!"000000".equals(payInfo.getRetCode())){ return ResultUtil.error(payInfo.getRetMsg()); } resultUtil = ResultUtil.success(payInfo.getData().getRedirectUrl()); } paymentRecordService.saveData(1, orderCrossCity.getUserId(), 1, orderId, 3, 1, orderMoney, "", 1);//添加预支付数据 //创建定时任务查询订单支付状态 ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>()); threadPoolExecutor.execute(()->{ try { int num = 1; int wait = 0; while (num <= 13) { int min = 5000; wait += (min * num); OrderCrossCity orderCrossCity1 = this.selectById(orderCrossCity.getId()); if (orderCrossCity1.getState() != 7) { break; } GetTravelItineraryListRequest request = new GetTravelItineraryListRequest(); request.setCustomerId(userInfo.getOnconUUID()); request.setOrderNo("CC" + orderCrossCity1.getId()); request.setDriverId(driver.getEmpId().toString()); ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request); TravelItinerary travelItinerary = travelItineraryList.getList().get(0); if(travelItinerary.getStatus() != 7 || travelItinerary.getOrderStatus() == 11){ GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest(); getPaymentInfoDataRequest1.setPartnerPayId(orderCrossCity1.getTravelId()); GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1); payOrderCrossCityCallback(orderCrossCity1.getId(), getPaymentInfo1.getPayId(), 1, null); break; } Thread.sleep(wait); num++; } } catch (Exception e) { e.printStackTrace(); }finally { threadPoolExecutor.shutdown(); } }); } if (payType == 2) {//支付宝支付 if (orderMoney == 0) { @@ -1026,22 +1143,18 @@ if (userInfo.getBalance() == null || userInfo.getBalance() < orderMoney) { return ResultUtil.error("余额不足，无法完成支付"); } // if(orderMoney > 0){ // resultUtil= appOrderController.moneyPay(orderId,userInfo.getId(),orderMoney); // if(resultUtil.getCode()==500){ // return ResultUtil.error("电子余额不足，无法完成支付"); // } // } userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); OpenCity openCity = openCityService.openCity1(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString()); SysIntegral query1 = sysIntegralMapper.query(openCity.getId()); userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 if(null != query1){ userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 userInfoService.updateById(userInfo); } //添加交易明细 transactionDetailsService.saveData(uid, "跨城出行订单", orderMoney, 2, 1, 1, 3, orderId); userInfoService.updateById(userInfo); orderCrossCity.setState(2);//跨城支付完成后才开始服务 orderCrossCity.setPayType(3); @@ -1369,9 +1482,30 @@ if (orderCrossCity1.getState() == 7 && orderCrossCity1.getPayMoney() == null) { orderCrossCity1.setState(10); orderCrossCityMapper.updateById(orderCrossCity1); //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderCrossCity1.getTravelId()); request1.setStatus(orderCrossCity1.getState()); if (null != orderCrossCity1.getDriverId()) { Driver driver2 = driverService.selectById(orderCrossCity1.getDriverId()); Company company = iCompanyService.selectById(driver2.getCompanyId()); request1.setDriverId(driver2.getEmpId().toString()); request1.setSupplierShopId(company.getEnterCode()); } if (2 == orderCrossCity1.getPromotion() && null != orderCrossCity1.getPromotionDriverId()) { Driver driver2 = driverService.selectById(orderCrossCity1.getPromotionDriverId()); request1.setPromoterId(driver2.getEmpId().toString()); } OrderUtil.modifyTravelItinerary(request1); //未支付的情况取消订单 if(null == orderCrossCity1.getPayType() && ToolUtil.isNotEmpty(orderCrossCity1.getTravelId())){ OrderUtil.tradeOrderCancel(orderCrossCity1.getTravelId()); } OrderCancel orderCancel = new OrderCancel(); orderCancel.setOrderId(orderCrossCity.getId()); orderCancel.setOrderId(orderCrossCity1.getId()); orderCancel.setOrderType(3); orderCancel.setReason("用户未及时付款，系统自动取消订单"); orderCancel.setRemark("用户未及时付款，系统自动取消订单"); @@ -1381,18 +1515,20 @@ orderCancelService.insert(orderCancel); //修改司机座位 LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId()); lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber()); lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity.getTravelMode() == 1 ? "," : "") + orderCrossCity.getSeatNumber()); LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity1.getLineShiftDriverId()); lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity1.getPeopleNumber()); lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity1.getTravelMode() == 1 ? "," : "") + orderCrossCity1.getSeatNumber()); lineShiftDriverMapper.updateById(lineShiftDriver); //修改司机为空闲 List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11); List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity1.getDriverId(), 2, 3, 4, 5, 11); if (orderCrossCities.size() == 0) { Driver driver = driverService.selectById(orderCrossCity.getDriverId()); Driver driver = driverService.selectById(orderCrossCity1.getDriverId()); driver.setState(2); driverService.updateById(driver); } } } }; @@ -2043,7 +2179,28 @@ } else { return ResultUtil.error("请完善后台取消规则设置"); } //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderCrossCity.getTravelId()); request1.setStatus(orderCrossCity.getState()); if (null != orderCrossCity.getDriverId()) { Driver driver2 = driverService.selectById(orderCrossCity.getDriverId()); Company company = iCompanyService.selectById(driver2.getCompanyId()); request1.setDriverId(driver2.getEmpId().toString()); request1.setSupplierShopId(company.getEnterCode()); } if (2 == orderCrossCity.getPromotion() && null != orderCrossCity.getPromotionDriverId()) { Driver driver2 = driverService.selectById(orderCrossCity.getPromotionDriverId()); request1.setPromoterId(driver2.getEmpId().toString()); } OrderUtil.modifyTravelItinerary(request1); //未支付的情况取消订单 if(null == orderCrossCity.getPayType() && ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){ OrderUtil.tradeOrderCancel(orderCrossCity.getTravelId()); } UserInfo userInfo = userInfoService.selectById(orderCrossCity.getUserId()); //已支付的情况下进行退款操作 if (null != orderCrossCity.getPayType() && null != orderCrossCity.getPayMoney()) { // 退款 @@ -2055,7 +2212,6 @@ } if (orderCrossCity.getPayType() == 3) {//余额支付 UserInfo userInfo = userInfoService.selectById(orderCrossCity.getUserId()); userInfo.setBalance(userInfo.getBalance() + orderCrossCity.getPayMoney()); userInfoService.updateById(userInfo); //添加交易明细 @@ -2077,14 +2233,38 @@ } if (query.getPayType() == 1) {//微信 Map<String, String> map = payMoneyUtil.wxRefund(query.getCode(), id + "_3", query.getAmount().toString(), query.getAmount().toString(), "/base/cancleOrderWXPay"); if (!"SUCCESS".equals(map.get("return_code"))) { return ResultUtil.error(map.get("return_msg")); //中台订单退款操作 if(ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){ TradeOrderRefundRequest request = new TradeOrderRefundRequest(); request.setPartnerPayId(orderCrossCity.getTravelId()); request.setPayId(query.getCode()); request.setRefundTotalFee(Double.valueOf(orderCrossCity.getPayMoney() * 100).intValue() + ""); request.setRemark("跨城订单取消退款"); request.setRefundType("RF"); RefundInfoRequest refundInfo = new RefundInfoRequest(); refundInfo.setPayItemId(orderCrossCity.getTravelId()); refundInfo.setPayId(query.getCode()); refundInfo.setTradeFee(Double.valueOf(orderCrossCity.getPayMoney() * 100).intValue() + ""); request.setRefundInfos(new ArrayList<RefundInfoRequest>(){{ add(refundInfo); }}); TradeOrderRefund tradeOrderRefund = OrderUtil.tradeOrderRefund(request); //退款通知 OrderRefundNoticeRequest request1 = new OrderRefundNoticeRequest(); request1.setOrderId(orderCrossCity.getTravelId()); request1.setRefundPayNum(tradeOrderRefund.getRefundId()); request1.setRefundType("5"); request1.setApplyRefundCharge(new BigDecimal(orderCrossCity.getPayMoney())); request1.setActualRefundCharge(new BigDecimal(orderCrossCity.getPayMoney())); request1.setRefundAccount(userInfo.getOnconUUID()); request1.setRemark("跨城订单取消退款"); OrderUtil.orderRefundNotice(request1); //添加交易明细 transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城出行取消退款", query.getAmount(), 1, 1, 1, 3, id); } } else if (query.getPayType() == 4) { // 云闪付 // TODO 退款 UserInfo userInfo = userInfoService.selectById(orderCrossCity.getUserId()); userInfo.setBalance(userInfo.getBalance() + orderCrossCity.getPayMoney()); userInfoService.updateById(userInfo); //添加交易明细 @@ -2104,26 +2284,6 @@ transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城出行取消退款", query.getAmount(), 1, 1, 1, 3, id); } } //添加负的收入明细 List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("type", 2).eq("incomeId", id).eq("orderType", 3)); for (Income income : incomes) { if (income.getUserType() == 2) {//处理司机的收入 Driver driver = driverService.selectById(income.getObjectId()); driver.setBalance(driver.getBalance() - income.getMoney()); driver.setBusinessMoney(driver.getBusinessMoney() - income.getMoney()); driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - income.getMoney()); driverService.updateById(driver); } Income income1 = new Income(); BeanUtils.copyProperties(income, income1); income1.setMoney(income.getMoney() * -1); income1.setId(null); income1.setInsertTime(new Date()); incomeService.insert(income1); } } //添加消息 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ApplicationRunnerUtil.java
@@ -1,15 +1,20 @@ package com.stylefeng.guns.modular.system.util; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.crossCity.dao.LineShiftDriverMapper; import com.stylefeng.guns.modular.crossCity.dao.OrderCrossCityMapper; import com.stylefeng.guns.modular.crossCity.model.LineShiftDriver; import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity; import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService; import com.stylefeng.guns.modular.system.model.Company; import com.stylefeng.guns.modular.system.model.Driver; import com.stylefeng.guns.modular.system.model.OrderCancel; import com.stylefeng.guns.modular.system.service.ICompanyService; import com.stylefeng.guns.modular.system.service.IDriverService; import com.stylefeng.guns.modular.system.service.IOrderCancelService; import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -42,6 +47,9 @@ @Autowired private IDriverService driverService; @Autowired private ICompanyService iCompanyService; @Override @@ -65,8 +73,29 @@ orderCrossCity1.setState(10); orderCrossCityService.updateById(orderCrossCity1); //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderCrossCity1.getTravelId()); request1.setStatus(orderCrossCity1.getState()); if (null != orderCrossCity1.getDriverId()) { Driver driver2 = driverService.selectById(orderCrossCity1.getDriverId()); Company company = iCompanyService.selectById(driver2.getCompanyId()); request1.setDriverId(driver2.getEmpId().toString()); request1.setSupplierShopId(company.getEnterCode()); } if (2 == orderCrossCity1.getPromotion() && null != orderCrossCity1.getPromotionDriverId()) { Driver driver2 = driverService.selectById(orderCrossCity1.getPromotionDriverId()); request1.setPromoterId(driver2.getEmpId().toString()); } OrderUtil.modifyTravelItinerary(request1); //未支付的情况取消订单 if(null == orderCrossCity1.getPayType() && ToolUtil.isNotEmpty(orderCrossCity1.getTravelId())){ OrderUtil.tradeOrderCancel(orderCrossCity1.getTravelId()); } OrderCancel orderCancel = new OrderCancel(); orderCancel.setOrderId(orderCrossCity.getId()); orderCancel.setOrderId(orderCrossCity1.getId()); orderCancel.setOrderType(3); orderCancel.setReason("用户未及时付款，系统自动取消订单"); orderCancel.setRemark("用户未及时付款，系统自动取消订单"); @@ -76,15 +105,15 @@ orderCancelService.insert(orderCancel); //修改司机座位 LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId()); lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber()); lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity.getTravelMode() == 1 ? "," : "") + orderCrossCity.getSeatNumber()); LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity1.getLineShiftDriverId()); lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity1.getPeopleNumber()); lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity1.getTravelMode() == 1 ? "," : "") + orderCrossCity1.getSeatNumber()); lineShiftDriverMapper.updateById(lineShiftDriver); //修改司机为空闲 List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11); List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity1.getDriverId(), 2, 3, 4, 5, 11); if(orderCrossCities.size() == 0){ Driver driver = driverService.selectById(orderCrossCity.getDriverId()); Driver driver = driverService.selectById(orderCrossCity1.getDriverId()); driver.setState(2); driverService.updateById(driver); } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -686,6 +686,135 @@ OrderInfo orderInfo = jsonObject.getObject("busiResp", OrderInfo.class); return orderInfo; } /** * 订单退款 * @param request * @return */ public static TradeOrderRefund tradeOrderRefund(TradeOrderRefundRequest request) { request.setPayPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5400004" : "5401007"); //请求路径 String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/tradeOrderRefund"; //私钥文件 String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath(); //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密 String appKey = qianYunTongConfig.getAppkey();//appkey Map<String, String> headers = new HashMap<>(); headers.put("Content-Type", "application/json"); Map<String, Object> contentMap = new HashMap<String, Object>(); Date nowdate = new Date(); SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss"); String timeStamp = date.format(nowdate); String messageId = UUIDUtil.getRandomCode(); contentMap.put(SystemParameterNames.getAppKey(), appKey); contentMap.put(SystemParameterNames.getMessage_id(), messageId); contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName()); contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus()); contentMap.put("content", new Gson().toJson(request)); log.info("【订单退款】请求地址:" + url); log.info("【订单退款】请求参数:" + JSON.toJSONString(contentMap)); String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap); log.info("【订单退款】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String resCode = jsonObject.getString("resCode"); if (!"000000".equals(resCode)) { log.error("【订单退款】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【订单退款】失败:" + jsonObject.getString("resMsg")); } JSONObject refundInfo = jsonObject.getJSONObject("busiResp").getJSONObject("refundInfo"); String retCode = refundInfo.getString("retCode"); if(!"".equals(retCode)){ log.error("【订单退款】失败:" + refundInfo.getString("retMsg")); throw new RuntimeException("【订单退款】失败:" + refundInfo.getString("retMsg")); } TradeOrderRefund tradeOrderRefund = refundInfo.getObject("data", TradeOrderRefund.class); return tradeOrderRefund; } /** * 订单退款通知 * @param request */ public static void orderRefundNotice(OrderRefundNoticeRequest request) { request.setScene("TRAFFIC"); request.setMhltiCenterAppId("52270015"); //请求路径 String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/orderRefundNotice"; //私钥文件 String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath(); //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密 String appKey = qianYunTongConfig.getAppkey();//appkey Map<String, String> headers = new HashMap<>(); headers.put("Content-Type", "application/json"); Map<String, Object> contentMap = new HashMap<String, Object>(); Date nowdate = new Date(); SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss"); String timeStamp = date.format(nowdate); String messageId = UUIDUtil.getRandomCode(); contentMap.put(SystemParameterNames.getAppKey(), appKey); contentMap.put(SystemParameterNames.getMessage_id(), messageId); contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName()); contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus()); contentMap.put("content", new Gson().toJson(request)); log.info("【订单退款通知】请求地址:" + url); log.info("【订单退款通知】请求参数:" + JSON.toJSONString(contentMap)); String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap); log.info("【订单退款通知】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String resCode = jsonObject.getString("resCode"); if (!"000000".equals(resCode)) { log.error("【订单退款通知】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【订单退款通知】失败:" + jsonObject.getString("resMsg")); } } /** * 订单取消 * @param orderId */ public static void tradeOrderCancel(String orderId) { TradeOrderCancelRequest request = new TradeOrderCancelRequest(); request.setScene("TRAFFIC"); request.setMhltiCenterAppId("52270015"); request.setOrderId(orderId); //请求路径 String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/tradeOrderCancel"; //私钥文件 String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath(); //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密 String appKey = qianYunTongConfig.getAppkey();//appkey Map<String, String> headers = new HashMap<>(); headers.put("Content-Type", "application/json"); Map<String, Object> contentMap = new HashMap<String, Object>(); Date nowdate = new Date(); SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss"); String timeStamp = date.format(nowdate); String messageId = UUIDUtil.getRandomCode(); contentMap.put(SystemParameterNames.getAppKey(), appKey); contentMap.put(SystemParameterNames.getMessage_id(), messageId); contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName()); contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus()); contentMap.put("content", new Gson().toJson(request)); log.info("【订单取消】请求地址:" + url); log.info("【订单取消】请求参数:" + JSON.toJSONString(contentMap)); String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap); log.info("【订单取消】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String resCode = jsonObject.getString("resCode"); if (!"000000".equals(resCode)) { log.error("【订单取消】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【订单取消】失败:" + jsonObject.getString("resMsg")); } } } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/OrderRefundNoticeRequest.java
New file @@ -0,0 +1,49 @@ package com.stylefeng.guns.modular.system.util.qianyuntong.model; import lombok.Data; import java.math.BigDecimal; @Data public class OrderRefundNoticeRequest { /** * 场景标识 */ private String scene; /** * 订单中心订单号 */ private String orderId; /** * 场景应用标识。默认52270015 */ private String mhltiCenterAppId; /** * 退款工单标识 */ private String refundPayNum; /** * 退款类型 1：未发货退款 2：未破损拒收 3：破损拒收 4：部分退款 5：全部退款 */ private String refundType; /** * 申请退款金额 */ private BigDecimal applyRefundCharge; /** * 实际退款金额 */ private BigDecimal actualRefundCharge; /** * 退款人 */ private String refundPerson; /** * 退款账号 */ private String refundAccount; /** * 退款理由 */ private String remark; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/RefundInfoRequest.java
New file @@ -0,0 +1,19 @@ package com.stylefeng.guns.modular.system.util.qianyuntong.model; import lombok.Data; @Data public class RefundInfoRequest { /** * 支付交易明细标识 */ private String payItemId; /** * 支付工单标识 */ private String payId; /** * 交易金额，单位分 */ private String tradeFee; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCancelRequest.java
New file @@ -0,0 +1,19 @@ package com.stylefeng.guns.modular.system.util.qianyuntong.model; import lombok.Data; @Data public class TradeOrderCancelRequest { /** * 场景标识 */ private String scene; /** * 订单中心订单号 */ private String orderId; /** * 场景应用标识。默认52270015 */ private String mhltiCenterAppId; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCreateData.java
@@ -56,6 +56,18 @@ */ private String customerId; /** * 推广人id */ private String promoterId; /** * 服务商商户ID（serviceType为3时必传） */ private String supplierShopId; /** * 场景服务类型。1、出租；2、网约车；3、城际；4、顺风车，5、代驾 */ private Integer serviceType; /** * 商户号，由支付中心分配。测试环境5400004 */ private String payPartnerId; UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderRefund.java
New file @@ -0,0 +1,15 @@ package com.stylefeng.guns.modular.system.util.qianyuntong.model; import lombok.Data; @Data public class TradeOrderRefund { /** * 退款总金额 */ private String refundTotalFee; /** * 退款标识 */ private String refundId; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderRefundRequest.java
New file @@ -0,0 +1,42 @@ package com.stylefeng.guns.modular.system.util.qianyuntong.model; import lombok.Data; import java.util.List; @Data public class TradeOrderRefundRequest { /** * 商户号，由支付中心分配。测试环境5400004，生产环境：5401007 */ private String payPartnerId; /** * 订单中心订单号 */ private String partnerPayId; /** * 支付工单标识 */ private String payId; /** * 退款总金额，单位为分 * 同一退款单多次发起退款请求时，退款金额必须一致 */ private String refundTotalFee; /** * 退款原因 */ private String remark; /** * 退款类型： * RF 退款 * BR 部分退款（目前仅集团统一支付支持部分退款） * CZ 冲正 */ private String refundType; /** * 支付退款单明细集合 */ private List<RefundInfoRequest> refundInfos; }
