订单状态显示

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs

@@ -337,7 +337,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             {
                 return true;
             }
-            if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()) && !(";" + txtOrderId.Text.Trim() + ";").Contains(";" + order.order_id + ";"))
+            if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()) && !(";" + txtOrderId.Text.Trim().Replace(' ', ';').Replace(',', ';') + ";").Contains(";" + order.order_id + ";"))
             {
                 return true;
             }

AllBase/Model/oms_wei_order_info.cs

@@ -96,6 +96,10 @@ namespace AllBase.Model
         {
             get
             {
+                if (this.refunds.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请".Contains(r.statusStr)))
+                    return "退款中";
+                else if (this.refunds.Any(r => r.statusStr == "退款完成" || r.statusStr == "退货退款完成"))
+                    return "退款完成";
                 if (this.status == 20 || this.status == 21)
                 {
                     return "剩余";
@@ -122,7 +126,10 @@ namespace AllBase.Model
                     var durationStr = Math.Floor(timeSpan.TotalHours).ParseToInt() + "时" + timeSpan.Minutes + "分" + timeSpan.Seconds + "秒";
                     return durationStr;
                 }
-                return "待获取状态";
+                if (/*this.out_shipped == 1 */this.ship_done_time.ParseToInt() > 0)
+                    return "已发货";
+                else
+                    return "未发货";
             }
             set { /*delivery_deadline_str = value;*/ }
         }

AllBase/Model/oms_wei_order_item_info.cs

@@ -87,7 +87,7 @@ namespace AllBase.Model
         public string cash_coupon_discounted_price_str
         {
             //get { return "￥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
-            get { return "￥" + (cash_coupon_discounted_price * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (cash_coupon_discounted_price.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); }
             set { }
         }
         /// <summary>
@@ -133,7 +133,7 @@ namespace AllBase.Model
         public string commission_amount_str
         {
             //get { return "￥" + (order_items.Sum(oi => oi.commission_amount.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
-            get { return "￥" + (commission_amount * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (commission_amount.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); }
             set { }
         }
         /// <summary>
@@ -142,7 +142,7 @@ namespace AllBase.Model
         public string out_amount_str
         {
             //get { return "￥" + (item_order.out_amount * 0.01m).ParseToDecimal().ToString("0.00"); }
-            get { return "￥" + ((commission_amount.ParseToDecimal()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (commission_amount.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); }
             set { }
         }
         /// <summary>
@@ -152,8 +152,8 @@ namespace AllBase.Model
         {
             //get { return "￥" + (profit * 0.01m).ParseToDecimal().ToString("0.00"); }
             //get { return "￥" + ((item_order.profit - item_order.out_amount) * 0.01m).ParseToDecimal().ToString("0.00"); }
-            get { return "￥" + ((real_price.ParseToDecimal() + cash_coupon_discounted_price.ParseToDecimal() - purchase_price.ParseToDecimal() - freight.ParseToDecimal() -
-                    predict_commission_fee.ParseToDecimal() - commission_amount.ParseToDecimal() - item_order.out_amount / item_order.order_items.Count) * 0.01m)
+            get { return "￥" + ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() - purchase_price.ParseToInt() - freight.ParseToInt() -
+                    predict_commission_fee.ParseToInt() - commission_amount.ParseToInt() - item_order.out_amount / item_order.order_items.Count) * 0.01m)
                     .ParseToDecimal().ToString("0.00"); }
             set { }
         }

AllBase/Model/oms_wei_refund_info.cs

@@ -41,10 +41,9 @@ namespace AllBase.Model
         {
             get
             {
-                //230, 162, 60
                 if (status == "MERCHANT_PROCESSING" || status == "PLATFORM_REFUNDING" || status == "USER_WAIT_RETURN" || status == "MERCHANT_WAIT_RECEIPT" || 
                     status == "USER_WAIT_CONFIRM" || status == "USER_WAIT_CONFIRM_UPDATE" || status == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE")
-                    return new SolidColorBrush(Color.FromRgb(103, 194, 58));
+                    return new SolidColorBrush(Color.FromRgb(230, 162, 60));
                 if (status == "MERCHANT_REFUND_SUCCESS" || status == "MERCHANT_RETURN_SUCCESS")
                     return new SolidColorBrush(Color.FromRgb(103, 194, 58));
                 return new SolidColorBrush(Color.FromRgb(245, 108, 108));