Merge pull request 'dev' (#177) from dev into main

Reviewed-on: #177

app/admin/lists/store_branch_product/StoreBranchProductLists.php

@@ -66,6 +66,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
     public function lists(): array
     {
         $class_all = $this->request->get('class_all');
+        $export=$this->request->get('export');
         $where = [];
         if ($class_all) {
             $arr = Cate::where('pid', $class_all)->column('id');
@@ -89,10 +90,13 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
             ->limit($this->limitOffset, $this->limitLength)
             ->order($this->sortOrder)
             ->select()
-            ->each(function ($item) {
+            ->each(function ($item) use($export) {
                 $item['system_store_name'] = SystemStore::where('id', $item['store_id'])->value('name');
                 $item['unit_name'] = StoreProductUnit::where('id', $item['unit'])->value('name');
                 $item['cate_name'] = StoreCategory::where('id', $item['cate_id'])->value('name');
+                if($export==2){
+                    $item['total_price'] = bcmul($item['purchase'],$item['stock'],2);
+                }
                 return $item;
             })
             ->toArray();
@@ -150,6 +154,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
             'vip_price' => '会员价',
             'price' => '零售价',
             'bar_code' => '条码',
+            'total_price' => '价值',
         ];
         return $data;
     }

app/admin/lists/store_order/StoreOrderLists.php

@@ -11,13 +11,14 @@ use app\common\lists\ListsSearchInterface;
 use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\user\User;
+use app\common\lists\ListsExcelInterface;
 
 /**
  * 订单列表列表
  * Class StoreOrderLists
  * @package app\admin\listsstore_order
  */
-class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
+class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -30,7 +31,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['order_id','store_id', 'pay_type', 'staff_id', 'shipping_type', 'delivery_id','paid', 'status', 'is_writeoff','is_merge'],
+            '=' => ['order_id','store_id', 'pay_type', 'staff_id', 'shipping_type', 'delivery_id','paid', 'status', 'is_writeoff','is_merge','uid'],
             'between_time' => 'create_time'
         ];
     }
@@ -119,4 +120,36 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
             })
             ->count();
     }
+
+       /**
+     * @notes 导出文件名
+     * @return string
+     * @author 乔峰
+     * @date 2022/11/24 16:17
+     */
+    public function setFileName(): string
+    {
+        return '订单列表';
+    }
+
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 乔峰
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        $data = [
+            'id' => 'ID',
+            'order_id'=>'订单号',
+            'store_name'=>'门店',
+            'nickname' => '用户',
+            'total_price' => '总金额',
+            'pay_price' => '实际支付',
+            'pay_time' => '支付时间',
+        ];
+        return $data;
+    }
 }

app/common/logic/CapitalFlowLogic.php

@@ -100,7 +100,7 @@ class CapitalFlowLogic extends BaseLogic
      * @param $mark
      * @return mixed
      */
-    public function storeIncome($category, $linkType, $linkId, $amount, $mark = '')
+    public function storeIncome($category, $linkType, $linkId, $amount, $mark = '',$key='')
     {
         $model = new CapitalFlow();
         $model->store_id = $this->store['id'];
@@ -108,8 +108,8 @@ class CapitalFlowLogic extends BaseLogic
         $model->link_type = $linkType;
         $model->link_id = $linkId;
         $model->amount = $amount;
-        $model->before_balance = $this->store['balance'];
-        $model->balance = bcadd($this->store['balance'], $amount, 2);
+        $model->before_balance = $this->store[$key]??0;
+        $model->balance = bcadd($this->store[$key]??0, $amount, 2);
         $model->create_time = date('Y-m-d H:i:s');
         $model->type = 'in';
         $model->title = $this->getTitle($category, $amount);
@@ -129,7 +129,7 @@ class CapitalFlowLogic extends BaseLogic
      * @param $mark
      * @return mixed
      */
-    public function storeExpense($category, $linkType, $linkId, $amount, $mark = '')
+    public function storeExpense($category, $linkType, $linkId, $amount, $mark = '',$key='')
     {
         $model = new CapitalFlow();
         $model->store_id = $this->store['store_id'];
@@ -138,8 +138,8 @@ class CapitalFlowLogic extends BaseLogic
         $model->link_type = $linkType;
         $model->link_id = $linkId;
         $model->amount = $amount;
-        $model->before_balance = $this->store['balance'];
-        $model->balance = bcsub($this->store['balance'], $amount, 2);
+        $model->before_balance = $this->store[$key]??0;
+        $model->balance = bcsub($this->store[$key], $amount, 2);
         $model->create_time = date('Y-m-d H:i:s');
         $model->type = 'out';
         $model->title = $this->getTitle($category, $amount);

app/common/logic/PayNotifyLogic.php

@@ -97,7 +97,7 @@ class PayNotifyLogic extends BaseLogic
         // self::addUserSing($order);
         $capitalFlowDao = new CapitalFlowLogic($user);
         $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'], '', 3, $order['store_id']);
-        self::dealProductLog($order);
+        // self::dealProductLog($order);
 
         self::afterPay($order);
         if ($order['reservation'] == 1 && in_array($order['shipping_type'], [1, 2])) {
@@ -163,7 +163,7 @@ class PayNotifyLogic extends BaseLogic
         ];
         UserSign::create($sing);
 
-        self::dealProductLog($order);
+        // self::dealProductLog($order);
     }
 
 
@@ -211,7 +211,7 @@ class PayNotifyLogic extends BaseLogic
             ];
             OrderLogic::writeOff($params);
         }
