liujie
2025-08-01 a0a814be1a2cff11a4eea699930b7df4b56ccacb
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -25,6 +25,7 @@
import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallback;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallbackData;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
@@ -53,6 +54,8 @@
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
/**
@@ -1413,7 +1416,11 @@
            case 2:
               return orderTaxiService.payTaxiOrder1(payType, orderId, objectId, objectType, type, path, ip);
            case 3:
               return orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type);
               ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type);
               orderCrossCityService.promotion(orderId);
               return resultUtil;
            case 4:
               return orderLogisticsService.payLogisticsOrder1(payType, orderId, objectId, objectType, type);
            case 5:
@@ -2141,7 +2148,37 @@
   @PostMapping("/base/order/qytPaymentCallback")
   public String qytPaymentCallback(@RequestBody QYTPaymentCallback qytPaymentCallback) {
      log.info("【黔云通支付回调通知】请求参数:" + JSON.toJSONString(qytPaymentCallback));
      if (null == qytPaymentCallback) {
      try {
         if (null == qytPaymentCallback) {
            return "error";
         }
         QYTPaymentCallbackData data = qytPaymentCallback.getData();
         if("1".equals(data.getStatus())){
            return "error";
         }
         String partnerPayId = data.getPartnerPayId();
         String payId = data.getPayId();
         //网约车
         if(partnerPayId.contains("PR")){
            partnerPayId = partnerPayId.substring(2);
            orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(partnerPayId), payId, 1);
            orderPrivateCarService.promotion(Integer.valueOf(partnerPayId));
         }
         //出租车
         if(partnerPayId.contains("TA")){
            partnerPayId = partnerPayId.substring(2);
            orderTaxiService.payOrderTaxiCallback(Integer.valueOf(partnerPayId), payId, 1, 0);
            orderTaxiService.promotion(Integer.valueOf(partnerPayId));
         }
      }catch (Exception e){
         e.printStackTrace();
         return "error";
      }
      return "success";
@@ -2156,12 +2193,6 @@
    */
   private void promotion(Integer orderType, Integer orderId) {
      switch (orderType) {
         case 1:
            orderPrivateCarService.promotion(orderId);
            break;
         case 2:
            orderTaxiService.promotion(orderId);
            break;
         case 3:
            orderCrossCityService.promotion(orderId);
            break;
@@ -2360,12 +2391,15 @@
            List<TripOrderVo> tripOrderVos = processTripOrderVos(orderList);
            String filePath = tripSheetGenerator.generatePdf(tripOrderVos);
            File attachment = new File(filePath);
            emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "行程单", "请查收您的行程单", attachment);
            String displayFileName = "贵人家园行程单.pdf";
            emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "行程单", "请查收您的行程单", attachment,displayFileName);
            attachment.delete(); // 发送成功后删除临时文件
            return ResultUtil.success("邮件发送成功");
            Map<String, Object> result = new HashMap<>();
            result.put("orderNum", orderList.size());
            return ResultUtil.success(result);
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.error("邮件发送失败");
            return ResultUtil.error("邮件发送失败"+e.getMessage());
        }
    }
    /**