-
';
+ }else{
+ html += '
'+ (array_detail[i].commission > 0 ? array_detail[i].name +' ¥' + array_detail[i].commission : '--') +'
';
+ }
+ }
+ }else{
+ html += '
创始人分佣：'+ ' ¥--' +'
';
}
return html;
}
diff --git a/app/event/DiyViewEdit.php b/app/event/DiyViewEdit.php
index d35ca16..ae1f79e 100644
--- a/app/event/DiyViewEdit.php
+++ b/app/event/DiyViewEdit.php
@@ -42,17 +42,19 @@ class DiyViewEdit extends Controller
}
if (!empty($data[ 'id' ]) || !empty($data[ 'name' ])) {
- if($data['copy']){
- $site_id = $data[ 'site_id' ];
- $site_agent_id = model('site')->getValue([['site_id' , '=' , $site_id]],'agent_id');
+ $site_id = $data[ 'site_id' ];
+ $site_agent_id = model('site')->getValue([['site_id' , '=' , $site_id]],'agent_id');
+ if(isset($data['copy']) && $data['copy']){
$diy_view_condition = [
[ 'site_id', '=', $site_agent_id ],
];
}else{
$diy_view_condition = [
- [ 'site_id', '=', $data[ 'site_id' ] ],
+ [ 'site_id', '=', $site_id ],
];
}
+ $is_copy = $site_agent_id ? 1 : 0;
+ $this->assign("is_copy", $is_copy);
if (!empty($data[ 'id' ])) {
diff --git a/app/model/goods/Goods.php b/app/model/goods/Goods.php
index 3f63216..1dc352b 100644
--- a/app/model/goods/Goods.php
+++ b/app/model/goods/Goods.php
@@ -115,6 +115,7 @@ class Goods extends BaseModel
'site_id' => $data['site_id'],
'goods_content' => $data['goods_content'],
'goods_state' => $data['goods_state'],
+ 'goods_kind_id' => $data['goods_kind_id'],
'goods_stock_alarm' => $data['goods_stock_alarm'],
'is_free_shipping' => $data['is_free_shipping'],
'shipping_template' => $data['shipping_template'],
@@ -284,6 +285,7 @@ class Goods extends BaseModel
'site_id' => $data['site_id'],
'goods_content' => $data['goods_content'],
'goods_state' => $data['goods_state'],
+ 'goods_kind_id' => $data['goods_kind_id'],
'goods_stock_alarm' => $data['goods_stock_alarm'],
'is_free_shipping' => $data['is_free_shipping'],
'shipping_template' => $data['shipping_template'],
@@ -1093,7 +1095,7 @@ class Goods extends BaseModel
* @param string $order
* @param string $field
*/
- public function getGoodsPageList($condition = [], $page = 1, $page_size = PAGE_LIST_ROWS, $order = 'a.create_time desc', $field = 'a.goods_id,a.goods_name,a.site_id,a.site_name,a.goods_image,a.goods_state,a.price,a.goods_stock,a.goods_stock_alarm,a.create_time,a.sale_num,a.is_virtual,a.goods_class,a.goods_class_name,a.is_fenxiao,a.fenxiao_type,a.promotion_addon,a.sku_id,a.is_consume_discount,a.discount_config,a.discount_method,a.sort,a.label_id,a.is_delete', $alias = 'a', $join = [])
+ public function getGoodsPageList($condition = [], $page = 1, $page_size = PAGE_LIST_ROWS, $order = 'a.create_time desc', $field = 'a.goods_id,a.goods_name,a.site_id,a.site_name,a.goods_image,a.goods_state,a.price,a.goods_stock,a.goods_stock_alarm,a.create_time,a.sale_num,a.is_virtual,a.goods_class,a.goods_class_name,a.goods_kind_id,a.is_fenxiao,a.fenxiao_type,a.promotion_addon,a.sku_id,a.is_consume_discount,a.discount_config,a.discount_method,a.sort,a.label_id,a.is_delete', $alias = 'a', $join = [])
{
$res = model('goods')->pageList($condition, $field, $order, $page, $page_size, $alias, $join);
foreach ($res['list'] as $k => $v) {
@@ -1112,6 +1114,7 @@ class Goods extends BaseModel
if (isset($v['real_stock'])) {
$res['list'][$k]['real_stock'] = numberFormat($res['list'][$k]['real_stock']);
}
+ $res['list'][$k]['goods_kind_name'] = $res['list'][$k]['goods_kind_id'] ? '报单商品' : '进货商品';
}
return $this->success($res);
}
diff --git a/app/pay/controller/Test.php b/app/pay/controller/Test.php
index 5355130..7c5feb9 100644
--- a/app/pay/controller/Test.php
+++ b/app/pay/controller/Test.php
@@ -24,11 +24,12 @@ class Test{
//
public function test(){
- $orderId = 19;
+ $orderId = 37;
$order_info = model('order')->getInfo(['order_id' => $orderId]);
+ // $fenxiao_order = new OrderPay();
+ // $res = $fenxiao_order->handle($order_info);
$fenxiao_order = new FenxiaoOrder();
$res = $fenxiao_order->calculate($order_info);
- dump($res);die;
// $memberId = 21;
// (new Commission())->commissionHandleInit($orderId, $memberId);
diff --git a/app/shop/controller/Goods.php b/app/shop/controller/Goods.php
index 9181f37..1e70938 100644
--- a/app/shop/controller/Goods.php
+++ b/app/shop/controller/Goods.php
@@ -133,7 +133,7 @@ class Goods extends BaseShop
$order_by = $order . ' ' . $sort;
}
}
- $field = 'goods_id,goods_name,site_id,site_name,goods_image,goods_state,price,goods_stock,goods_stock_alarm,create_time,sale_num,is_virtual,goods_class,goods_class_name,is_fenxiao,fenxiao_type,promotion_addon,sku_id,is_consume_discount,is_zmxx,discount_config,discount_method,sort,label_id,is_delete,label_name,virtual_deliver_type';
+ $field = 'goods_id,goods_name,site_id,site_name,goods_image,goods_state,price,goods_stock,goods_stock_alarm,create_time,goods_kind_id,sale_num,is_virtual,goods_class,goods_class_name,is_fenxiao,fenxiao_type,promotion_addon,sku_id,is_consume_discount,is_zmxx,discount_config,discount_method,sort,label_id,is_delete,label_name,virtual_deliver_type';
$res = $goods_model->getGoodsPageList($condition, $page_index, $page_size, $order_by, $field);
$goods_promotion_type = event('GoodsPromotionType');
if (!empty($res['data']['list'])) {
@@ -260,6 +260,7 @@ class Goods extends BaseShop
'goods_image' => input("goods_image", ""),// 商品主图路径
'goods_content' => input("goods_content", ""),// 商品详情
'goods_state' => input("goods_state", ""),// 商品状态（1.正常0下架）
+ 'goods_kind_id' => input("goods_kind_id", ""),// 商品种类(1.报单0进货)
'price' => input("price", 0),// 商品价格（取第一个sku）
'market_price' => input("market_price", 0),// 市场价格（取第一个sku）
'cost_price' => input("cost_price", 0),// 成本价（取第一个sku）
@@ -425,6 +426,7 @@ class Goods extends BaseShop
'goods_image' => input("goods_image",""),// 商品主图路径
'goods_content' => input("goods_content",""),// 商品详情
'goods_state' => input("goods_state",""),// 商品状态（1.正常0下架）
+ 'goods_kind_id' => input("goods_kind_id", ""),// 商品种类(1.报单0进货)
'price' => input("price",0),// 商品价格（取第一个sku）
'market_price' => input("market_price",0),// 市场价格（取第一个sku）
'cost_price' => input("cost_price",0),// 成本价（取第一个sku）
diff --git a/app/shop/view/goods/add_goods.html b/app/shop/view/goods/add_goods.html
index b67675a..bffb523 100644
--- a/app/shop/view/goods/add_goods.html
+++ b/app/shop/view/goods/add_goods.html
@@ -239,6 +239,13 @@
+