-        self::dealProductLog($order);
+        // self::dealProductLog($order);
         if ($order['reservation'] == 1 && in_array($order['shipping_type'], [1, 2])) {
             $checkArr = [
                 'cart_id' => $order['cart_id'],
@@ -269,7 +269,7 @@ class PayNotifyLogic extends BaseLogic
         }
         self::afterPay($order, $extra['transaction_id']);
         // self::addUserSing($order);
-        self::dealProductLog($order);
+        // self::dealProductLog($order);
 
         if (!empty($extra['payer']['openid']) && $order->pay_type == 7) {
             Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid'], 'logistics_type' => 4]);
@@ -517,7 +517,7 @@ class PayNotifyLogic extends BaseLogic
         }
         $cashFlowLogic = new CashFlowLogic();
         $cashFlowLogic->insert($order['store_id'], $order['pay_price']);
-        self::dealProductLog($order);
+        // self::dealProductLog($order);
 
         if ($order && $order['store_id'] && $order['reservation'] != 1) {
             $params = [
@@ -561,7 +561,7 @@ class PayNotifyLogic extends BaseLogic
         }
         $order->save();
         self::afterPay($order);
-        self::dealProductLog($order);
+        // self::dealProductLog($order);
 
         // if ($order->pay_type == 9) {
         // $extra['create_time'] = $order['create_time'];

app/common/logic/StoreFinanceFlowLogic.php

@@ -151,18 +151,18 @@ class StoreFinanceFlowLogic extends BaseLogic
         $store = SystemStore::where('id', $store_id)->find();
         $capitalFlowDao = new CapitalFlowLogic($store, 'store');
         if ($money > 0) {
-            $capitalFlowDao->storeIncome('store_money_add', 'order', $order_id, $money);
+            $capitalFlowDao->storeIncome('store_money_add', 'order', $order_id, $money,'','store_money');
             SystemStore::where('id', $store_id)->inc('store_money', $money)->update();
         }
         if ($deposit > 0) {
-            $capitalFlowDao->storeIncome('store_paid_deposit_add', 'order', $order_id, $deposit);
+            $capitalFlowDao->storeIncome('store_paid_deposit_add', 'order', $order_id, $deposit,'','paid_deposit');
             SystemStore::where('id', $store_id)->inc('paid_deposit', $deposit)->update();
         }
         $find = StoreFinanceFlow::where(['order_id' => $order_id, 'financial_pm' => 1, 'financial_type' => 16, 'status' => 0])->find();
         StoreFinanceFlow::where(['order_id' => $order_id, 'financial_type' => 16])->update(['status' => 1]);
         if ($find) {
             if ($find['number'] > 0) {
-                $capitalFlowDao->storeIncome('store_attrition_add', 'order', $order_id, $find['number']);
+                $capitalFlowDao->storeIncome('store_attrition_add', 'order', $order_id, $find['number'],'','attrition');
                 SystemStore::where('id', $store_id)->inc('attrition', $find['number'])->update();
             }
         }

app/common/service/wechat/WeChatMnpService.php

@@ -109,9 +109,9 @@ class WeChatMnpService
         $dateTime = new DateTime(date('Y-m-d H:i:s'));
         $formattedDateTime = $dateTime->format('Y-m-d\TH:i:s.uP');
         if(in_array($logistics_type,[1,2,4])){
-            $item_desc='商品';
+            $item_desc='门店商品';
         }else{
-            $item_desc='充值';
+            $item_desc='采购礼包';
         }
         return  $this->app->getClient()->postJson("wxa/sec/order/upload_shipping_info?access_token=$token", [
             'order_key' =>[