gsb

bpo-stat/app/base/controller/impl/all/merchantCtl.js

@@ -25,10 +25,6 @@ class MerchantCtl extends CtlBase {
         var params = qobj || {};
         var params = qobj || {};
         try {
         try {
             var page = await this.service.merchantInfo(params);
             var page = await this.service.merchantInfo(params);
-
-            if (page) {
-                this.handleDate(page, ["begin_time", "invalid_time"], "YYYY-MM-DD");
-            }
             return system.getResult2(page);
             return system.getResult2(page);
         } catch (e) {
         } catch (e) {
             console.log(e);
             console.log(e);

bpo-stat/app/base/service/impl/all/merchantSve.js

@@ -57,7 +57,11 @@ class MerchantService extends ServiceBase {
         if (!params.id) {
         if (!params.id) {
             return system.getResultFail(-1, "id不能为空");
             return system.getResultFail(-1, "id不能为空");
         }
         }
-        return await this.dao.merchantInfo({id: params.id, sign_body_id: params.sign_body_id});
+        var page = await this.dao.merchantInfo({id: params.id, sign_body_id: params.sign_body_id});
+        if (page) {
+            this.handleDate(page, ["begin_time", "invalid_time"], "YYYY-MM-DD");
+        }
+        return page;
     }
     }