1

src/main/java/com/ym/mec/collectfee/common/sms/SmsExample.java

@@ -128,21 +128,21 @@ public class SmsExample {
      *            是否压缩
      */
     public static void setSingleSms(String appId, String secretKey, String host, String algorithm, String content, String customSmsId, String extendCode, String mobile, boolean isGzip, String encode) {
-//        System.out.println("=============begin setSingleSms==================");
-//        SmsSingleRequest pamars = new SmsSingleRequest();
-//        pamars.setContent(content);
-//        pamars.setCustomSmsId(customSmsId);
-//        pamars.setExtendedCode(extendCode);
-//        pamars.setMobile(mobile);
-//        ResultModel result = request(appId, secretKey, algorithm, pamars, host + "/inter/sendSingleSMS", isGzip, encode);
-//        System.out.println("result code :" + result.getCode());
-//        if ("SUCCESS".equals(result.getCode())) {
-//            SmsResponse response = JsonHelper.fromJson(SmsResponse.class, result.getResult());
-//            if (response != null) {
-//                System.out.println("data : " + response.getMobile() + "," + response.getSmsId() + "," + response.getCustomSmsId());
-//            }
-//        }
-//        System.out.println("=============end setSingleSms==================");
+        System.out.println("=============begin setSingleSms==================");
+        SmsSingleRequest pamars = new SmsSingleRequest();
+        pamars.setContent(content);
+        pamars.setCustomSmsId(customSmsId);
+        pamars.setExtendedCode(extendCode);
+        pamars.setMobile(mobile);
+        ResultModel result = request(appId, secretKey, algorithm, pamars, host + "/inter/sendSingleSMS", isGzip, encode);
+        System.out.println("result code :" + result.getCode());
+        if ("SUCCESS".equals(result.getCode())) {
+            SmsResponse response = JsonHelper.fromJson(SmsResponse.class, result.getResult());
+            if (response != null) {
+                System.out.println("data : " + response.getMobile() + "," + response.getSmsId() + "," + response.getCustomSmsId());
+            }
+        }
+        System.out.println("=============end setSingleSms==================");
     }
 
     /**

src/main/java/com/ym/mec/collectfee/controller/UserController.java

@@ -321,10 +321,9 @@ public class UserController extends BaseController {
         if(StringUtils.isEmpty(smsCode)){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
-//        if(applyInfoService.verifySmsCode(mobile,smsCode,session)){
-//            return succeed();
-//        }
-//        return failed("验证失败");
-        return succeed();
+        if(applyInfoService.verifySmsCode(mobile,smsCode,session)){
+            return succeed();
+        }
+        return failed("验证失败");
     }
 }

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -478,13 +478,18 @@ public class YqPayController extends BaseController {
             } else {
                 Renewals renewals = renewalsService.getRenewalsByOrderId(order.getId());
                 RenewBean renewBean = new RenewBean();
+//                renewBean.setUserId(renewals.getUserId());
+//                renewBean.setClassId(renewals.getClassId());
+//                renewBean.setWay(renewals.getWay());
+//                renewBean.setPay(renewals.getPay());
+//                renewBean.setChargeMode(renewals.getChangeMode());
+//                renewBean.setBuy(new BigDecimal(renewals.getBuy()));
+//                renewBean.setPrice(renewals.getPrice());
                 renewBean.setUserId(renewals.getUserId());
-                renewBean.setClassId(renewals.getClassId());
+                renewBean.setType(101);
+                renewBean.setIn(renewals.getPay());
+                renewBean.setOut(new BigDecimal(0));
                 renewBean.setWay(renewals.getWay());
-                renewBean.setPay(renewals.getPay());
-                renewBean.setChargeMode(renewals.getChangeMode());
-                renewBean.setBuy(new BigDecimal(renewals.getBuy()));
-                renewBean.setPrice(renewals.getPrice());
                 applyInfoService.pushRenew(renewBean);
             }
         }

src/main/java/com/ym/mec/collectfee/entity/RenewBean.java

@@ -1,13 +1,24 @@
 package com.ym.mec.collectfee.entity;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
 import java.math.BigDecimal;
+import java.util.Date;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 @XStreamAlias("body")
 public class RenewBean {
     private Integer userId;
-
+    
+    private Integer type;//交易类型
+    
+    private BigDecimal in;
+    
+    private BigDecimal out;
+    
+    private String payId;
+    
+    private Date payTime;
+    
     private Integer classId;
 
     private Integer way;
@@ -85,4 +96,45 @@ public class RenewBean {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public BigDecimal getIn() {
+		return in;
+	}
+
+	public void setIn(BigDecimal in) {
+		this.in = in;
+	}
+
+	public BigDecimal getOut() {
+		return out;
+	}
+
+	public void setOut(BigDecimal out) {
+		this.out = out;
+	}
+
+	public String getPayId() {
+		return payId;
+	}
+
+	public void setPayId(String payId) {
+		this.payId = payId;
+	}
+
+	public Date getPayTime() {
+		return payTime;
+	}
+
+	public void setPayTime(Date payTime) {
+		this.payTime = payTime;
+	}
+    
 }

src/main/java/com/ym/mec/collectfee/entity/RequestHead.java

@@ -17,8 +17,8 @@ public class RequestHead {
     private Integer cmd;
 
     //调用接口的用户id
-    private Integer uid = 1048;
-//    private Integer uid = 102;
+    private Integer uid = 1490;
+//    private Integer uid = 1048;
 
     //请求时间戳，yyyymmddhhmmss
     private String ts;

src/main/java/com/ym/mec/collectfee/service/impl/ApplyInfoServiceImpl.java

@@ -350,7 +350,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			body = CDesECB.encode(key,body);
 			RequestParamBean requestParamBean = new RequestParamBean();
 			requestParamBean.setBody(body);
-			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,123255,publicKey,keyId,4));
+			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,121321,publicKey,keyId,4));
 			Writer writer = new StringWriter();
 			writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
 			xs = new XStream();

src/main/java/com/ym/mec/collectfee/service/impl/OrderServiceImpl.java

@@ -138,7 +138,7 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
 
     @Override
     public Map getPayMap(Account routingAccount, Order order, School school) throws Exception {
-    	order.setAmount(new BigDecimal(2));
+//    	order.setAmount(new BigDecimal(2));
 
         String notifyUrl = this.notifyUrl; //异步通知地址
         String returnUrl = this.returnHost + "/#/payment?userId=" + order.getUserId();//支付后返回页面

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9000
+  port: 8088
   servlet:
     contextPath: /api
 
@@ -13,9 +13,9 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_pay?useUnicode=true&characterEncoding=UTF8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/daya_pay?useUnicode=true&characterEncoding=UTF8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+    username: daya
+    password: dayapayonline2019
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -53,8 +53,8 @@ spring:
         min-idle: 0
 mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
-    configuration:
-      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#   configuration:
+#      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     
 logging:
   config: classpath:logback-spring.xml
@@ -63,18 +63,18 @@ logging:
 yq-pay:
   pay-host: https://qyfapi.95epay.com
   query-host: https://qyfquery.95epay.com
-  notify-url: http://47.99.212.176:9000/api/yqpay/notify #通知
-  return-host: http://testpay.dayaedu.com #支付返回
+  notify-url: https://pay.dayaedu.com/api/yqpay/notify #通知
+  return-host: https://pay.dayaedu.com #支付返回
   merno: 0021677
 
 common:
   properties:
     mec-publicKey: 96e021bdc8c20c5afe238bf2ba12c171
-    mec-url: http://101.200.2.249:9001/api/sys
+    mec-url: http://101.200.3.78:9001/api/sys
     key: 96e021bdc8c20c5afe238bf2ba12c171
-    keyId: 1048
+    keyId: 1490
     sms-appId: EUCP-EMY-SMS1-1AIHP
     sms-secretKey: CBA790799C876DAD
     sms-host-dev: http://bjksmtn.b2m.cn
-    sms-send-request-url: http://testpay.dayaedu.com/#/home?
+    sms-send-request-url: https://pay.dayaedu.com/#/home?