shish 5 лет назад
Родитель
Сommit
3a63db91de

+ 1 - 1
app-hd/controllers/PurchaseController.php

@@ -84,7 +84,7 @@ class PurchaseController extends BaseController
             util::fail('没有找到客户');
         }
         if (isset($custom['debt']) == false || $custom['debt'] == CustomClass::IS_DEBT_NO) {
-            util::fail('您没有延期付款权限,请联系此批发商开通');
+            util::fail('您没有延期付款权限');
         }
         $connection = Yii::$app->db;//事务处理
         $transaction = $connection->beginTransaction();

+ 1 - 1
biz-hd/purchase/classes/PurchaseClass.php

@@ -128,7 +128,7 @@ class PurchaseClass extends BaseClass
         if (!empty($couponId)) {
             $coupon = ShopCouponClass::getLockById($couponId);
             ShopCouponClass::valid($coupon, $data['shopId']);
-            if ($coupon->miniCost != 0 || $coupon->miniCost > $prePrice) {
+            if ($coupon->miniCost != 0 && $coupon->miniCost > $prePrice) {
                 util::fail('达到最低消费才能使用优惠券');
             }
             if ($prePrice < $coupon->amount) {

+ 1 - 1
common/base/models/Base.php

@@ -348,7 +348,7 @@ class Base extends ActiveRecord
     //根据主键获取被销的信息 shish 2021.5.18
     public function getLockById($id)
     {
-        return self::findBySql('select * from ' . self::tableName() . ' where id = :id for update', ['id' => $id])->one();
+        return self::findBySql('select * from ' . static::tableName() . ' where id = :id for update', ['id' => $id])->one();
     }
 
 }

+ 4 - 0
console/controllers/PurchaseController.php

@@ -24,6 +24,10 @@ class PurchaseController extends Controller
         $query->orderBy('deadline ASC');
         $connection = Yii::$app->db;//事务处理
         $transaction = $connection->beginTransaction();
+
+        //定义平台类型 1花店 2供货商 3商城
+        Yii::$app->params['ptStyle'] = 1;
+
         try {
             $arr = [];
             foreach ($query->batch() as $purchases) {