update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -1034,14 +1034,22 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             }
         }else if (StringUtils.equals(paymentChannel, "YEEPAY")) {
         	Map<String, Object> result = yeepayPaymentService.queryOrder(hfMerchantConfig, studentPaymentOrder.getMerNos(), orderNo);
-        	String status = result.get("status").toString();
-        	if (status.equals("SUCCESS")) {
-                return PayStatus.SUCCESSED;
-            } else if (status.equals("TIME_OUT") || status.equals("FAIL") || status.equals("CLOSE")) {
-                return PayStatus.FAILED;
-            } else {
-                return PayStatus.PAYING;
-            }
+        	
+        	if("OPR00000".equals(result.get("code").toString())) {
+
+            	String status = result.get("status").toString();
+            	if (status.equals("SUCCESS")) {
+                    return PayStatus.SUCCESSED;
+                } else if (status.equals("TIME_OUT") || status.equals("FAIL") || status.equals("CLOSE")) {
+                    return PayStatus.FAILED;
+                } else {
+                    return PayStatus.PAYING;
+                }
+        	}else if("OPR12002".equals(result.get("code").toString())) {
+        		//订单不存在
+        		return PayStatus.FAILED;
+        	}
+            throw new BizException(result.get("message").toString());
         }
         throw new BizException("支付渠道错误");
     }

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -283,7 +283,9 @@ public class StudentOrderController extends BaseController {
 				PrivateKey privateKey =RSAKeyUtils.string2PrivateKey(hfMerchantConfig.getRsaPrivateKey());
 				PublicKey publicKey = RSAKeyUtils.string2PublicKey(hfMerchantConfig.getRsaPublicKey());
 				
-				dto = DigitalEnvelopeUtils.decrypt(dto, privateKey, publicKey);				
+				dto = DigitalEnvelopeUtils.decrypt(dto, privateKey, publicKey);
+				
+				logger.info("易宝支付回调信息：{}", JSON.toJSONString(dto));
 				System.out.println("支付回调信息：" + JSON.toJSONString(dto));
 				
 				

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/YeepayUploadService.java

@@ -22,12 +22,12 @@ public class YeepayUploadService {
 		
 		YopRequest request = new YopRequest(hfMerchantConfig.getAppId(), hfMerchantConfig.getRsaPrivateKey());
 		
-		//request.addParam("merQual", file);
-		request.addFile("merQual", file);
+		request.addParam("merQual", file);
+		//request.addFile("merQual", file);
 		try {
 			YopResponse response = YopRsaClient.post("/yos/v1.0/sys/merchant/qual/upload", request);
 			
-			LOGGER.info("result:{}", response.getStringResult());
+			LOGGER.info("易宝上传接口 resp:{}", response.getStringResult());
 			
 			JSONObject jsonObject = JSONObject.parseObject(response.getStringResult());
 			

mec-web/src/main/java/com/ym/mec/web/controller/payment/YeepayController.java

@@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -50,6 +52,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(tags = "易宝支付服务")
 @RestController
 public class YeepayController extends BaseController {
+    private static final Logger logger = LoggerFactory.getLogger(YeepayController.class);
 
     @Autowired
     private HfMemberService hfMemberService;
@@ -126,7 +129,8 @@ public class YeepayController extends BaseController {
 			PrivateKey privateKey =RSAKeyUtils.string2PrivateKey(hfMerchantConfig.getRsaPrivateKey());
 			PublicKey publicKey = RSAKeyUtils.string2PublicKey(hfMerchantConfig.getRsaPublicKey());
 			
-			dto = DigitalEnvelopeUtils.decrypt(dto, privateKey, publicKey);				
+			dto = DigitalEnvelopeUtils.decrypt(dto, privateKey, publicKey);	
+			logger.info("易宝支付回调信息：{}", JSON.toJSONString(dto));			
 			System.out.println("支付回调信息：" + JSON.toJSONString(dto));
 			
 			return "SUCCESS";