|
@@ -103,7 +103,7 @@ class store_goods_onlineControl extends BaseSellerControl {
|
|
|
Tpl::output('brand_list', $brand_list);
|
|
|
|
|
|
// 取得商品规格的输入值
|
|
|
- $goods_array = $model_goods->getGoodsList($where, 'goods_id,goods_marketprice,goods_price,goods_storage,goods_serial,goods_storage_alarm,goods_spec,oms_id,goods_lowest_price');
|
|
|
+ $goods_array = $model_goods->getGoodsList($where, 'goods_id,goods_marketprice,goods_price,goods_storage,goods_serial,goods_storage_alarm,goods_spec,oms_id,goods_lowest_price,exp_date');
|
|
|
$sp_value = array();
|
|
|
if (is_array($goods_array) && !empty($goods_array)) {
|
|
|
|
|
@@ -142,8 +142,12 @@ class store_goods_onlineControl extends BaseSellerControl {
|
|
|
}
|
|
|
}
|
|
|
$id = str_replace ( ',', '', implode ( ',', $matchs ) );
|
|
|
+ $exp_date = intval($v['exp_date']);
|
|
|
+ if ($exp_date > 0) {
|
|
|
+ $sp_value ['i_' . $id . '|exp_date'] = date("Y-m-d", $exp_date);
|
|
|
+ }
|
|
|
$sp_value ['i_' . $id . '|purchase_price'] = $purchase_price;
|
|
|
- $sp_value ['i_' . $id . '|marketprice'] = $v['goods_marketprice'];
|
|
|
+ //$sp_value ['i_' . $id . '|marketprice'] = $v['goods_marketprice'];
|
|
|
$sp_value ['i_' . $id . '|price'] = $v['goods_price'];
|
|
|
$sp_value ['i_' . $id . '|lowest_price'] = floatval($v['goods_lowest_price']);
|
|
|
$sp_value ['i_' . $id . '|id'] = $v['goods_id'];
|
|
@@ -436,6 +440,9 @@ class store_goods_onlineControl extends BaseSellerControl {
|
|
|
$update['brand_id'] = $update_common['brand_id'];
|
|
|
$update['goods_price'] = $value['price'];
|
|
|
$update['goods_lowest_price']= floatval($value['lowest_price']);
|
|
|
+ if (isset($value['exp_date'])) {
|
|
|
+ $update['exp_date'] = strtotime($value['exp_date']);
|
|
|
+ }
|
|
|
$update['goods_marketprice'] = $value['marketprice'] == 0 ? $update_common['goods_marketprice'] : $value['marketprice'];
|
|
|
$update['goods_serial'] = $value['sku'];
|
|
|
$update['oms_id'] = intval($value['oms_id']);
|
|
@@ -489,6 +496,9 @@ class store_goods_onlineControl extends BaseSellerControl {
|
|
|
$insert['goods_price'] = $value['price'];
|
|
|
$insert['goods_promotion_price']=$value['price'];
|
|
|
$insert['goods_lowest_price']= floatval($value['lowest_price']);
|
|
|
+ if (isset($value['exp_date'])) {
|
|
|
+ $insert['exp_date'] = strtotime($value['exp_date']);
|
|
|
+ }
|
|
|
$insert['goods_marketprice'] = $value['marketprice'] == 0 ? $update_common['goods_marketprice'] : $value['marketprice'];
|
|
|
$insert['goods_serial'] = $value['sku'];
|
|
|
$insert['oms_id'] = intval($value['oms_id']);
|