修改

app/libs/const/class.LogisticsConst.php

@@ -640,4 +640,43 @@ class LogisticsConst {
         }
         return $outstorageSourceGroup;
     }
+
+	public static function getOrderItemsFieldsMap() {
+        return array(
+            array(
+                'field' => self::goodsIndex,
+                'value' => '序号'
+            ),
+            array(
+                'field' => self::goodsImg,
+                'value' => '商品图片'
+            ),
+            array(
+                'field' => self::goodsName,
+                'value' => '商品标题/简称',
+                'label' => '商品标题/简称 <i class="fa fa-question-circle red" data-toggle="tooltip" title="该字段输出的是最新的商品标题或简称"></i>'
+            ),
+            array(
+                'field' => self::goodsSpec,
+                'value' => '商品规格',
+                'label' => '商品规格 <i class="fa fa-question-circle red" data-toggle="tooltip" title="该字段输出的是最新的商品规格"></i>'
+            ),
+            array(
+                'field' => self::outerId,
+                'value' => '商家SKU'
+            ),
+            array(
+                'field' => self::goodsCount,
+                'value' => '商品数量'
+            ),
+            array(
+                'field' => self::goodsPrice,
+                'value' => '商品单价'
+            ),
+            array(
+                'field' => self::goodsTotalPrice,
+                'value' => '商品总价'
+            ),
+        );
+    }
 }

app/libs/services/OrderPrint/SenderAddressService.php

@@ -76,6 +76,7 @@ class SenderAddressService extends AbstractService {
             $this->opSenderAddressDao->update($updateDefault, 'mall_id = %i and op_sender_address_id != %i', $mallId, $senderAddressId);
         }
         DbTool::commitTrans($trans);
+        return $senderAddressId;
 	}
 	
 	public function getUserSenderAddressList($mallId) {

app/libs/tool/class.CommonTool.php

@@ -3812,4 +3812,13 @@ class CommonTool {
         }
         return $newArr;
     }
+
+	public static function toCamelCase($str, $separator = '_') {
+        if (strpos($str, $separator) === false) {
+            return $str;
+        }
+
+        $str = $separator. str_replace($separator, " ", $str);
+        return ltrim(str_replace(" ", "", ucwords($str)), $separator );
+    }
 }

app/libs/tool/class.PrintTplTool.php

@@ -787,7 +787,7 @@ class PrintTplTool {
                     $values[] = $trade['waybill'];
                     break;
                 case 'ordPayType':
-                    $values[] = $trade['payType'] ? OrderStateConst::getPayTypeMap()[$trade['payType']] : '';
+                    $values[] = $trade['payType'] ? $trade['payType'] : '';
                     break;
                 case 'codFees':
                     if ($trade['payType'] == '0') {