joe 4 年之前
父节点
当前提交
abdb96c256
共有 2 个文件被更改,包括 146 次插入42 次删除
  1. 3 3
      docs/TODO.md
  2. 143 39
      docs/已有协议分析/order.md

+ 3 - 3
docs/TODO.md

@@ -18,12 +18,12 @@
 - [x] 增加用户挖矿余额,提币记录查询
 - [ ] 活动退款用户直接退款到微信,赔款到佣金。 提现页面标记 “单次体现100元以上可奖励,每提现100奖1元,不足部分忽略。比如:单次体现180 奖励1元得181;单次提现200元,奖2元,到帐202”
 - [ ] 支持 wukongd 全文搜索
-- [ ] 定期生成最近一周开奖结果 html 放到官网目录
+- [ ]   html 放到官网目录
 - [x] fix: 后台 SKU 下拉列表有时出不来
 - [ ] fix: 后台 js 连不上 wss 服务
-- [ ] fix: 后台 API /is_format_attr 传参有 undefined 的
+- [x] fix: 后台 API /is_format_attr 传参有 undefined 的
 - [ ] fix: install 过程增加检查 iconv 模块
-- [ ] fix: 订单未收货就进入了待评价
+- [x] fix: 订单未收货就进入了待评价
 
 ## 运维支撑
 

+ 143 - 39
docs/已有协议分析/order.md

