店铺新增字段

BizCom/Dao/CeErpShop.cs

@@ -188,7 +188,26 @@ namespace BizCom
             get { return _orderAudit; }
             set { _orderAudit = value; }
         }
-
+        private string _platform = "";
+        /// <summary>
+        /// ƽ̨
+        /// </summary>
+        [Property]
+        public string platform
+        {
+            get { return _platform; }
+            set { _platform = value; }
+        }
+        private string _company = "";
+        /// <summary>
+        /// ¹«Ë¾ÀàÐÍ
+        /// </summary>
+        [Property]
+        public string company
+        {
+            get { return _company; }
+            set { _company = value; }
+        }
         public static void Del(object id)
         {
             StringBuilder sql = new StringBuilder();

SiteCore/Handler/sync.shop.cs

@@ -48,6 +48,8 @@ namespace SiteCore.Handler
                 entity.design_secret = GetPostString("design_secret");
                 entity.SName = GetPostString("SName");
                 entity.ShopType = GetPostString("ShopType");
+                entity.platform = GetPostString("platform");
+                entity.company = GetPostString("company");
                 entity.State = GetPostInt("State");
                 entity.orderAudit = GetPostInt("orderAudit") == 0 ? false : true;
                 entity.AddTime = DateTime.Now;

Web/EArc/ShopManager.aspx

@@ -22,6 +22,8 @@
             $("#chkState")[0].checked = rec.State == "1" ? true : false;
             $("#chkAudit")[0].checked = rec.orderAudit == "1" ? true : false;
             selItemSelected($("#selShopType")[0], rec.ShopType);
+            selItemSelected($("#selShopPlatform")[0], rec.platform);
+            selItemSelected($("#selShopCompany")[0], rec.company);
             mini.get("txtLeader").setValue(rec.UserID);
             var con = rec.Summary;
             if (con != "") con = con.replace(/<br>/g, "\n");//.replace(/<br>/g, "\n");
@@ -42,6 +44,8 @@
             parms.sname = $("#txtSName").val();
             parms.appsecret = $("#txtAppSecret").val();
             parms.shoptype = $("#selShopType").val();
+            parms.platform = $("#selShopPlatform").val();
+            parms.company = $("#selShopCompany").val();
             parms.state = $("#chkState")[0].checked ? "1" : "0";
             parms.orderAudit = $("#chkAudit")[0].checked ? "1" : "0";
             parms.con = $("#txtCon").val();
@@ -208,6 +212,25 @@
                 <td class="td2">
                     <input type="text" id="design_secret" /></td>
             </tr>
+            <tr>
+                <td class="td1">平台</td>
+                <td class="td2">
+                    <select id="selShopPlatform">
+                        <option value="">请选择店铺平台</option>
+                        <option value="PDD">拼多多</option>
+                        <option value="taobao">淘宝</option>
+                    </select>
+                </td>
+                <td class="td1">公司</td>
+                <td class="td2">
+                    <select id="selShopCompany">
+                        <option value="">请选择公司类型</option>
+                        <option value="公司">公司</option>
+                        <option value="分公司">分公司</option>
+                    </select>
+
+                </td>
+            </tr>
             <tr>
                 <td class="td1">负责人</td>
                 <td class="td2">

Web/EOrder/OrderList.aspx

@@ -186,7 +186,7 @@
         <li name="edit" iconcls="icon-add" onclick="onAddWechatTag">已添加微信</li>
         <li name="edit" iconcls="icon-epay" onclick="onShowRule">知识库</li>
         <li name="edit" iconcls="icon-stop" onclick="onReturnVisit">客户回访</li>
-        <li name="edit" iconcls="icon-stop" onclick="onOriFileVisit('ORI_FILE')">查看客户文件</li>
+        <li name="edit" iconcls="icon-stop" onclick="onOriFileVisit('ORI_FILE')">上传客户文件</li>
         <li name="edit" iconcls="icon-stop" onclick="onOriFileVisit('PACK_FILE')">查看包裹图片</li>
     </ul>
 

ecomServer/MainForm.cs

@@ -895,7 +895,7 @@ namespace ErpServer
                     if (isStart)
                     {
 
-                        string sql = "select tid,ctid,IsOldCustomer,shopid,payment,ProductId,isDianziOrder from view_ErpTradeCell where orderstate=2 and productid<>0 and designuserid=0  and payment>0 and isrefund=0 order by IsUrgency DESC, YEAR ( pay_time ), MONTH ( pay_time ), DAY ( pay_time ), payment DESC;";
+                        string sql = "SELECT tid, ctid, IsOldCustomer, shopid, payment, ProductId, isDianziOrder, ( SELECT COUNT ( * ) AS fileNumber FROM CE_ErpTradeCellFile WHERE tid = c.tid AND ctid = c.ctid AND isDel = 0 ) AS fileNumber  FROM CE_ErpTradeCell c WHERE orderstate = 2  AND productid <> 0  AND designuserid = 0  AND payment > 0  AND isrefund = 0  ORDER BY IsUrgency DESC, fileNumber DESC, YEAR ( pay_time ), MONTH ( pay_time ), DAY ( pay_time ), payment DESC;";
                         DataTable dt = SqlHelper.ExecuteDataset(sql).Tables[0];
                         //object result = SqlHelper.ExecuteScalar(sql);
                         if (dt != null && dt.Rows.Count > 0)