| @@ -270,11 +270,11 @@ public class WxOrderController extends BaseController { | |||||
| @SystemControllerLog(description = "订单管理-id查询") | @SystemControllerLog(description = "订单管理-id查询") | ||||
| public ResultData ttorderQuery(Long id) { | public ResultData ttorderQuery(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxOrderController::ttorderQuery"); | logger.debug("[" + getIpAddr() + "] WxOrderController::ttorderQuery"); | ||||
| WxBatchOrder wxBatchOrder = wxOrderService.getWxBatchOrder(getTenantInfo(), id); | |||||
| if(wxBatchOrder == null || !EnumPayWay.PAY_WAY_TT.getCode().equals(wxBatchOrder.getPayVendor())){ | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "订单未找到或不支持"); | |||||
| } | |||||
| return new ResultData(wxPayOrderService.ttorderQuery(wxBatchOrder)); | |||||
| // WxBatchOrder wxBatchOrder = wxOrderService.getWxBatchOrder(getTenantInfo(), id); | |||||
| // if(wxBatchOrder == null || !EnumPayWay.PAY_WAY_TT.getCode().equals(wxBatchOrder.getPayVendor())){ | |||||
| // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "订单未找到或不支持"); | |||||
| // } | |||||
| return new ResultData(wxPayOrderService.ttorderQuery(getTenantInfo(),id)); | |||||
| } | } | ||||
| @@ -14,6 +14,7 @@ import com.iformall.domain.po.WxMerchantBUser; | |||||
| import com.iformall.domain.po.WxOrder; | import com.iformall.domain.po.WxOrder; | ||||
| import com.iformall.domain.po.WxPayAccount; | import com.iformall.domain.po.WxPayAccount; | ||||
| import com.iformall.domain.po.WxPayOrder; | import com.iformall.domain.po.WxPayOrder; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.enums.EnumComposeOrder; | import com.iformall.enums.EnumComposeOrder; | ||||
| import com.iformall.enums.EnumPayShare; | import com.iformall.enums.EnumPayShare; | ||||
| import com.iformall.enums.EnumPayWay; | import com.iformall.enums.EnumPayWay; | ||||
| @@ -167,5 +168,5 @@ public interface WxPayOrderService { | |||||
| * @param wxBatchOrder | * @param wxBatchOrder | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| PayQueryAdapterResult ttorderQuery(WxBatchOrder wxBatchOrder); | |||||
| PayQueryAdapterResult ttorderQuery(TenantEntity tenantInfo, Long id); | |||||
| } | } | ||||
| @@ -998,15 +998,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public PayQueryAdapterResult ttorderQuery(WxBatchOrder wxBatchOrder) { | |||||
| WxAppinfo appInfo = wxAppinfoService.getCAppInfo(wxBatchOrder,EnumPayWay.getEnum(wxBatchOrder.getPayVendor()).getPlat()); | |||||
| public PayQueryAdapterResult ttorderQuery(TenantEntity tenantInfo, Long id) { | |||||
| WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantInfo,EnumAppPlat.TOUTIAO); | |||||
| WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); | WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); | ||||
| WxPayOrder payOrder = new WxPayOrder(); | WxPayOrder payOrder = new WxPayOrder(); | ||||
| payOrder.setOrderId(wxBatchOrder.getId()); | |||||
| payOrder.setOrderId(id); | |||||
| try { | try { | ||||
| return payServiceFactory.getPayAdapterService(wxBatchOrder.getPayVendor()).queryPayStatus(payOrder, appInfo, payAccount); | |||||
| return payServiceFactory.getPayAdapterService(EnumPayWay.PAY_WAY_TT.getCode()).queryPayStatus(payOrder, appInfo, payAccount); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| return new PayQueryAdapterResult(ErrorCode.SYS_SERVER_ERROR.getCode(), e.getMessage(),wxBatchOrder.getPayVendor(),null,null,null); | |||||
| return new PayQueryAdapterResult(ErrorCode.SYS_SERVER_ERROR.getCode(), e.getMessage(),EnumPayWay.PAY_WAY_TT.getCode(),null,null,null); | |||||
| } | } | ||||
| } | } | ||||