@@ -14,9 +14,11 @@ POST order/confirm
         "deduction":false,
         "usableCoupon":null,
         "addressInfo":{
-            "id":2,"real_name":"fd",
+            "id":2,
+            "real_name":"fd",
             "phone":"13222224444",
-            "province":"北京市","city":"北京市",
+            "province":"北京市",
+            "city":"北京市",
             "city_id":2,
             "district":"东城区",
             "detail":"dfdf",
@@ -103,7 +105,11 @@ POST order/confirm
                 "is_sub":0,
                 "temp_id":1,
                 "attrInfo":{
-                    "product_id":46,"suk":"L,红色","stock":89,"sales":11,"price":"99.00",
+                    "product_id":46,
+                    "suk":"L,红色",
+                    "stock":89,
+                    "sales":11,
+                    "price":"99.00",
                     "image":"http:\/\/kaifa.crmeb.net\/uploads\/attach\/2019\/11\/23\/08efb3e21bee99c130995aebe5781af0.jpg",
                     "unique":"66c546fb",
                     "cost":"40.00",
@@ -189,7 +195,11 @@ GET
 
 returns
 ```json
-{"status":200,"msg":"ok","data":[]}
+{
+    "status":200,
+    "msg":"ok",
+    "data":[]
+}
 ```
 
 ## computed 计算订单
@@ -198,7 +208,13 @@ POST computed/0654a378edfc547e42aa539da68acb93
 
 params:
 ```json
-{"addressId":2,"useIntegral":0,"couponId":0,"shipping_type":1,"payType":"yue"}
+{
+    "addressId":2,
+    "useIntegral":0,
+    "couponId":0,
+    "shipping_type":1,
+    "payType":"yue"
+}
 ```
 
 returns
@@ -265,74 +281,162 @@ returns
         "freight_price":"0.00",
         "total_num":2,"total_price":"196.02","total_postage":"2.00","pay_price":"198.02",
         "pay_postage":"2.00",
-        "deduction_price":"0.00","coupon_id":0,"coupon_price":"0.00",
-        "paid":1,"pay_time":1630304745,"pay_type":"yue","add_time":1630304745,"status":0,"refund_status":0,"refund_reason_wap_img":null,
+        "deduction_price":"0.00",
+        "coupon_id":0,
+        "coupon_price":"0.00",
+        "paid":1,
+        "pay_time":1630304745,
+        "pay_type":"yue",
+        "add_time":1630304745,
+        "status":0,
+        "refund_status":0,
+        "refund_reason_wap_img":null,
         "refund_reason_wap_explain":null,
-        "refund_reason_time":null,"refund_reason_wap":null,
-        "refund_reason":null,"refund_price":"0.00","delivery_name":null,"delivery_type":null,"delivery_id":null,"gain_integral":"0.00","use_integral":"0.00",
-        "back_integral":null,"mark":"","is_del":0,
+        "refund_reason_time":null,
+        "refund_reason_wap":null,
+        "refund_reason":null,
+        "refund_price":"0.00",
+        "delivery_name":null,
+        "delivery_type":null,
+        "delivery_id":null,
+        "gain_integral":"0.00",
+        "use_integral":"0.00",
+        "back_integral":null,
+        "mark":"","is_del":0,
         "unique":"825e7facf89cd222f0db8e72c8cbd9f3",
-        "remark":null,"mer_id":0,"is_mer_check":0,
-        "combination_id":0,"pink_id":0,"cost":"105.00",
-        "seckill_id":0,"bargain_id":0,"verify_code":"",
-        "store_id":0,"shipping_type":1,"clerk_id":0,"is_channel":2,
-        "is_remind":0,"is_system_del":0,"add_time_y":"2021-08-30",
-        "add_time_h":"14:25:45","system_store":null,"mapKey":"BLOBZ-KRICU-WMXVX-2225W-XEPTQ-HKFFV",
+        "remark":null,
+        "mer_id":0,
+        "is_mer_check":0,
+        "combination_id":0,
+        "pink_id":0,"cost":"105.00",
+        "seckill_id":0,"bargain_id":0,
+        "verify_code":"",
+        "store_id":0,
+        "shipping_type":1,
+        "clerk_id":0,
+        "is_channel":2,
+        "is_remind":0,
+        "is_system_del":0,
+        "add_time_y":"2021-08-30",
+        "add_time_h":"14:25:45",
+        "system_store":null,
+        "mapKey":"BLOBZ-KRICU-WMXVX-2225W-XEPTQ-HKFFV",
         "cartInfo":[{
             "id":18,
             "type":"product",
-            "product_id":46,"product_attr_unique":"66c546fb",
-            "cart_num":1,"combination_id":0,"seckill_id":0,
+            "product_id":46,
+            "product_attr_unique":"66c546fb",
+            "cart_num":1,
+            "combination_id":0,
+            "seckill_id":0,
             "bargain_id":0,
             "productInfo":{
                 "id":46,
                 "image":"http:\/\/kaifa.crmeb.net\/uploads\/attach\/2019\/11\/23\/08efb3e21bee99c130995aebe5781af0.jpg",
                 "price":"99.00",
-                "ot_price":"168.00","vip_price":"0.00",
-                "postage":"0.00","give_integral":"0.00","sales":12,"stock":788,
-                "store_name":"测试活动商品","unit_name":"件",
-                "is_postage":0,"cost":"40.00","is_sub":0,
+                "ot_price":"168.00",
+                "vip_price":"0.00",
+                "postage":"0.00",
+                "give_integral":"0.00",
+                "sales":12,
+                "stock":788,
+                "store_name":"测试活动商品",
+                "unit_name":"件",
+                "is_postage":0,
+                "cost":"40.00",
+                "is_sub":0,
                 "temp_id":1,
                 "attrInfo":{
                     "product_id":46,
-                    "suk":"L,红色","stock":88,"sales":12,"price":"99.00",
+                    "suk":"L,红色",
+                    "stock":88,
+                    "sales":12,
+                    "price":"99.00",
                     "image":"http:\/\/kaifa.crmeb.net\/uploads\/attach\/2019\/11\/23\/08efb3e21bee99c130995aebe5781af0.jpg",
                     "unique":"66c546fb",
-                    "cost":"40.00","bar_code":"","ot_price":"168.00","weight":"0.00",
-                    "volume":"0.00","brokerage":"10.00","brokerage_two":"5.00","type":0,"quota":0,
+                    "cost":"40.00",
+                    "bar_code":"",
+                    "ot_price":"168.00",
+                    "weight":"0.00",
+                    "volume":"0.00",
+                    "brokerage":"10.00",
+                    "brokerage_two":"5.00",
+                    "type":0,
+                    "quota":0,
                     "quota_show":0
                 }
             },
-            "truePrice":98.01,"vip_truePrice":0.99,
-            "trueStock":88,"costPrice":"40.00","unique":"6e79ed05baec2754e25b4eac73a332d2",
-            "is_reply":0,"activity":"","result":null,
+            "truePrice":98.01,
+            "vip_truePrice":0.99,
+            "trueStock":88,
+            "costPrice":"40.00",
+            "unique":"6e79ed05baec2754e25b4eac73a332d2",
+            "is_reply":0,
+            "activity":"",
+            "result":null,
             "reparation":0,
             "mine":0
         },{
-            "id":19,"type":"product","product_id":38,"product_attr_unique":"735daac5","cart_num":1,
-            "combination_id":0,"seckill_id":0,"bargain_id":0,
+            "id":19,
+            "type":"product",
+            "product_id":38,
+            "product_attr_unique":"735daac5",
+            "cart_num":1,
+            "combination_id":0,
+            "seckill_id":0,
+            "bargain_id":0,
             "productInfo":{
                 "id":38,
                 "image":"http:\/\/kaifa.crmeb.net\/uploads\/attach\/2019\/12\/28\/471f2447ac8bceb5c8569b9645f39582.jpg",
-                "price":"90.00","ot_price":"0.00","vip_price":"0.00","postage":"0.00","give_integral":"0.00","sales":29,"stock":33,
-                "store_name":"【轻奢定制名师制版】【CF联名限量典藏版】Sipv纯手工制作男鞋潮流百搭高帮休闲鞋(加绒可选)沙漠灰专柜品质44","unit_name":"件","is_postage":0,"cost":"65.00","is_sub":1,"temp_id":6,
+                "price":"90.00",
+                "ot_price":"0.00",
+                "vip_price":"0.00",
+                "postage":"0.00",
+                "give_integral":"0.00",
+                "sales":29,
+                "stock":33,
+                "store_name":"【轻奢定制名师制版】【CF联名限量典藏版】Sipv纯手工制作男鞋潮流百搭高帮休闲鞋(加绒可选)沙漠灰专柜品质44",
+                "unit_name":"件",
+                "is_postage":0,
+                "cost":"65.00",
+                "is_sub":1,
+                "temp_id":6,
                 "attrInfo":{
-                    "product_id":38,"suk":"白色","stock":15,"sales":15,"price":"99.00",
-                    "image":"http:\/\/kaifa.crmeb.net\/uploads\/attach\/2019\/12\/28\/471f2447ac8bceb5c8569b9645f39582.jpg",
-                    "unique":"735daac5","cost":"65.00","bar_code":"","ot_price":"0.00","weight":"1.00","volume":"0.00","brokerage":"20.00","brokerage_two":"10.00","type":0,"quota":0,
+                    "product_id":38,
+                    "suk":"白色",
+                    "stock":15,
+                    "sales":15,
+                    "price":"99.00",
+                    "image":"http:\/\/kaifa.crmeb.net\/uploads\/attach\/2019\/12\/28\471f2447ac8bceb5c8569b9645f39582.jpg",
+                    "unique":"735daac5",
+                    "cost":"65.00",
+                    "bar_code":"",
+                    "ot_price":"0.00",
+                    "weight":"1.00",
+                    "volume":"0.00",
+                    "brokerage":"20.00",
+                    "brokerage_two":"10.00",
+                    "type":0,
+                    "quota":0,
                     "quota_show":0
                 }
             },
-            "truePrice":98.01,"vip_truePrice":0.99,
-            "trueStock":15,"costPrice":"65.00",
+            "truePrice":98.01,
+            "vip_truePrice":0.99,
+            "trueStock":15,
+            "costPrice":"65.00",
             "unique":"ab7314887865c4265e896c6e209d1cd6",
-            "is_reply":0,"activity":"","result":null,"reparation":0,
+            "is_reply":0,
+            "activity":"",
+            "result":null,
+            "reparation":0,
             "mine":0
         }],
         "_status":{
             "_type":1,
             "_title":"未发货",
-            "_msg":"商家未发货,请耐心等待","_class":"state-nfh",
+            "_msg":"商家未发货,请耐心等待",
+            "_class":"state-nfh",
             "_payType":"余额支付"
         },
         "_pay_time":"2021-08-30 14:25:45",