Merge branch 'bpo-web' of gitlab.gongsibao.com:jiangyong/zhichan into bpo-web

bpo-web/app/base/api/impl/bpoSDPJApi.js

@@ -628,18 +628,18 @@ class BpoSDPJApi {
       let ccashinfo = await this.ccashinfoSve.findOne({
       let ccashinfo = await this.ccashinfoSve.findOne({
         id:id
         id:id
       });
       });
-      if(!ccashinfo.app_id){
-        return this.getErrResult("app_id不能为空");
-      }
-      if(!ccashinfo.ecid){
-        return this.getErrResult("ecid不能为空");
-      }
-      if(!ccashinfo.outTradeNo){
-        return this.getErrResult("outTradeNo不能为空");
-      }
-      if(!ccashinfo.amt){
-        return this.getErrResult("amt不能为空");
-      }
+      // if(!ccashinfo.app_id){
+      //   return this.getErrResult("app_id不能为空");
+      // }
+      // if(!ccashinfo.ecid){
+      //   return this.getErrResult("ecid不能为空");
+      // }
+      // if(!ccashinfo.outTradeNo){
+      //   return this.getErrResult("outTradeNo不能为空");
+      // }
+      // if(!ccashinfo.amt){
+      //   return this.getErrResult("amt不能为空");
+      // }
       // if(!ccashinfo.id_name){
       // if(!ccashinfo.id_name){
       //   return this.getErrResult("id_name不能为空");
       //   return this.getErrResult("id_name不能为空");
       // }
       // }

bpo-web/app/base/service/impl/ccashinfoSve.js

@@ -119,6 +119,7 @@ class CcashinfoService extends ServiceBase {
       } else if (resData.trade_status == "02") {
       } else if (resData.trade_status == "02") {
         resData.trade_desc = bean.trade_desc;
         resData.trade_desc = bean.trade_desc;
       } else if (resData.trade_status == "01") {
       } else if (resData.trade_status == "01") {
+        resData.amt = system.f2y(bean.amt);
         resData.trade_desc = bean.trade_desc;
         resData.trade_desc = bean.trade_desc;
       }
       }
     }
     }