訂單相關API開發

1. GetOneBookingDetail API 增加參數是否為null判斷
2. 開發GetBookingID API

EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs

@@ -872,26 +872,30 @@ namespace EasyBL.WEBAPP.SYS
 
                 // set Contact
 
-                // set Payment
+                System.Diagnostics.Debug.WriteLine("payment count: " + PaymentDic.Count);
+
+                // set Payment 
                 if (PaymentDic.Count > 0) {
 
                     var Payment = PaymentDic.Values.FirstOrDefault();
                     PaymentDTO rsPayment = new PaymentDTO();
-                    rsPayment.PaymentID = Payment.PaymentID;
-                    rsPayment.PaymentStatus = Payment.PaymentStatus;
-                    rsPayment.PaymentMethod = Payment.PaymentMethod;
+                    rsPayment.PaymentID = Payment.PaymentID;  
+                    rsPayment.PaymentStatus = Payment.PaymentStatus;  
+                    rsPayment.PaymentMethod = Booking.PayType;  
                     rsPayment.PaymentTerms = Payment.PaymentTerms;
                     rsPayment.DueDate = Payment.DueDate;
                     rsPayment.PaymentDate = Payment.PaymentDate;
 
-                    CurrencyDTO PaymentCurrency = new CurrencyDTO();
-
-                    if (CurrencyDic.ContainsKey(Payment.CurrencyID)) {
-                        PaymentCurrency = CurrencyDic[Payment.CurrencyID];
-                    }
+                    if (!string.IsNullOrEmpty(Payment.CurrencyID)) {
+                        CurrencyDTO PaymentCurrency = new CurrencyDTO();
 
-                    rsPayment.Currency = PaymentCurrency;
+                        if (CurrencyDic.ContainsKey(Payment.CurrencyID))
+                        {
+                            PaymentCurrency = CurrencyDic[Payment.CurrencyID];
+                        }
 
+                        rsPayment.Currency = PaymentCurrency;
+                    }
                     rsBooking.Payment = rsPayment;
 
                 }

EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs

@@ -573,6 +573,42 @@ namespace EasyBL.WEBAPP.SYS
             return rsBookingDTODic;
         }
 
+        //Find BookingID
+        public HttpResponseMessage FindBookingID(string Lang, string Account, string BookingNo)
+        {
+
+            SuccessResponseMessage srm = null;
+            string sError = null;
+            var db = SugarBase.GetIntance();
+            try
+            {
+                do
+                {
+
+                    var BookindID = db.Queryable<SETB_SAL_BookingOnline>()
+                                          .Where(x => x.LangType == Lang && x.Account == Account && x.BookingNo == BookingNo)
+                                          .Single();
+
+                    srm = new SuccessResponseMessage(null, null);
+                    srm.DATA.Add(BLWording.REL, BookindID.BookingID);
+
+                } while (false);
+            }
+            catch (Exception ex)
+            {
+                sError = Util.GetLastExceptionMsg(ex);
+                srm = new SuccessResponseMessage(null, null)
+                {
+                    STATUSCODE = (int)StatusCodeEnum.Error,
+                    MSG = StatusCodeEnum.Error.GetEnumText()
+                };
+                srm.DATA.Add(BLWording.REL, "");
+            }
+
+            return HttpResponseExtension.ToJson(JsonConvert.SerializeObject(srm));
+
+        }
+
 
     }
 

EuroTran/EasyBL.WEBAPP/ShowEasy/PaymentMaintain_QryService.cs

@@ -25,8 +25,8 @@ namespace EasyBL.WEBAPP.SYS
                 {
 
                     var rsPaymentList = db.Queryable<SETB_SAL_Payment>()
-                        .Where(t1 => t1.Effective == "Y")
-                        .Where(t1 => t1.DelStatus == "N")
+                        //.Where(t1 => t1.Effective == "Y")
+                        //.Where(t1 => t1.DelStatus == "N")
                         .WhereIF(!string.IsNullOrEmpty(sPaymentID), t1 => t1.PaymentID == sPaymentID)
                         .WhereIF(!string.IsNullOrEmpty(sBookingID), t1 => t1.BookingID == sBookingID)
                         .ToList();

EuroTran/WebApp/Controllers/BookingOnlineController.cs

@@ -150,6 +150,15 @@ namespace WebApp.Controllers
             return new BookingOnlineService().SaveBookingStatus(BookingID, BookingStatus);
         }
 
+        [HttpGet]
+        [SEApiSecurityFilter]
+        public HttpResponseMessage FindBookingID(string Lang, string BookingNo)
+        {
+            var SEToken = SETokenUtil.GetToken(this.Request);
+
+            return new BookingOnlineService().FindBookingID(Lang, SEToken.Account, BookingNo);
+        }
+
 
     }
 }