fix(service): 微信支付

front/project/admin/routes/course/previewDetail/page.js

@@ -181,8 +181,8 @@ export default class extends Page {
     const { data } = this.state;
     asyncForm('添加', this.onlineList, {}, info => {
       if (info.time.length > 0) {
-        info.startTime = info.time[0].format('YYYY-MM-DD HH:mm:ss');
-        info.endTime = info.time[1].format('YYYY-MM-DD HH:mm:ss');
+        info.startTime = info.time[0].format('YYYY-MM-DD');
+        info.endTime = info.time[1].format('YYYY-MM-DD');
       }
       return Preview.addAssign(Object.assign({ paperModule: data.paperModule, paperId: data.id, courseModule: data.courseModule }, info)).then(() => {
         asyncSMessage('添加成功!');
@@ -197,8 +197,8 @@ export default class extends Page {
     const { data } = this.state;
     asyncForm('添加', this.vsList, {}, info => {
       if (info.time.length > 0) {
-        info.startTime = info.time[0].format('YYYY-MM-DD HH:mm:ss');
-        info.endTime = info.time[1].format('YYYY-MM-DD HH:mm:ss');
+        info.startTime = info.time[0].format('YYYY-MM-DD');
+        info.endTime = info.time[1].format('YYYY-MM-DD');
       }
       return User.listCourseAppointment({ courseId: data.courseId, userId: info.userId, startTime: info.startTime, endTime: info.endTime }).then(result => {
         if (result.total === 0) {

front/project/admin/routes/show/ad/page.js

@@ -143,8 +143,8 @@ export default class extends Page {
   addAction() {
     asyncForm('创建广告', this.itemList, {}, data => {
       if (data.time && data.time.length > 0) {
-        data.startTime = data.time[0].format('YYYY-MM-DD HH:mm:ss');
-        data.endTime = data.time[1].format('YYYY-MM-DD HH:mm:ss');
+        data.startTime = data.time[0].format('YYYY-MM-DD');
+        data.endTime = data.time[1].format('YYYY-MM-DD');
       }
       data.channel = data.channel.join('-');
       return System.addAd(data).then(() => {
@@ -162,8 +162,8 @@ export default class extends Page {
     info.channel = info.channel.split('-');
     asyncForm('编辑广告', this.itemList, info, data => {
       if (data.time && data.time.length > 0) {
-        data.startTime = data.time[0].format('YYYY-MM-DD HH:mm:ss');
-        data.endTime = data.time[1].format('YYYY-MM-DD HH:mm:ss');
+        data.startTime = data.time[0].format('YYYY-MM-DD');
+        data.endTime = data.time[1].format('YYYY-MM-DD');
       }
       data.channel = data.channel.join('-');
       return System.editAd(data).then(() => {

front/project/h5/routes/page/pay/page.js

@@ -79,7 +79,7 @@ export default class extends Page {
     Order.wechatJs(id).then((info) => {
       return Common.readyWechatBridge().then(() => {
         WeixinJSBridge.invoke(
-          'getBrandWCPayRequest', info,
+          'getBrandWCPayRequest', info.request,
           (res) => {
             if (res.err_msg === 'get_brand_wcpay_request:ok') {
               // 使用以上方式判断前端返回,微信团队郑重提示：

server/data/src/main/java/com/qxgmat/data/constants/enums/trade/PayMethod.java

@@ -28,6 +28,7 @@ public enum PayMethod {
                 return PayMethod.ALIPAY;
             case WECHAT_APP:
             case WECHAT_QR:
+            case WECHAT_JS:
                 return PayMethod.WECHAT;
             case OFFLINE:
             default:

server/gateway-api/src/main/java/com/qxgmat/controller/api/OrderController.java

@@ -155,7 +155,7 @@ public class OrderController {
         if (!order.getUserId().equals(user.getId())){
             throw new ParameterException("订单不存在");
         }
-        PayResponseData data = tradeService.pay(user.getId(), "千行GMAT", "千行服务购买", PayModule.ORDER, order.getId(), BigDecimal.valueOf(0.1), PayChannel.WECHAT_QR, request);
+        PayResponseData data = tradeService.pay(user.getId(), "千行GMAT", "千行服务购买", PayModule.ORDER, order.getId(), order.getMoney(), PayChannel.WECHAT_QR, request);
         return ResponseHelp.success(data);
     }
 
@@ -185,7 +185,7 @@ public class OrderController {
         if (!order.getUserId().equals(user.getId())){
             throw new ParameterException("订单不存在");
         }
-        PayResponseData data = tradeService.pay(user.getId(), "千行GMAT", "千行服务购买", PayModule.ORDER, order.getId(), BigDecimal.valueOf(0.1), PayChannel.ALIPAY_QR, request);
+        PayResponseData data = tradeService.pay(user.getId(), "千行GMAT", "千行服务购买", PayModule.ORDER, order.getId(), order.getMoney(), PayChannel.ALIPAY_QR, request);
         return ResponseHelp.success(data);
     }
 

server/tools/src/main/java/com/tencent/protocol/pay_protocol/JsReqData.java

@@ -31,7 +31,7 @@ public class JsReqData {
 
         //微信分配的公众号ID（开通公众号之后可以获取到）
         setAppId(Configure.getAppid());
-        set_package(this._package+prepayid);
+        setPackage(this._package+prepayid);
 
         int timestamp = Math.toIntExact(System.currentTimeMillis() / 1000);
         setTimeStamp(String.valueOf(timestamp));
@@ -66,11 +66,11 @@ public class JsReqData {
         return map;
     }
 
-    public String get_package() {
+    public String getPackage() {
         return _package;
     }
 
-    public void set_package(String _package) {
+    public void setPackage(String _package) {
         this._package = _package;
     }