Merge branch 'ss/dev' into dev/test

# Conflicts:
#	scan_orderv4_liedou.php

scan_orderv4_liedou.php

@@ -105,7 +105,11 @@ function readDataFromDb(){
         }
         elseif($typeDesc=="抖音"){
             $type=4;
-        } 
+        }
+        }
+        elseif($typeDesc == "拼多多"){
+            $type = 5;
+        }
 
         $adzone_id=$orderDetail["adzone_id"];
         $relation_id = $orderDetail["relation_id"];
@@ -164,7 +168,7 @@ function readDataFromDb(){
 					var_dump($moneyInfo);
 				}
 
-                if($ptype == 2 || $ptype == 3){
+                if($ptype == 2 || $ptype == 3 || $ptype == 4){
                     $goods_img = $orderDetail["img"];
                 } else {
                 	$detail = TBK::tbkItemInfoGet( ['goods_id'=>$goods_id] );
@@ -544,7 +548,7 @@ function YysInfo( $user_id ){
 
 function UserInfo($special_id, $relation_id, $adzone_id, $ptype=1){
 
-    if($ptype == 2 || $ptype == 3){
+    if($ptype == 2 || $ptype == 3|| $ptype == 4){
         return JdUserInfo($relation_id);
     }