|
|
@@ -19,8 +19,10 @@ import com.template.model.enumModel.ePayStatu;
|
|
|
import com.template.model.pojo.*;
|
|
|
import com.template.model.result.CommonResult;
|
|
|
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.WechatPayV3Util;
|
|
|
import com.template.services.*;
|
|
|
@@ -63,7 +65,6 @@ import java.util.*;
|
|
|
|
|
|
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.SUCCESS;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
|
@@ -1681,7 +1682,7 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = {Exception.class})
|
|
|
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));
|
|
|
PayRecord payRecord=payRecordService.getOne(new QueryWrapper<PayRecord>().eq("house_order_id",one.getId()));
|
|
|
if(payRecord==null||payRecord.getPayNo()==null){
|
