--no commit message

app/third/src/main/java/com/zrqx/third/pay/interfaces/payType/impl/WeChatPayImpl.java

@@ -4,6 +4,7 @@ import java.beans.BeanInfo;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -186,12 +187,14 @@ public class WeChatPayImpl extends PayTypeAdapter{
 	            return null;   
 			WecartQueryReturn wecartQueryReturn = new WecartQueryReturn(); // 创建 JavaBean 对象  
 			BeanUtils.populate(wecartQueryReturn, resp);
-			if(wecartQueryReturn != null && "SUCCESS".equals(wecartQueryReturn.getReturn_code())){
+			if(!"SUCCESS".equals(wecartQueryReturn.getReturn_code())){
 				return CallBack.fail();
 			}
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+			Date dateTime = simpleDateFormat.parse(wecartQueryReturn.getTime_end());
 			boolean isPay =  "SUCCESS".equals(wecartQueryReturn.getResult_code()) && "SUCCESS".equals(wecartQueryReturn.getTrade_state());
 			PayQueryReturnVo PayQueryReturnVo = new PayQueryReturnVo(PayTypeEnum.WECHAT.getCode(), isPay,
-					wecartQueryReturn.getTransaction_id(), new Date(wecartQueryReturn.getTime_end()), wecartQueryReturn.getTotal_fee(),
+					wecartQueryReturn.getTransaction_id(), dateTime, wecartQueryReturn.getTotal_fee(),
 					wecartQueryReturn.getOut_trade_no(), wecartQueryReturn.getReturn_msg());
 			return CallBack.success(PayQueryReturnVo);
 		} catch (Exception e) {