| @@ -152,7 +152,6 @@ public class TtPayController extends BaseController { | |||||
| } | } | ||||
| logger.info("type-----"+type); | |||||
| if("payment".equals(type)){//支付回调 | if("payment".equals(type)){//支付回调 | ||||
| String out_order_no; | String out_order_no; | ||||
| if(is2_0){ | if(is2_0){ | ||||
| @@ -160,9 +159,9 @@ public class TtPayController extends BaseController { | |||||
| }else{ | }else{ | ||||
| out_order_no = (String) pMap.get("cp_orderno"); | out_order_no = (String) pMap.get("cp_orderno"); | ||||
| } | } | ||||
| logger.info("out_order_no-----"+out_order_no); | |||||
| String way = (String) pMap.get("way");//2-支付宝,1-微信 | String way = (String) pMap.get("way");//2-支付宝,1-微信 | ||||
| if (!StringUtils.isNotBlank(out_order_no)) { | |||||
| if (StringUtils.isNotBlank(out_order_no)) { | |||||
| try { | try { | ||||
| Long orderId = Long.valueOf(out_order_no); | Long orderId = Long.valueOf(out_order_no); | ||||
| WxPayOrder wxpayOrder = wxPayOrderService.getById(orderId, appinfo.getTenantId()); | WxPayOrder wxpayOrder = wxPayOrderService.getById(orderId, appinfo.getTenantId()); | ||||