shish il y a 1 an
Parent
commit
a3d4a7aecb
1 fichiers modifiés avec 8 ajouts et 11 suppressions
  1. 8 11
      biz-hd/purchase/classes/PurchaseClass.php

+ 8 - 11
biz-hd/purchase/classes/PurchaseClass.php

@@ -71,7 +71,7 @@ class PurchaseClass extends BaseClass
         $cost = dict::getDict('kmPackCost');
         if (getenv('YII_ENV') == 'production') {
             //云漫梦金鹏 徐记花卉 康多鲜 旭海 打包费0元
-            if (in_array($mainId, [10728, 20528, 10866,38657,41121])) {
+            if (in_array($mainId, [10728, 20528, 10866, 38657, 41121])) {
                 $cost = dict::getDict('kmPackCost2');
             }
             //花瀚鲜花供应链
@@ -1013,7 +1013,7 @@ class PurchaseClass extends BaseClass
             $list[$key]['debtAmount'] = $ghsInfo[$ghsId]['debtAmount'] ?? '';
 
             //剩余欠款
-            $balance = $ghsInfo[$ghsId]['balance']??0;
+            $balance = $ghsInfo[$ghsId]['balance'] ?? 0;
             $debtAmount = $ghsInfo[$ghsId]['debtAmount'] ?? 0;
             $ghsSalt = $ghsInfo[$ghsId]['salt'] ?? '';
             $remainDebtAmount = bcsub($debtAmount, $balance, 2);
@@ -1146,24 +1146,21 @@ class PurchaseClass extends BaseClass
         $laResource = new Lakala($params);
         $closeParams = ['orderSn' => $orderSn];
         $response = $laResource->close($closeParams);
-        if (isset($response['code']) == false || $response['code'] != 'BBS00000') {
+        if (!isset($response['code']) || $response['code'] != 'BBS00000') {
             $msg = $response['msg'] ?? '';
             $code = $response['code'] ?? 0;
-            if (!in_array($code, ['BBS11114'])) {
-                noticeUtil::push('花店采购 ' . $orderSn . ' 关单没有成功哦' . $msg . ' ' . $code, '15280215347');
-            }
+            //主扫(手机上微信下单拉取微信支付)调用这个方法有效,如果收银机上扫客户收款码的,调用这个方法无效,具体说明看 https://o.lakala.com/#/home/document/detail?id=115 所以在这个取消方法,暂时不考虑关单成功与否
+            //noticeUtil::push('花店采购 ' . $orderSn . ' 关单没有成功哦' . $msg . ' ' . $code, '15280215347');
         }
 
         //收银台关单
         $closeParams = ['orderSn' => $orderSn];
         $response = $laResource->cashClose($closeParams);
-        if (isset($response['code']) == false || $response['code'] != '000000') {
+        if (!isset($response['code']) || $response['code'] != '000000') {
             $msg = $response['msg'] ?? '';
             $code = $response['code'] ?? 0;
-            noticeUtil::push('花店采购 ' . $orderSn . ' 收银台关单的提示:' . $msg . ' ' . $code, '15280215347');
-            if (!in_array($code, ['000091'])) {
-                noticeUtil::push('花店采购 ' . $orderSn . ' 收银台关单没有成功哦 ' . $msg . ' ' . $code, '15280215347');
-            }
+            //聚合收银台(APP发起的微信和支付支付)调用这个方法有效,说明 https://o.lakala.com/#/home/document/detail?id=722,其他情况调用无法,所以在这个取消方法,暂时不考虑关单成功与否
+            //noticeUtil::push('花店采购 ' . $orderSn . ' 收银台关单的提示:' . $msg . ' ' . $code, '15280215347');
         }
 
         return $purchase;