north před 7 roky
rodič
revize
0ba97870cd

+ 1 - 1
www/protected/modules/j/models/JCoupon.php

@@ -89,7 +89,7 @@ class JCoupon extends MongoAr
         $newRow['channel_str'] = Business::get(new MongoId($newRow['channel']))->source;
         $newRow['expire_time'] = CommonFn::get_val_if_isset($row,'expire_time','');
         $newRow['expire_time_str'] = date('Y-m-d H:i:s',$newRow['expire_time']);
-        $newRow['pwd'] = '******';
+        $newRow['pwd'] = CommonFn::get_val_if_isset($row,'pwd','');;
         $newRow['pwd_str'] = CommonFn::get_val_if_isset($row,'pwd','');
         $newRow['status'] = CommonFn::get_val_if_isset($row,'status','');
         $newRow['coding_num'] = CommonFn::get_val_if_isset($row,'coding_num','');

+ 4 - 4
www/protected/services/JCouponService.php

@@ -32,16 +32,16 @@ class JCouponService extends Service
         $objPHPExcel->setActiveSheetIndex(0)
             //Excel的第A列,uid是你查出数组的键值,下面以此类推
             ->setCellValue('A' . $num, '礼品券编号')//$name
-            ->setCellValue('B' . $num, '手工编号')//$phone
-            ->setCellValue('C' . $num, '密码')//$sex
+//            ->setCellValue('B' . $num, '手工编号')//$phone
+            ->setCellValue('B' . $num, '密码')//$sex
         ;
         $num += 1;
         foreach($data as $key => $value){
             $objPHPExcel->setActiveSheetIndex(0)
                 //Excel的第A列,uid是你查出数组的键值,下面以此类推
                 ->setCellValue('A' . $num, $value['coupon_coding'])
-                ->setCellValue('B' . $num, $value['coding_num'])
-                ->setCellValue('C' . $num, $value['pwd_str'])
+//                ->setCellValue('B' . $num, $value['coding_num'])
+                ->setCellValue('B' . $num, $value['pwd_str'])
             ;
             $num += 1;
         }