From dc3cfaa745eb7303e312ce7ba61a7019e5f12e4b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 00:22:42 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 284 +++++++++++++++++++++++++++-----------------------------
1 files changed, 138 insertions(+), 146 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index a48da21..1978e22 100644
--- a/UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -1,146 +1,138 @@
-package com.stylefeng.guns;
-
-import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
-import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
-import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.model.Driver;
-import com.stylefeng.guns.modular.system.model.UserInfo;
-import com.stylefeng.guns.modular.system.service.ICompanyService;
-import com.stylefeng.guns.modular.system.service.IDriverService;
-import com.stylefeng.guns.modular.system.service.IUserInfoService;
-import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
-import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
-import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * SpringBoot方式启动类
- *
- * @author stylefeng
- * @Date 2017/5/21 12:06
- */
-@Slf4j
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class GunsApplicationTest {
-
- @Autowired
- private IOrderPrivateCarService orderPrivateCarService;
-
- @Autowired
- private IUserInfoService userInfoService;
-
- @Autowired
- private IDriverService driverService;
- @Autowired
- private ICompanyService companyService;
- @Autowired
- private IPaymentRecordService paymentRecordService;
-
-
-
-
- @Test
- public void test(){
- OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(211);
- //使用备付金进行支付订单
- TradePayOffData tradePayOffData = new TradePayOffData();
- tradePayOffData.setPartnerPayId(orderPrivateCar.getTravelId());
- tradePayOffData.setTotalFee(Double.valueOf(orderPrivateCar.getOrderMoney() * 100).intValue() + "");
- tradePayOffData.setOrderDesc("完成订单");
- PayInfo payInfo = OrderUtil.tradePayOff(tradePayOffData);
- String retCode = payInfo.getRetCode();
- if (!"000000".equals(retCode)) {
- log.error("备付金支付失败：{}", payInfo.getRetMsg());
- return;
- }
- PayInfoData data = payInfo.getData();
- String status = data.getStatus();
- if ("3".equals(status)) {
- log.error("备付金支付失败：{}", payInfo.getRetMsg());
- return;
- }
- PayInfoData payInfoData = payInfo.getData();
- PaymentInfo paymentInfo = payInfoData.getPaymentInfos().get(0);
- //支付成功，通知三方
- PaymentOrderRequest paymentOrderRequest = new PaymentOrderRequest();
- paymentOrderRequest.setPayItemId(paymentInfo.getPayItemId());
- paymentOrderRequest.setPaymentInfo(payInfoData.getPaymentInfos());
- paymentOrderRequest.setOrderId("PR" + orderPrivateCar.getId());
- paymentOrderRequest.setCharge(BigDecimal.valueOf(orderPrivateCar.getOrderMoney()));
- paymentOrderRequest.setPayTime(data.getPayTime());
- paymentOrderRequest.setPaymentSerialNumber(payInfoData.getPayId());
- OrderInfo orderInfo1 = OrderUtil.paymentOrder(paymentOrderRequest);
-
-
- //查询三方订单状态
- Driver driver1 = driverService.selectById(orderPrivateCar.getDriverId());
- Company company = companyService.selectById(driver1.getCompanyId());
- UserInfo userInfo1 = userInfoService.selectById(orderPrivateCar.getUserId());
- GetTravelItineraryListRequest request = new GetTravelItineraryListRequest();
- request.setCustomerId(userInfo1.getOnconUUID());
- request.setOrderNo("PR" + orderPrivateCar.getId());
- request.setDriverId(driver1.getEmpId().toString());
- ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
- Integer status1 = travelItineraryList.getList().get(0).getStatus();
- if(9 != status1){
- //中台修改订单状态
- ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
- request1.setOrderId(orderPrivateCar.getTravelId());
- request1.setStatus(9);
- if (null != orderPrivateCar.getDriverId()) {
- request1.setDriverId(driver1.getEmpId().toString());
- request1.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderPrivateCar.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request1.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request1);
- }
-
- String payId = payInfo.getData().getPayId();
- //copy原始订单后生成追缴单
- OrderPrivateCar orderPrivateCar1 = new OrderPrivateCar();
- BeanUtils.copyProperties(orderPrivateCar, orderPrivateCar1);
- orderPrivateCar1.setId(null);
- orderPrivateCar1.setRecoveryOrder(1);
-
- //修改原始订单为支付状态
- orderPrivateCar.setState(8);
- orderPrivateCar.setPayType(5);
- orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney());
- orderPrivateCarService.updateById(orderPrivateCar);
- //添加三方支付记录
- try {
- paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderPrivateCar.getId(), 1, 3, orderPrivateCar.getOrderMoney(), payId, 2);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
-
- Driver driver = driverService.selectById(orderPrivateCar1.getDriverId());
- UserInfo userInfo = userInfoService.selectById(orderPrivateCar1.getUserId());
- //调用三方创建订单
- CreateOrderRequest createOrderRequest = new CreateOrderRequest();
- createOrderRequest.setTreatShopId(driver.getEmpId().toString());
- createOrderRequest.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}");
- createOrderRequest.setCharge(new BigDecimal(orderPrivateCar1.getOrderMoney()));
- createOrderRequest.setOrderNo("PR" + orderPrivateCar1.getId());
- createOrderRequest.setCustomerId(userInfo.getOnconUUID());
- OrderInfo orderInfo = OrderUtil.tradeOrderCreate(createOrderRequest);
- orderPrivateCar1.setTravelId(orderInfo.getOrderId());
- orderPrivateCar1.setIsCreated(1);
- //保存追缴单
- orderPrivateCarService.insert(orderPrivateCar1);
- }
-}
+//package com.stylefeng.guns;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.stylefeng.guns.core.util.ToolUtil;
+//import com.stylefeng.guns.modular.shunfeng.model.DriverRide;
+//import com.stylefeng.guns.modular.shunfeng.model.Evaluate;
+//import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
+//import com.stylefeng.guns.modular.shunfeng.service.IDriverRideService;
+//import com.stylefeng.guns.modular.shunfeng.service.IEvaluateService;
+//import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
+//import com.stylefeng.guns.modular.shunfeng.util.SensitiveWordUtil;
+//import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
+//import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
+//import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
+//import com.stylefeng.guns.modular.system.model.Company;
+//import com.stylefeng.guns.modular.system.model.Driver;
+//import com.stylefeng.guns.modular.system.model.SensitiveWords;
+//import com.stylefeng.guns.modular.system.model.UserInfo;
+//import com.stylefeng.guns.modular.system.service.ICompanyService;
+//import com.stylefeng.guns.modular.system.service.IDriverService;
+//import com.stylefeng.guns.modular.system.service.IUserInfoService;
+//import com.stylefeng.guns.modular.system.util.EmailUtil;
+//import com.stylefeng.guns.modular.system.util.ResultUtil;
+//import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
+//import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
+//import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
+//import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
+//import lombok.extern.slf4j.Slf4j;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.BeanUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import javax.annotation.Resource;
+//import javax.mail.MessagingException;
+//import java.io.UnsupportedEncodingException;
+//import java.math.BigDecimal;
+//import java.util.Date;
+//import java.util.HashSet;
+//import java.util.List;
+//import java.util.Set;
+//
+///**
+// * SpringBoot方式启动类
+// *
+// * @author stylefeng
+// * @Date 2017/5/21 12:06
+// */
+//@Slf4j
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//public class GunsApplicationTest {
+//
+// @Autowired
+// private IOrderPrivateCarService orderPrivateCarService;
+//
+// @Autowired
+// private IUserInfoService userInfoService;
+//
+// @Autowired
+// private IDriverService driverService;
+// @Autowired
+// private ICompanyService companyService;
+// @Autowired
+// private IPaymentRecordService paymentRecordService;
+// @Autowired
+// private EmailUtil emailUtil;
+// /*顺风车司机*/
+// @Autowired
+// private IDriverRideService driverRideService;
+//
+// @Resource
+// private SensitiveWordsMapper sensitiveWordsMapper;
+// /*评价*/
+// @Autowired
+// private IEvaluateService evaluateService;
+// /*顺风车订单*/
+// @Autowired
+// private IOrderRideService orderRideService;
+//
+//
+//
+//
+// @Test
+// public void test(){
+// Integer orderId = 163;
+// Integer score = 5;
+// Integer userId = 17;
+// String content = "";
+// Integer driverId = 37;
+// try {
+// Evaluate evaluate=new Evaluate();
+// evaluate.setAddTime(new Date());
+// evaluate.setType(8);
+// evaluate.setOrderId(orderId);
+// evaluate.setScore(score);
+// evaluate.setUserId(userId);
+// if(ToolUtil.isNotEmpty(content)){
+// /*判断评价内容是否包含敏感词*/
+// List<SensitiveWords> list = sensitiveWordsMapper.selectList(null);
+// Set<String> sensitiveWordSet = new HashSet<>();
+// for(SensitiveWords gs:list){
+// sensitiveWordSet.add(gs.getContent());
+// }
+// SensitiveWordUtil.init(sensitiveWordSet);
+// boolean result = SensitiveWordUtil.contains(content);
+//
+// }
+// evaluate.setContent(content);
+// evaluate.setDriverId(driverId);
+// /*查询用户手机号*/
+// UserInfo userInfo=userInfoService.selectById(userId);
+// if(userInfo!=null){
+// evaluate.setUserPhone(userInfo.getPhone());
+// }
+// /*查询司机电话*/
+// DriverRide driverRide=driverRideService.selectById(driverId);
+// if(driverRide!=null){
+// /*计算司机的评分*/
+// driverRide.setEvaluateNum((null != driverRide.getEvaluateNum() ? driverRide.getEvaluateNum() : 0 )+1);
+// driverRide.setEvaluateScore((null == driverRide.getEvaluateScore() ? 0 : driverRide.getEvaluateScore())+score);
+// driverRideService.updateById(driverRide);
+// }
+// /*标记订单已评价*/
+// OrderRide orderTaxi=new OrderRide();
+// orderTaxi.setId(orderId);
+// orderTaxi.setIsEvaluate(2);
+// orderTaxi.setEvaluateScoreUser(score);
+// orderTaxi.setContent(content);
+// orderRideService.updateById(orderTaxi);
+// evaluateService.insert(evaluate);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+//}
--
Gitblit v1.7.1