优化

Extensions/Extension.cs

@@ -358,8 +358,8 @@ namespace Com.Bocom.OpenApi
             bizContent.req_head.trans_time = DateTime.Now.ToString("yyyyMMddHHmmss");
             bizContent.req_head.version = "V-1.0";
             bizContent.req_body = new MPNG020705RequestV1.MPNG020705RequestV1Biz.ReqBody();
-            bizContent.req_body.mer_ptc_id = Configs.mer_ptc_idQrCode;//"301310063009501";//商户号,需要配置信息到位
             bizContent.req_body.mer_trade_date = DateTime.Now.ToString("yyyyMMdd");
+            bizContent.req_body.mer_ptc_id = Configs.mer_ptc_idQrCode;//"301310063009501";//商户号,需要配置信息到位
             //bizContent.req_body.pay_mer_tran_no = payMerTranNo;
             bizContent.req_body.close_mer_tran_no = receiveCode.pay_mer_tran_no;
 
@@ -547,7 +547,7 @@ namespace Com.Bocom.OpenApi
             if (split == null)
             {
                 split = payment.BizSplit(payment.Amount, "自动认领", KiviiContext.CurrentMember.DepartmentKvid, KiviiContext.CurrentMember.DepartmentName, conn, "市场业务收入", payment.OperatorKvid, payment.OperatorName);
-
+                split.AuditTime = payment.OperateTime;
                 var trans2 = conn.OpenTransaction();
                 try
                 {

Njzj.Biz.Bocoms.Openapis.V4.5.csproj

@@ -138,6 +138,8 @@
     <None Include="Content\product_smtbknotify_api_0580_智慧记账通知 %28变更后%29.zip" />
     <None Include="Content\智慧记账 对外接口sdk_v2.zip" />
     <None Include="packages.config" />
+    <None Include="Resources\交通银行金融开放平台新一代条码支付产品对外接接口输出文档V1.0.doc" />
+    <None Include="Resources\交通银行金融开放平台智慧记账对外接接口输出文档V2.doc" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Content\Scripts\element-ui.css" />

Transforms/RestfulMpng.cs

@@ -113,6 +113,7 @@ namespace Njzj.Bocoms.Openapis
         public string PayMerTranNo { get; set; }
 
         public List<Guid> SettlementKvids { get; set; }
+        public string View { get; set; }
 
         public override object OnExecution(IRequest req, IResponse res)
         {
@@ -168,25 +169,25 @@ namespace Njzj.Bocoms.Openapis
                             try
                             {
                                 var order = Extension.GetReceiveCodeOrder(existCode.pay_mer_tran_no);
+                                existCode.tran_state = order.rsp_body.tran_state;
+                                existCode.AddOnlyProperties(o => o.tran_state);
+                                existCode.tran_state_code = order.rsp_body.tran_state_code;
+                                existCode.AddOnlyProperties(o => o.tran_state_code);
+                                existCode.tran_state_msg = order.rsp_body.tran_state_msg;
+                                existCode.AddOnlyProperties(o => o.tran_state_msg);
+                                existCode.mer_memo = order.rsp_body.mer_memo;
+                                existCode.AddOnlyProperties(o => o.mer_memo);
+                                existCode.total_amount = order.rsp_body.total_amount;
+                                existCode.AddOnlyProperties(o => o.total_amount);
+                                existCode.order_status = order.rsp_body.order_status;
+                                existCode.AddOnlyProperties(o => o.order_status);
+                                existCode.tran_content = order.rsp_body.tran_content;
+                                existCode.AddOnlyProperties(o => o.tran_content);
+                                conn.UpdateOnly(existCode);
+                                existCode.RemoveAllOnlyProperties();
                                 if (order.rsp_body.tran_state.ToUpper() == "SUCCESS")//成功付款的情况
                                 {
-                                    existCode.tran_state = order.rsp_body.tran_state;
-                                    existCode.AddOnlyProperties(o => o.tran_state);
-                                    existCode.tran_state_code = order.rsp_body.tran_state_code;
-                                    existCode.AddOnlyProperties(o => o.tran_state_code);
-                                    existCode.tran_state_msg = order.rsp_body.tran_state_msg;
-                                    existCode.AddOnlyProperties(o => o.tran_state_msg);
-                                    existCode.mer_memo = order.rsp_body.mer_memo;
-                                    existCode.AddOnlyProperties(o => o.mer_memo);
-                                    existCode.total_amount = order.rsp_body.total_amount;
-                                    existCode.AddOnlyProperties(o => o.total_amount);
-                                    existCode.order_status = order.rsp_body.order_status;
-                                    existCode.AddOnlyProperties(o => o.order_status);
-                                    existCode.tran_content = order.rsp_body.tran_content;
-                                    existCode.AddOnlyProperties(o => o.tran_content);
-                                    conn.UpdateOnly(existCode);
-                                    existCode.RemoveAllOnlyProperties();
-
+                                    rtns.Results.Add(existCode);
                                     var th = KiviiContext.NewThread(() =>
                                     {
                                         existCode.ReceiveCodePaied();
@@ -196,7 +197,10 @@ namespace Njzj.Bocoms.Openapis
                                 else if (order.rsp_body.tran_state.ToUpper() == "PROCESS")//仍然在操作中的情况
                                 {
                                     if (existCode.CreateTime.AddMinutes(6) < DateTime.Now) existCode.ReceiveCodeDelete();//超过6分钟 二维码已经过期，直接删除
-                                    else rtns.Results.Add(existCode);
+                                    else
+                                    {
+                                        rtns.Results.Add(existCode);
+                                    }
                                 }
                                 else//失败的情况
                                 {
@@ -212,8 +216,23 @@ namespace Njzj.Bocoms.Openapis
                     }
                 }
             }
+            if (View.IsNullOrEmpty())
+            {
+                return rtns;
+            }
+            else
+            {
+                if (rtns.Results.Count == 1)
+                {
 
-            return rtns;
+                    return new HttpResult
+                    {
+                        Response = rtns.Results[0],
+                        View = View
+                    };
+                }
+                return rtns;
+            }
         }
     }