Browse Source

Wesmiler 三勾多商户商城提交

wesmiler 4 years ago
parent
commit
d39c48de7e

+ 2 - 2
app/api/service/order/paysuccess/type/ReceivePaySuccessService.php

@@ -83,12 +83,12 @@ class ReceivePaySuccessService extends BaseService
     private function updateSupplier($shop_supplier_id, $payData){
     private function updateSupplier($shop_supplier_id, $payData){
         $supplier = SupplierModel::detail($shop_supplier_id);
         $supplier = SupplierModel::detail($shop_supplier_id);
         Cache::tag('cache')->set('pay_update:'.$shop_supplier_id, ['detail'=>$this->model,'data'=>$payData], 600);
         Cache::tag('cache')->set('pay_update:'.$shop_supplier_id, ['detail'=>$this->model,'data'=>$payData], 600);
-        if($supplier){
+        if(!empty($supplier)){
             //更新
             //更新
             if((new SupplierModel())->where('shop_supplier_id', '=', $shop_supplier_id)
             if((new SupplierModel())->where('shop_supplier_id', '=', $shop_supplier_id)
                 ->inc('money', $this->model['pay_price'])
                 ->inc('money', $this->model['pay_price'])
                 ->update() && $supplier['user_id']){
                 ->update() && $supplier['user_id']){
-                BalanceLogModel::add(BalanceLogSceneEnum::CONSUME, [
+                BalanceLogModel::add(BalanceLogSceneEnum::RECEIVE, [
                     'user_id' => $supplier['user_id'],
                     'user_id' => $supplier['user_id'],
                     'money' => -$this->model['pay_price'],
                     'money' => -$this->model['pay_price'],
                 ], ['描述' => '收款码收款']);
                 ], ['描述' => '收款码收款']);

+ 8 - 0
app/common/enum/user/balanceLog/BalanceLogSceneEnum.php

@@ -21,6 +21,9 @@ class BalanceLogSceneEnum extends Enum
     // 订单退款
     // 订单退款
     const REFUND = 40;
     const REFUND = 40;
 
 
+    // 商家收款
+    const RECEIVE = 50;
+
     /**
     /**
      * 获取订单类型值
      * 获取订单类型值
      */
      */
@@ -47,6 +50,11 @@ class BalanceLogSceneEnum extends Enum
                 'value' => self::REFUND,
                 'value' => self::REFUND,
                 'describe' => '订单退款:%s',
                 'describe' => '订单退款:%s',
             ],
             ],
+            self::RECEIVE => [
+                'name' => '商家收款',
+                'value' => self::RECEIVE,
+                'describe' => '商家收款:%s',
+            ],
         ];
         ];
     }
     }