|
|
@@ -5248,7 +5248,7 @@ class Sale extends Base
|
|
|
|
|
|
$list = Db::name('sale')
|
|
|
->alias('a')
|
|
|
- ->field('a.id sale_id,a.good_code,a.platform_order,a.good_name,a.wsend_num,a.total_price,a.order_type,
|
|
|
+ ->field('a.id sale_id,a.good_code,a.platform_order,a.good_name,a.wsend_num,a.good_num,a.total_price,a.order_type,
|
|
|
a.status sale_status,a.orderCode,a.cat_id,a.good_createrid,c.id cgd_id,c.status cgd_status,c.cgdNo,c.cgder_id,
|
|
|
a.addtime,c.wsm_code,a.order_source,a.other_orderNo')
|
|
|
->leftJoin('order_num b', 'b.orderCode=a.orderCode')
|
|
|
@@ -5340,7 +5340,8 @@ class Sale extends Base
|
|
|
|
|
|
}
|
|
|
SaleCgdPrice::RePrice($sale['sale_id'],$sale['wsend_num']);
|
|
|
- }else{
|
|
|
+ }
|
|
|
+ if ($sale['order_source'] != 9){
|
|
|
$good = Db::name('good_stock')->where(['spuCode' => $sale['good_code'],'wsm_code'=>$sale['wsm_code']])
|
|
|
->findOrEmpty();
|
|
|
if (empty($good)) throw new Exception('未找到商品信息');
|
|
|
@@ -5390,8 +5391,7 @@ class Sale extends Base
|
|
|
'wait_name'=>0,
|
|
|
]);
|
|
|
}
|
|
|
-
|
|
|
- if($sale['order_source'] == 11){
|
|
|
+ if($sale['order_source'] == 11){
|
|
|
$fill =(new BbcFill())->where(['fillCode'=>$sale['other_orderNo']])->findOrEmpty();
|
|
|
if($fill->isEmpty()) throw new Exception($sale['orderCode'] . '未找到对应得业务报备单');
|
|
|
if($fill->transfer_num <$sale['wsend_num'])throw new Exception($sale['orderCode'] . '对应得业务报备单已转单数量不足');
|
|
|
@@ -5408,7 +5408,7 @@ class Sale extends Base
|
|
|
$thtemp=[
|
|
|
"orderCode"=>$sale["orderCode"],
|
|
|
"th_type"=>4,//取消订单
|
|
|
- "th_num"=>$sale["wsend_num"],
|
|
|
+ "th_num"=>$sale["good_num"],
|
|
|
"th_fee"=>$sale["total_price"],
|
|
|
"thCode"=>$sale["orderCode"],
|
|
|
"cat_id"=>$sale["cat_id"],
|
|
|
@@ -5459,9 +5459,9 @@ class Sale extends Base
|
|
|
->where(['is_del' => 0, 'id' => array_column($list, 'sale_id')])
|
|
|
->update([
|
|
|
'status' => 3,
|
|
|
- 'th_num' => Db::raw("wsend_num"),
|
|
|
+ 'th_num' => Db::raw("good_num"),
|
|
|
'th_fee' =>Db::raw("total_price"),
|
|
|
- 'send_num' =>Db::raw("wsend_num"),
|
|
|
+ 'send_num' =>Db::raw("good_num"),
|
|
|
'wsend_num' =>0,
|
|
|
'send_status' =>3,
|
|
|
'updatetime' => $date
|
