Browse Source

修改查询订单状态接口

liu 1 year ago
parent
commit
a8f3a6bb93
1 changed files with 5 additions and 4 deletions
  1. 5 4
      src/main/java/com/template/controller/HouseOrderController.java

+ 5 - 4
src/main/java/com/template/controller/HouseOrderController.java

@@ -19,8 +19,10 @@ import com.template.model.enumModel.ePayStatu;
 import com.template.model.pojo.*;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.*;
-import com.template.model.weixin.DateTimeZoneUtil;
+import com.template.model.vo.HouseOrderPageListVo;
+import com.template.model.vo.HouseOrderVo;
+import com.template.model.vo.OrderPageVo;
+import com.template.model.vo.QueryExportVo;
 import com.template.model.weixin.PayUtil;
 import com.template.model.weixin.PayUtil;
 import com.template.model.weixin.WechatPayV3Util;
 import com.template.model.weixin.WechatPayV3Util;
 import com.template.services.*;
 import com.template.services.*;
@@ -63,7 +65,6 @@ import java.util.*;
 
 
 import static com.template.common.utils.StrUtils.getUUIDBits;
 import static com.template.common.utils.StrUtils.getUUIDBits;
 import static com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.NOTPAY;
 import static com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.NOTPAY;
-import static com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.SUCCESS;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -1681,7 +1682,7 @@ public class HouseOrderController implements HouseOrderAPI {
     @Override
     @Override
     @Transactional(rollbackFor = {Exception.class})
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult queryOrderById(String outTradeNo) throws Exception{
     public CommonResult queryOrderById(String outTradeNo) throws Exception{
-        Transaction transaction= null;
+        Transaction transaction= new Transaction();
         HouseOrder one = houseOrderService.getOne(new QueryWrapper<HouseOrder>().eq("order_number",outTradeNo));
         HouseOrder one = houseOrderService.getOne(new QueryWrapper<HouseOrder>().eq("order_number",outTradeNo));
         PayRecord payRecord=payRecordService.getOne(new QueryWrapper<PayRecord>().eq("house_order_id",one.getId()));
         PayRecord payRecord=payRecordService.getOne(new QueryWrapper<PayRecord>().eq("house_order_id",one.getId()));
         if(payRecord==null||payRecord.getPayNo()==null){
         if(payRecord==null||payRecord.getPayNo()==null){