diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/payment/repository/WeiXinPayRepository.java b/service-trade/src/main/java/com/neusoft/smart/pos/payment/repository/WeiXinPayRepository.java index 29a25b9..204b80c 100644 --- a/service-trade/src/main/java/com/neusoft/smart/pos/payment/repository/WeiXinPayRepository.java +++ b/service-trade/src/main/java/com/neusoft/smart/pos/payment/repository/WeiXinPayRepository.java @@ -86,16 +86,15 @@ public class WeiXinPayRepository implements IThirdPayRepository { } weixinPayOrder.setTime_expire(WXPayUtils.convertTimeExpireToWXFormat(payOrder.getTimeExpire())); weixinPayOrder.setAttach(payOrder.getMcode()); - try { - weixinPayOrder.setAuth_code(payInfoJsonObject.getString("scanCode")); + String scanCode = payInfoJsonObject.getString("scanCode"); + if (!StringUtils.isEmpty(scanCode)) { + weixinPayOrder.setAuth_code(scanCode); payOrder.setScanCode(weixinPayOrder.getAuth_code()); - } catch (Exception e) { - weixinPayOrder.setNotify_url(payTypeDict.getNotifyUrl()); + }else { + weixinPayOrder.setNotify_url(payTypeDict.getNotifyUrl()); weixinPayOrder.setProduct_id(payOrder.getmOrderNumber()); weixinPayOrder.setTrade_type(payOrder.getTradeType()); } - weixinPayOrder.setTrade_type(payOrder.getTradeType()); - weixinPayOrder.setNotify_url(payTypeDict.getNotifyUrl()); // if(!StringUtils.isEmpty(payOrder.getScanCode())){ // weixinPayOrder.setAuth_code(payOrder.getScanCode()); // }else{