Merge branch 'dev-sxb-back-01' into dev-sxb-notify-01

# Conflicts:
#	app/common/dao/store/order/StoreOrderDao.php
#	app/common/repositories/store/order/StoreGroupOrderRepository.php
#	app/common/repositories/store/order/StoreOrderProductRepository.php
#	app/common/repositories/store/order/StoreOrderRepository.php

app/abc.json

@@ -0,0 +1,684 @@
+[
+  {
+    "id": "d35bddfd-ebbb-4f3a-a82a-d1f47601d4cf",
+    "data": {
+      "logoSrc": "",
+      "backSrc": "",
+      "isShowName": "1",
+      "isShowSearch": "2",
+      "mainPage": {
+        "defColor": "#F6F6F6",
+        "imageUrl": [],
+        "name": "标题",
+        "type": "纯色",
+        "imgUrl": "/diy/nav/bg1.png",
+        "diytemplate": "user_center"
+      },
+      "name": "用户中心",
+      "positionChoose": "1"
+    },
+    "computedStyle": {
+      "mode": 1,
+      "style": 1,
+      "titleSwitch": true,
+      "titleMode": 1,
+      "imageUrl": [],
+      "position": 1,
+      "searchSwitch": true,
+      "searchBgColor": "",
+      "defaultForm": {
+        "defColor": "transparer"
+      },
+      "titleDistance": {
+        "fontSize": 16,
+        "height": 30,
+        "width": 57,
+        "marginLeft": 20
+      },
+      "statusBar": "1",
+      "searchMarPad": {
+        "marginLeft": 20,
+        "paddingLeft": 14
+      }
+    },
+    "permission": [
+      {
+        "name": "member",
+        "title": "用户权重",
+        "list": [
+          {
+            "checked": true,
+            "level": 0,
+            "name": "普通用户"
+          }
+        ]
+      }
+    ],
+    "funcListItem": {
+      "type": "nav",
+      "title": "顶部导航",
+      "is_top": 1
+    },
+    "isShow": true,
+    "is_show_permission": false,
+    "is_drag": false,
+    "disabled": true
+  },
+  {
+    "id": "8a74d150-9243-43b5-9df6-ff7f5a3b83ba",
+    "data": {
+      "contentList2": [
+        "balance",
+        "score",
+        "coupon",
+        "secondary_card"
+      ],
+      "currencyStyle": 1
+    },
+    "computedStyle": {
+      "styleMode": 1,
+      "contentList1": [
+        0,
+        1,
+        2,
+        3
+      ],
+      "containBgColor": "",
+      "cardBgType": 1,
+      "cardShadowColor": "",
+      "iconColor": "#333333",
+      "iconBgColor": "#000000",
+      "tabSelectColor": "#F54B4A",
+      "tabSelectImg": "",
+      "nameColor": "#333333",
+      "memBgColor": "#000000",
+      "memColor": "#ffffff",
+      "assetColor": "#ffffff",
+      "compMarginTop": 10,
+      "compMarginBot": 0,
+      "compMarginLR": 16,
+      "compRadiusTop": 10,
+      "compRadiusBot": 10,
+      "imgIndex": 1,
+      "cardStyle": [
+        "pattern",
+        "cradient"
+      ]
+    },
+    "permission": [
+      {
+        "name": "member",
+        "title": "用户权重",
+        "list": [
+          {
+            "checked": true,
+            "level": 0,
+            "name": "普通用户"
+          }
+        ]
+      }
+    ],
+    "funcListItem": {
+      "id": 16,
+      "type": "member-info",
+      "title": "用户信息",
+      "group": "member",
+      "img": "",
+      "count": 1,
+      "is_top": 2,
+      "permission": "{\"is_drag\":\"false\",\"is_up\":\"false\",\"id_down\":\"false\",\"is_copy\":\"false\"}"
+    },
+    "isShow": true,
+    "is_show_permission": true,
+    "visible": false
+  },
+  {
+    "id": "2c2e1e97-f3e3-4288-8625-fdc820c4bd67",
+    "data": {
+      "iconList": [
+        {
+          "title": "待付款",
+          "img": "/diy/icon-set/order-1.png",
+          "btnText": "待付款",
+          "link_params": {
+            "title": "待付款订单",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins/pages/order/list?tabIndex=1",
+            "params": {
+              "id": 6,
+              "name": "",
+              "title": "待付款订单",
+              "cat_id": 5,
+              "open_type": "page",
+              "route": "/plugins/pages/order/list?tabIndex=1",
+              "remark": ""
+            }
+          }
+        },
+        {
+          "title": "待发货",
+          "img": "/diy/icon-set/order-2.png",
+          "btnText": "待发货",
+          "link_params": {
+            "title": "待发货订单",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins/pages/order/list?tabIndex=2",
+            "params": {
+              "id": 7,
+              "name": "",
+              "title": "待发货订单",
+              "cat_id": 5,
+              "open_type": "page",
+              "route": "/plugins/pages/order/list?tabIndex=2",
+              "remark": ""
+            }
+          }
+        },
+        {
+          "title": "待收货",
+          "img": "/diy/icon-set/order-3.png",
+          "btnText": "待收货",
+          "link_params": {
+            "title": "待收货订单",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins/pages/order/list?tabIndex=3",
+            "params": {
+              "id": 8,
+              "name": "",
+              "title": "待收货订单",
+              "cat_id": 5,
+              "open_type": "page",
+              "route": "/plugins/pages/order/list?tabIndex=3",
+              "remark": ""
+            }
+          }
+        },
+        {
+          "title": "待评价",
+          "img": "/diy/icon-set/order-4.png",
+          "btnText": "待评价",
+          "link_params": {
+            "title": "待评价",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins/pages/order/list?tabIndex=4",
+            "params": {
+              "id": 9,
+              "name": "",
+              "title": "待评价",
+              "cat_id": 5,
+              "open_type": "page",
+              "route": "/plugins/pages/order/list?tabIndex=4",
+              "remark": ""
+            }
+          }
+        },
+        {
+          "title": "退换货",
+          "img": "/diy/icon-set/order-5.png",
+          "btnText": "退换货",
+          "link_params": {
+            "title": "售后",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins/pages/refund/list",
+            "params": {
+              "id": 10,
+              "name": "",
+              "title": "售后",
+              "cat_id": 5,
+              "open_type": "page",
+              "route": "/plugins/pages/refund/list",
+              "remark": ""
+            }
+          }
+        }
+      ],
+      "colorInfos": [
+        {
+          "name": "底部背景",
+          "color": "",
+          "showAlpha": false,
+          "value": "transparent"
+        },
+        {
+          "name": "标题背景",
+          "color": "",
+          "showAlpha": false,
+          "value": "transparent"
+        },
+        {
+          "name": "内容背景",
+          "color": "#fff",
+          "showAlpha": false,
+          "value": "#fff"
+        },
+        {
+          "name": "我的订单",
+          "color": "#333",
+          "showAlpha": false,
+          "value": "#333"
+        },
+        {
+          "name": "全部订单",
+          "color": "#666",
+          "showAlpha": false,
+          "value": "#666"
+        },
+        {
+          "name": "按钮颜色",
+          "color": "#666",
+          "showAlpha": false,
+          "value": "#666"
+        }
+      ]
+    },
+    "computedStyle": {
+      "searchIpts": {
+        "marginTop": "0px",
+        "marginBottom": "0px",
+        "marginLeft": "16px",
+        "marginRight": "16px",
+        "border-top-left-radius": "10px",
+        "border-top-right-radius": "10px",
+        "border-bottom-right-radius": "10px",
+        "border-bottom-left-radius": "10px"
+      },
+      "conRadiusSets": {
+        "border-top-left-radius": "10px",
+        "border-top-right-radius": "10px"
+      }
+    },
+    "permission": [
+      {
+        "name": "member",
+        "title": "用户权重",
+        "list": [
+          {
+            "checked": true,
+            "level": 0,
+            "name": "普通用户"
+          }
+        ]
+      }
+    ],
+    "funcListItem": {
+      "id": 17,
+      "type": "order-icon-group",
+      "title": "订单图标组",
+      "group": "member",
+      "img": "",
+      "count": 1,
+      "is_top": 0,
+      "permission": "{\"is_drag\":\"true\",\"is_up\":\"true\",\"id_down\":\"true\",\"is_copy\":\"true\"}",
+      "source": ""
+    },
+    "isShow": true,
+    "is_show_permission": true,
+    "visible": false
+  },
+  {
+    "id": "22d5bb77-6c9e-4603-8afe-7d317e7ec487",
+    "data": {
+      "iconList": [
+        {
+          "img": "/diy/icon-set/promotion.png",
+          "btnText": "推广中心",
+          "link_params": {
+            "title": "推广中心",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins/public/promotion/index",
+            "params": {
+              "id": 44,
+              "name": "",
+              "title": "推广中心",
+              "cat_id": 6,
+              "open_type": "page",
+              "route": "/plugins/public/promotion/index",
+              "remark": ""
+            }
+          }
+        },
+        {
+          "img": "/diy/icon-set/cart.png",
+          "btnText": "购物车",
+          "link_params": {
+            "title": "购物车",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/pages/cart/index",
+            "params": {
+              "id": 4,
+              "name": "",
+              "title": "购物车",
+              "cat_id": 4,
+              "open_type": "page",
+              "route": "/pages/cart/index",
+              "remark": ""
+            }
+          }
+        },
+        {
+          "img": "/diy/icon-set/collect.png",
+          "btnText": "我的收藏",
+          "link_params": {
+            "title": "我的收藏",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins/pages/center/keep",
+            "params": {
+              "id": 12,
+              "name": "",
+              "title": "我的收藏",
+              "cat_id": 6,
+              "open_type": "page",
+              "route": "/plugins/pages/center/keep",
+              "remark": ""
+            }
+          }
+        },
+        {
+          "img": "/diy/icon-set/address.png",
+          "btnText": "收货地址",
+          "link_params": {
+            "title": "收货地址",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins/pages/settings/address",
+            "params": {
+              "id": 19,
+              "name": "",
+              "title": "收货地址",
+              "cat_id": 6,
+              "open_type": "page",
+              "route": "/plugins/pages/settings/address",
+              "remark": ""
+            }
+          }
+        },
+        {
+          "img": "resources/img/decorate/user_fun_chat.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "小店入驻",
+          "link_params": {
+            "title": "小店入驻",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/customDesigns/Happiness/shopEnter",
+            "params": {
+              "id": 522,
+              "addons_name": "Happiness",
+              "title": "小店入驻",
+              "route": "/customDesigns/Happiness/shopEnter",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        },
+        {
+          "img": "resources/img/decorate/user_fun_chat.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "推广收益",
+          "link_params": {
+            "title": "推广收益",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/customDesigns/Happiness/earningsShare?type=command",
+            "params": {
+              "id": 520,
+              "addons_name": "Happiness",
+              "title": "推广收益",
+              "route": "/customDesigns/Happiness/earningsShare?type=command",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        },
+        {
+          "img": "resources/img/decorate/user_fun_chat.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "代理收益",
+          "link_params": {
+            "title": "代理收益",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/customDesigns/Happiness/earningsShare?type=agent",
+            "params": {
+              "id": 517,
+              "addons_name": "Happiness",
+              "title": "代理收益",
+              "route": "/customDesigns/Happiness/earningsShare?type=agent",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        },
+        {
+          "img": "resources/img/decorate/user_fun_chat.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "分享收益",
+          "link_params": {
+            "title": "分享收益",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/customDesigns/Happiness/earningsShare?type=share",
+            "params": {
+              "id": 518,
+              "addons_name": "Happiness",
+              "title": "分享收益",
+              "route": "/customDesigns/Happiness/earningsShare?type=share",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        },
+        {
+          "img": "resources/img/decorate/user_fun_chat.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "锁定收益",
+          "link_params": {
+            "title": "锁定收益",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/customDesigns/Happiness/earningsShare?type=lock",
+            "params": {
+              "id": 519,
+              "addons_name": "Happiness",
+              "title": "锁定收益",
+              "route": "/customDesigns/Happiness/earningsShare?type=lock",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        },
+        {
+          "img": "resources/img/decorate/user_fun_chat.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "实名认证",
+          "link_params": {
+            "title": "养老金实名",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/customDesigns/Happiness/real",
+            "params": {
+              "id": 871,
+              "addons_name": "Happiness",
+              "title": "养老金实名",
+              "route": "/customDesigns/Happiness/real",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        },
+        {
+          "img": "/diy/icon-set/store-clerk.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "核销入口",
+          "link_params": {
+            "title": "订单核销",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins2/Store/writeoff/index",
+            "params": {
+              "id": 720,
+              "addons_name": "Happiness",
+              "title": "订单核销",
+              "route": "/plugins2/Store/writeoff/index",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        },
+        {
+          "img": "resources/img/decorate/user_fun_chat.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "养老金",
+          "link_params": {
+            "title": "养老金",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/customDesigns/Happiness/pension",
+            "params": {
+              "id": 640,
+              "addons_name": "Happiness",
+              "title": "养老金",
+              "route": "/customDesigns/Happiness/pension",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        },
+        {
+          "img": "/diy/icon-set/mobile-device.png",
+          "icon": "el-icon-setting",
+          "is_show_tag": false,
+          "tags": "热门",
+          "tagsBgColor": "#f83287",
+          "tagsTextColor": "#ffffff",
+          "btnText": "门店移动端",
+          "link_params": {
+            "title": "O2O门店移动端",
+            "open_type": "page",
+            "navigate": "navigateTo",
+            "route": "/plugins2/Store/admin/store",
+            "params": {
+              "id": 940,
+              "addons_name": "Store",
+              "title": "O2O门店移动端",
+              "route": "/plugins2/Store/admin/store",
+              "params": null,
+              "open_type": "page"
+            }
+          }
+        }
+      ],
+      "colorInfos": [
+        {
+          "name": "底部背景",
+          "color": "",
+          "showAlpha": false,
+          "value": "transparent"
+        },
+        {
+          "name": "标题背景",
+          "color": "",
+          "showAlpha": false,
+          "value": "transparent"
+        },
+        {
+          "name": "内容背景",
+          "color": "#fff",
+          "showAlpha": false,
+          "value": "#fff"
+        },
+        {
+          "name": "标题颜色",
+          "color": "#333",
+          "showAlpha": false,
+          "value": "#333"
+        },
+        {
+          "name": "按钮颜色",
+          "color": "#333",
+          "showAlpha": false,
+          "value": "#333"
+        }
+      ]
+    },
+    "computedStyle": {
+      "conRadiusSets": {
+        "border-top-left-radius": "10px",
+        "border-top-right-radius": "10px"
+      },
+      "searchIpts": {
+        "marginTop": "0px",
+        "marginBottom": "0px",
+        "marginLeft": "16px",
+        "marginRight": "16px"
+      }
+    },
+    "permission": [
+      {
+        "name": "member",
+        "title": "用户权重",
+        "list": [
+          {
+            "checked": true,
+            "level": 0,
+            "name": "普通用户"
+          }
+        ]
+      }
+    ],
+    "funcListItem": {
+      "id": 18,
+      "type": "commonly-icon-group",
+      "title": "常用图标组",
+      "group": "member",
+      "img": "",
+      "count": 3,
+      "is_top": 0,
+      "permission": "{\"is_drag\":\"true\",\"is_up\":\"true\",\"id_down\":\"true\",\"is_copy\":\"true\"}",
+      "source": ""
+    },
+    "isShow": true,
+    "is_show_permission": true,
+    "visible": false
+  }
+]

app/command/PensionTasks.php

@@ -53,7 +53,7 @@ class PensionTasks extends Command
 //            $this->doOnlineOrderGzc($timeLimit = 30);
 //            $this->doOnlineHuuafeiOrderGzc($timeLimit = 30);
             $this->onlineOrderNew($timeLimit = 30);
-            $this->huafeiOrderNew($timeLimit = 30);
+            $this->huafeiOrderNew($timeLimit = 0);
             $this->pddOrderNew($timeLimit = 30);
             $this->jdOrderNew($timeLimit = 30);
             $this->suOrderNew($timeLimit = 30);

app/command/WiwibaoProductSync.php

@@ -0,0 +1,656 @@
+<?php
+declare (strict_types=1);
+
+namespace app\command;
+
+use app\common\enum\CommonEnum;
+use app\common\enum\store\ProductEnum;
+use app\common\repositories\douhuomall\DouhuomallChangeLogRepository;
+use app\common\repositories\store\product\ProductRepository;
+use app\entity\data\douhuomall\DouhuomallChangeLogEntity;
+use app\traits\GongApiRequest;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\db\exception\DbException;
+use think\facade\Db;
+use think\facade\Log;
+
+class WiwibaoProductSync extends Command
+{
+
+    use GongApiRequest;
+
+    // 配置参数
+    protected $config = [
+        'page_size' => 100,      // 每页拉取数量
+        'max_pages' => 0,       // 最大页数限制
+        'price_change_rate' => 0.0, // 价格变动比率阈值（10%）
+        'mer_id' => CommonEnum::DESIGN_MERCHANT_ID['WonderfulLiving']['code']
+    ];
+
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('wiwibaoproductsync')
+            ->setDescription('the wiwibaoproductsync command');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $output->writeln('定时任务执行中...');
+
+        $this->syncGoodsFromGong();
+
+        $output->writeln('定时任务执行完成');
+    }
+
+    /**
+     * 同步微唯宝商品数据（主方法）
+     */
+    public function syncGoodsFromGong()
+    {
+        try {
+            set_time_limit(0);
+
+            // 1. 批量拉取所有商品数据
+            $allProducts = $this->fetchAllProducts();
+
+            if (empty($allProducts)) {
+                Log::info('未拉取到任何商品数据');
+                return 'success';
+            }
+
+            // 2. 获取本地所有SPU ID
+            $douhuomallDataMap = [];
+            $douhuomallDataList = Db::name('douhuomall')
+                ->select()
+                ->toArray();
+            if (!empty($douhuomallDataList)) {
+                $douhuomallDataMap = array_column($douhuomallDataList, null, 'spu_id');
+
+            }
+            $syncedSpuIds = [];
+
+            // 3. 批量处理商品数据
+            foreach ($allProducts as $product) {
+                try {
+                    $spuId = $this->processSingleProduct($product, $douhuomallDataMap[$product['goods_id']] ?? []);
+                    if ($spuId) {
+                        $syncedSpuIds[] = $spuId;
+                    }
+                } catch (\Exception $e) {
+                    $this->logError("处理商品 {$product['goods_id']} 失败: ", $e);
+                    continue;
+                }
+            }
+
+            // 4. 处理需要下架的商品（本地有但第三方已下架）
+            $this->handleOfflineProducts($syncedSpuIds, $douhuomallDataMap);
+
+            return 'success';
+
+        } catch (\Exception $e) {
+            $this->logError('商品同步失败', $e);
+            return 'error';
+        }
+    }
+
+    /**
+     * 批量拉取所有商品数据
+     */
+    protected function fetchAllProducts()
+    {
+        $allData = [];
+
+        // 第一页
+        $firstPageData = GongApiRequest::get_goods_list(1, $this->config['page_size']);
+        if (empty($firstPageData['list'])) {
+            return [];
+        }
+
+        $allData = $firstPageData['list'];
+        $totalPages = $firstPageData['pages'] ?? 1;
+        if (!empty($this->config['max_pages'])) {
+            $totalPages = min($totalPages, $this->config['max_pages']);
+        }
+
+        // 并行获取剩余页面
+        for ($page = 2; $page <= $totalPages; $page++) {
+            $pageData = GongApiRequest::get_goods_list($page, $this->config['page_size']);
+            if (!empty($pageData['list'])) {
+                $allData = array_merge($allData, $pageData['list']);
+            }
+        }
+
+        return $allData;
+    }
+
+    /**
+     * 处理单个商品
+     */
+    protected function processSingleProduct($productData, $douhuomallData)
+    {
+        $goodsId = $productData['goods_id'];
+
+        // 1. 获取商品详情
+        $goodsInfo = GongApiRequest::get_goods_info($goodsId);
+        if (!$goodsInfo) {
+            return null;
+        }
+
+        // 2. 处理SKU信息
+        if (empty($goodsInfo['sku_list'])) {
+            return null;
+        }
+        $skuInfo = [];
+        foreach ($goodsInfo['sku_list'] as $sku) {
+            if (empty($sku['plat_price'])) {
+                continue;
+            }
+            $processedSku = [
+                'sku_id' => $sku['sku_id'] ?? 0,
+                'plat_price' => $sku['plat_price'],
+                'img_url' => $sku['main_img'],
+                'retail_price' => $sku['retail_price'] ?? 0,
+                'cost_price' => $this->calculateCostPrice($sku['plat_price']),
+                'market_price' => $this->calculateMarketPrice($sku['plat_price']),
+                'profit' => $this->calculateProfit($sku['plat_price']),
+                'mer_profit' => $this->calculateMerProfit($sku['plat_price']),
+                'yanglaojin' => '0.00',
+                'main_img' => $sku['main_img'] ?? '',
+                'attribute_json' => !empty($sku['attr']) ? $sku['attr'] : [['val' => '默认', 'name' => '默认']]
+            ];
+            $skuInfo[] = array_merge($sku, $processedSku);
+        }
+
+        // 4. 构建保存数据
+        $imageData = [
+            'cover_url' => $goodsInfo['main_img'] ?? '',
+            'detail_images' => $goodsInfo['detail_img'] ?? [],
+            'detail_img_list' => $goodsInfo['detail_img'] ?? [] // 为了兼容以前写的代码，建议保留这个数据项，之前用的是detail_img_list字段，但我感觉他们意义一样
+        ];
+
+        // 构建详情HTML
+        $detailHtml = $this->buildDetailHtml($imageData['detail_images']);
+
+        $saveData = [
+            'spu_id' => $goodsInfo['goods_id'],
+            'skuId_info' => $skuInfo,
+            'sys_id' => '112',
+            'goods_id' => $goodsInfo['goods_id'],
+            'spuId_info' => array_merge(
+                $goodsInfo,
+                [
+                    'cover_url' => $imageData['cover_url'],
+                    'detail' => $detailHtml,
+                    'detail_img_list' => $imageData['detail_img_list']
+                ]
+            ),
+            'sku_id' => $skuInfo[0]['sku_id'] ?? 0,
+            'status' => $goodsInfo['status'] ?? 0,
+            'cate_ids' => $goodsInfo['cate_ids'] ?? '',
+            'title' => $goodsInfo['spu_name'] ?? '',
+            'cxb_cate_id' => 0,
+            'third_update_time' => $goodsInfo['update_time'] ?? ''
+        ];
+
+        // 5. 保存到本地（使用原有的add方法逻辑）
+        try {
+            $spuId = $this->addToDouhuomall($saveData, $douhuomallData);
+        } catch (DbException $e) {
+            return 0;
+        }
+
+        return $spuId;
+    }
+
+    /**
+     * 构建详情HTML
+     */
+    protected function buildDetailHtml($detailImages): string
+    {
+        if (empty($detailImages)) {
+            return '';
+        }
+
+        $detailHtml = '';
+        foreach ((array)$detailImages as $imgUrl) {
+            $detailHtml .= "<img src='{$imgUrl}' referrerpolicy='no-referrer' />";
+        }
+
+        return $detailHtml;
+    }
+
+    /**
+     * @param $data
+     * @param $findData
+     * @return mixed
+     * @throws DbException
+     */
+    protected function addToDouhuomall($data, $findData)
+    {
+        try {
+            // 对SKU按成本价排序，获取最低成本价的SKU
+            $skuInfo = $this->arrSort($data['skuId_info'], 'cost_price', SORT_ASC);
+
+            // 计算价格字段
+            $data['cost_price'] = $skuInfo[0]['cost_price'] ?? 0;
+            $data['market_price'] = $skuInfo[0]['market_price'] ?? 0;
+            $data['ot_price'] = $skuInfo[0]['retail_price'] ?? 0;
+            $data['mer_profit'] = $skuInfo[0]['mer_profit'] ?? 0;
+            $data['pension'] = $skuInfo[0]['yanglaojin'] ?? 0;
+            $data['profit'] = (empty($data['cost_price']) || empty($data['market_price']))
+                ? 0
+                : bcdiv((string)$data['market_price'], (string)$data['cost_price'], 2);
+
+            $now = date('Y-m-d H:i:s');
+
+            if (empty($findData)) {
+                // 新增
+                $insertData = [
+                    'spu_id' => $data['spu_id'],
+                    'skuId_info' => json_encode($data['skuId_info'], JSON_UNESCAPED_UNICODE),
+                    'sys_id' => $data['sys_id'],
+                    'goods_id' => $data['goods_id'],
+                    'spuId_info' => json_encode($data['spuId_info'], JSON_UNESCAPED_UNICODE),
+                    'create_time' => $now,
+                    'update_time' => $now,
+                    'sku_id' => $data['sku_id'],
+                    'status' => $data['status'],
+                    'cate_ids' => $data['cate_ids'],
+                    'title' => $data['title'],
+                    'cost_price' => $data['cost_price'],
+                    'market_price' => $data['market_price'],
+                    'ot_price' => $data['ot_price'],
+                    'profit' => $data['profit'],
+                    'mer_profit' => $data['mer_profit'],
+                    'pension' => $data['pension'],
+                    'cxb_cate_id' => $data['cxb_cate_id'],
+                    'third_update_time' => $data['third_update_time']
+                ];
+                Db::name('douhuomall')->insert($insertData);
+
+                // 创建完商品后立马上架
+                $this->insert_product($data['spu_id'], $this->config['mer_id']);
+
+            } else {
+                // 更新
+                if (empty($findData['third_update_time']) || strtotime($data['third_update_time']) > strtotime($findData['third_update_time'])) {
+                    $updateData = [
+                        'status' => $data['status'],
+                        'update_time' => $now,
+                        'cost_price' => $data['cost_price'],
+                        'market_price' => $data['market_price'],
+                        'ot_price' => $data['ot_price'],
+                        'mer_profit' => $data['mer_profit'],
+                        'pension' => $data['pension'],
+                        'profit' => $data['profit'],
+                        'skuId_info' => json_encode($data['skuId_info'], JSON_UNESCAPED_UNICODE),
+                        'spuId_info' => json_encode($data['spuId_info'], JSON_UNESCAPED_UNICODE),
+                        'title' => $data['title'],
+                        'cate_ids' => $data['cate_ids'],
+                        'cxb_cate_id' => $data['cxb_cate_id'],
+                        'third_update_time' => $data['third_update_time']
+                    ];
+                    Db::name('douhuomall')
+                        ->where('spu_id', $findData['spu_id'])
+                        ->update($updateData);
+
+                    $productList = Db::name('store_product')
+                        ->where('spu_id', $findData['spu_id'])
+                        // ->where('is_show', ProductEnum::IS_SHOW['Yes']['code'])
+                        ->where('is_del', ProductEnum::IS_DEL['No']['code'])
+                        // ->where('status', '<>', ProductEnum::STATUS['Withdrawn']['code'])
+                        ->select()
+                        ->toArray();
+                    $productIdList = array_column($productList, 'product_id');
+
+                    // 将绑定的商品进行下架
+                    Db::name('store_product')
+                        ->whereIn('product_id', $productIdList)
+                        ->update([
+                            // 'is_show' => ProductEnum::IS_SHOW['No']['code'],
+                            'is_del' => ProductEnum::IS_DEL['Yes']['code'],
+                            // 'status' => ProductEnum::STATUS['Withdrawn']['code'],
+                            // 'is_status' => ProductEnum::IS_STATUS['Automatic']['code']
+                        ]);
+
+                    /** @var DouhuomallChangeLogEntity $douhuomallChangeLogEntity */
+                    $douhuomallChangeLogEntity = DouhuomallChangeLogEntity::newInstance();
+                    $douhuomallChangeLogEntity->setSpuId($findData['spu_id'])
+                        ->setDataJson($findData)
+                        ->setEffectProductJson($productIdList)
+                        ->setCreateTime(date('Y-m-d H:i:s'));
+                    /** @var DouhuomallChangeLogRepository $douhuomallChangeLogRepository */
+                    $douhuomallChangeLogRepository = app()->make(DouhuomallChangeLogRepository::class);
+                    $douhuomallChangeLogRepository->createByEntity($douhuomallChangeLogEntity);
+
+                    // 将商品重新上架
+                    // 创建完商品后立马上架
+                    $this->insert_product($data['spu_id'], $this->config['mer_id']);
+                }
+            }
+
+            return $data['spu_id'];
+
+        } catch (\Exception $e) {
+            $this->logError('保存商品到douhuomall失败: ', $e);
+            throw $e;
+        }
+    }
+
+    /**
+     * 恢复商品上架状态
+     */
+    protected function restoreProduct($spuId)
+    {
+        Db::name('store_product')
+            ->where('spu_id', $spuId)
+            ->update([
+                'is_show' => ProductEnum::IS_SHOW['Yes']['code'],
+                'status' => ProductEnum::STATUS['Approved']['code']
+            ]);
+
+        Log::info("恢复商品上架（恢复到仓库中）状态: spu_id={$spuId}");
+    }
+
+    /**
+     * 处理需要下架的商品（第三方已下架）
+     */
+    protected function handleOfflineProducts($syncedSpuIds, $douhuomallDataMap)
+    {
+        $localSpuIds = array_keys($douhuomallDataMap);
+        $offlineSpuIds = array_diff($localSpuIds, $syncedSpuIds);
+
+        if (empty($offlineSpuIds)) {
+            return;
+        }
+
+        $productList = Db::name('store_product')
+            ->whereIn('spu_id', $offlineSpuIds)
+            // ->where('is_show', ProductEnum::IS_SHOW['Yes']['code'])
+            ->where('is_del', ProductEnum::IS_DEL['No']['code'])
+            // ->where('status', '<>', ProductEnum::STATUS['Withdrawn']['code'])
+            ->field('product_id, spu_id, is_show, is_del, status')
+            ->select()
+            ->toArray();
+        if (empty($productList)) {
+            return;
+        }
+        $productIdList = [];
+        $spuIdMap = [];
+        foreach ($productList as $item) {
+            $productIdList[] = $item['product_id'];
+            $spuIdMap[$item['spu_id']][] = $item['product_id'];
+        }
+
+        // 将绑定的商品进行下架
+        Db::name('store_product')
+            ->whereIn('product_id', $productIdList)
+            ->update([
+                // 'is_show' => ProductEnum::IS_SHOW['No']['code'],
+                'is_del' => ProductEnum::IS_DEL['Yes']['code'],
+                // 'status' => ProductEnum::STATUS['Withdrawn']['code'],
+                // 'is_status' => ProductEnum::IS_STATUS['Automatic']['code']
+            ]);
+        foreach ($spuIdMap as $spuId => $productIdListGroupBySpuId) {
+            /** @var DouhuomallChangeLogEntity $douhuomallChangeLogEntity */
+            $douhuomallChangeLogEntity = DouhuomallChangeLogEntity::newInstance();
+            $douhuomallChangeLogEntity->setSpuId($spuId)
+                ->setDataJson($douhuomallDataMap[$spuId])
+                ->setEffectProductJson($productIdListGroupBySpuId)
+                ->setCreateTime(date('Y-m-d H:i:s'));
+            /** @var DouhuomallChangeLogRepository $douhuomallChangeLogRepository */
+            $douhuomallChangeLogRepository = app()->make(DouhuomallChangeLogRepository::class);
+            $douhuomallChangeLogRepository->createByEntity($douhuomallChangeLogEntity);
+        }
+
+        // foreach ($offlineSpuIds as $spuId) {
+        //     $this->offlineProductBySpuId($spuId, 'third_party_offline');
+        // }
+
+        Log::info("下架第三方已下架商品" . json_encode(['count' => count($offlineSpuIds), 'spu_ids' => $offlineSpuIds]));
+    }
+
+    /**
+     * 数组排序（从原有add方法中提取）
+     */
+    protected function arrSort($array, $keys, $sort = SORT_DESC)
+    {
+        $keysValue = [];
+        foreach ($array as $k => $v) {
+            $keysValue[$k] = $v[$keys] ?? 0;
+        }
+        array_multisort($keysValue, $sort, $array);
+        return $array;
+    }
+
+    /**
+     * 计算成本价
+     */
+    protected function calculateCostPrice($platPrice)
+    {
+        return bcadd((string)$platPrice, bcmul((string)$platPrice, '0.03', 4), 2);
+    }
+
+    /**
+     * 计算市场价
+     */
+    protected function calculateMarketPrice($platPrice)
+    {
+        $costPrice = $this->calculateCostPrice($platPrice);
+        return bcadd($costPrice, bcmul($costPrice, '0.2', 4), 2);
+    }
+
+    /**
+     * 计算利润率
+     */
+    protected function calculateProfit($platPrice)
+    {
+        $costPrice = $this->calculateCostPrice($platPrice);
+        $marketPrice = $this->calculateMarketPrice($platPrice);
+        return bcdiv($marketPrice, $costPrice, 2);
+    }
+
+    /**
+     * 计算毛利
+     */
+    protected function calculateMerProfit($platPrice)
+    {
+        $costPrice = $this->calculateCostPrice($platPrice);
+        $marketPrice = $this->calculateMarketPrice($platPrice);
+        return bcsub($marketPrice, $costPrice, 2);
+    }
+
+    /**
+     * 记录错误
+     */
+    protected function logError($message, \Exception $e)
+    {
+        $errorInfo = [
+            'message' => $message,
+            'error_message' => $e->getMessage(),
+            'error_file' => $e->getFile(),
+            'error_line' => $e->getLine(),
+            'error_code' => $e->getCode(),
+            'exception_class' => get_class($e),
+            'trace' => $e->getTraceAsString()
+        ];
+        Log::error($message);
+
+        Log::error($message . json_encode($errorInfo, JSON_UNESCAPED_UNICODE));
+
+        Db::name('log')->insert([
+            'data' => json_encode($errorInfo, JSON_UNESCAPED_UNICODE),
+            'time' => date('Y-m-d H:i:s')
+        ]);
+    }
+
+    // 借用 app\controller\merchant\gong\Goods.php 控制器内方法
+
+    /**
+     * 将 微唯宝商品 选品（加入） 到系统内部商户商品表
+     * @param $spu_id
+     * @param $mer_id
+     * @return bool
+     */
+    public function insert_product($spu_id, $mer_id)
+    {
+        try {
+            // 1、获取商品信息
+            $data = Db::name('douhuomall')->where('spu_id', $spu_id)->find();
+
+            // 2、是否为多规格
+            $sku_data = json_decode($data['skuId_info'], true);
+            $spec_type = count($sku_data);
+            if ($spec_type > 1) {
+                $spec_type = 1;
+            } else {
+                $spec_type = 0;
+            }
+
+            // 3、商品主图
+            $spuId_info = json_decode($data['spuId_info'], true);
+            $slider_image = $spuId_info['detail_img_list'] ?? '';
+            $image = $spuId_info['cover_url'] ?? '';
+            if (empty($slider_image)) {
+                $slider_image = $image;
+            } else if (is_string($slider_image)) {
+                $slider_image = implode(',', json_decode($slider_image, true));
+            } else if (is_array($slider_image)) {
+                $slider_image = implode(',', $slider_image);
+            }
+            $yanglaojin_scale = (!empty($data['pension']) && !empty($data['market_price'])) ? bcdiv($data['pension'], $data['market_price'], 2) : 0;
+
+            // 4、商品入库数据
+            $product_insert_data = [
+                'mer_id' => $mer_id,
+                'image' => $image,
+                'slider_image' => $slider_image,
+                'store_name' => $data['title'],
+                'store_info' => 1,
+                'keyword' => mb_substr($data['title'], 0, 3),
+                'is_show' => 1,
+                'status' => 1,
+                'cate_id' => $data['cate_ids'],
+                'unit_name' => '个',
+                'price' => $data['market_price'],
+                'cost' => $data['cost_price'],
+                'ot_price' => $data['ot_price'],
+                'stock' => '1000',
+                'spec_type' => $spec_type,
+                'extension_type' => 1,
+                'mer_status' => 1,
+                'is_used' => 1,
+                'old_product_id' => $data['id'],
+                'volunteer' => 0,
+                'type' => 1,
+                'pension' => '0.00',
+                'commission' => 5,
+                'spu_id' => $data['spu_id'],
+                'temp_id' => 105,
+                'plate_mer_profit' => $data['mer_profit'],
+                'concession_pri' => $data['mer_profit'],
+                'yanglaojin_scale' => $yanglaojin_scale
+            ];
+            $insert_id = Db::name('store_product')->insertGetId($product_insert_data);
+
+            // 5、更新商品详情表
+            $detail = $spuId_info['detail'];
+            if (!is_null(json_decode($detail))) {
+                $detail_list = json_decode($detail);
+                $detail = '';
+                foreach ($detail_list as $value) {
+                    $detail .= '<img src="' . $value . '"></img>';
+                }
+            }
+            Db::name('store_product_content')->insert(['content' => $detail, 'product_id' => $insert_id]);
+
+            // 6、
+            $this->insert_sku($insert_id, $sku_data);
+            return true;
+        } catch (\Exception $e) {
+            $this->logError($spu_id . "加入选品失败：", $e);
+            return false;
+        }
+    }
+
+    // 借用 app\controller\merchant\gong\Goods.php 控制器内方法
+    public function insert_sku($id, $data)
+    {
+        // 1、获取 所有SKU的 规格属性值
+        $sku_attr_data = array_column($data, 'attribute_json');
+        $name = '';
+
+        // 2、写入 商品属性表
+        /** @var ProductRepository $ProductRepository */
+        $ProductRepository = app()->make(ProductRepository::class);
+        if (empty($sku_attr_data[0][0])) {
+            // 写入商品属性表
+            Db::name('store_product_attr')->insert(['product_id' => $id, 'attr_name' => '规格', 'attr_values' => $name]);
+            $key = '';
+            $num = 1;
+            // 写入 SKU 商品属性值表
+            foreach ($data as $k => $v) {
+                Db::name('store_product_attr_value')->insert([
+                    'product_id' => $id,
+                    'detail' => json_encode(['规格' => $key]),
+                    'sku' => $key,
+                    'image' => $v['img_url'],
+                    'cost' => $v['cost_price'],
+                    'ot_price' => $v['retail_price'],
+                    'price' => $v['market_price'],
+                    'unique' => $ProductRepository->setUnique($id, $v['sku_id'], 0),
+                    'stock' => 100,
+                    'cost_price' => $v['cost_price'],
+                    'extension_one' => 5,
+                    'gong_sku_id' => $v['sku_id'],
+                    'gong_mer_profit' => $v['mer_profit'],
+                    'gong_pension' => $v['yanglaojin'],
+                    'gong_market_price' => $v['market_price'],
+                    'plate_mer_profit' => $v['mer_profit']
+                ]);
+                $key = '';
+                $num++;
+            }
+        } else {
+            foreach ($sku_attr_data as $kk => $vv) {
+                foreach ($vv as $k1 => $v1) {
+                    $name .= $v1['val'];
+                }
+                $name .= '-!-';
+            }
+            $name = rtrim($name, '-!-');
+            Db::name('store_product_attr')->insert(['product_id' => $id, 'attr_name' => '规格', 'attr_values' => $name]);
+            $key = '';
+            $num = 1;
+            foreach ($data as $k => $v) {
+                foreach ($v['attribute_json'] as $k2 => $v2) {
+                    $key .= $v2['val'];
+                }
+
+                Db::name('store_product_attr_value')->insert([
+                    'product_id' => $id,
+                    'detail' => json_encode(['规格' => $key]),
+                    'sku' => $key,
+                    'image' => $v['img_url'],
+                    'cost' => $v['cost_price'],
+                    'ot_price' => $v['retail_price'],
+                    'price' => $v['market_price'],
+                    'unique' => $ProductRepository->setUnique((int)$id, $v['sku_id'], 0),
+                    'stock' => 100,
+                    'cost_price' => $v['cost_price'],
+                    'extension_one' => 5,
+                    'gong_sku_id' => $v['sku_id'],
+                    'gong_mer_profit' => $v['mer_profit'],
+                    'gong_pension' => $v['yanglaojin'],
+                    'gong_market_price' => $v['market_price'],
+                    'plate_mer_profit' => $v['mer_profit']
+                ]);
+                $key = '';
+                $num++;
+            }
+        }
+    }
+}

app/common/dao/backup/BackupStoreOrderDao.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace app\common\dao\backup;
+
+use app\common\dao\BaseDao;
+use app\common\model\backup\BackupStoreOrder;
+
+class BackupStoreOrderDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return BackupStoreOrder::class;
+    }
+    /**
+     * 获取撤回订单列表
+     */
+    public function getKillOrderList($limit)
+    {
+        return $this->getModel()::getDB()->paginate($limit)->toArray();
+    }
+}

app/common/dao/backup/BackupUserChangeDao.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace app\common\dao\backup;
+
+use app\common\dao\BaseDao;
+use app\common\model\backup\BackupUserChange;
+
+class BackupUserChangeDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return BackupUserChange::class;
+    }
+
+    /**
+     * @param array $dataList
+     * @return array批量更新
+     */
+    public function saveAll(array $dataList): array
+    {
+        try {
+            return $this->getModel()->getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据 order_id 获取用户本人变更数据（user=1）
+     */
+    public function getUserOneChangeFromOrderId($orderId)
+    {
+        return $this::getModel()::getDB()
+            ->where('order_id', '=', $orderId)
+            ->where('user', '=', 1)
+            ->field('pv, vr, score, contribute, annuity, uid')
+            ->find();
+    }
+
+    /**
+     * 根据 order_id 获取一级推荐人变更数据（user=2）
+     */
+    public function getUserTwoChangeFromOrderId($orderId)
+    {
+        return $this::getModel()::getDB()
+            ->where('order_id', '=', $orderId)
+            ->where('user', '=', 2)
+            ->field('brokerage_price, score, per_contribute, annuity, uid')
+            ->find();
+    }
+
+    /**
+     * 根据 order_id 获取第二推荐人佣金变更数据（user=3）
+     */
+    public function getUserThreeChangeFromOrderId($orderId)
+    {
+        return $this::getModel()::getDB()
+            ->where('order_id', '=', $orderId)
+            ->where('user', '=', 3)
+            ->field('brokerage_price, uid')
+            ->find();
+    }
+
+    /**
+     * 根据 order_id 获取扫码推荐人积分变更数据（user=4）
+     */
+    public function getUserFourChangeFromOrderId($orderId)
+    {
+        return $this::getModel()::getDB()
+            ->where('order_id', '=', $orderId)
+            ->where('user', '=', 4)
+            ->field('score, uid')
+            ->find();
+    }
+}

app/common/dao/backup/BackupUserDao.php

@@ -0,0 +1,25 @@
+<?php
+
+
+namespace app\common\dao\backup;
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\backup\BackupUser;
+
+class BackupUserDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return BackupUser::class;
+    }
+
+    /**
+     * 备份删除的用户表数据
+     * @param array $spreadUser
+     * @return int
+     */
+    public function saveDelData(array $spreadUser)
+    {
+        return $this->getModel()::getDB()->insert($spreadUser);
+    }
+}

app/common/dao/dividend/DividendLogDao.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace app\common\dao\dividend;
+
+use app\common\dao\BaseDao;
+use app\common\model\dividend\DividendLog;
+use app\entity\data\dividend\DividendLogEntity;
+
+class DividendLogDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return DividendLog::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return DividendLogEntity[]
+     */
+    public function getDividendLogEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var DividendLog $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return DividendLogEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+}

app/common/dao/douhuomall/DouhuomallChangeLogDao.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\dao\douhuomall;
+
+use app\common\dao\BaseDao;
+use app\common\model\douhuomall\DouhuomallChangeLog;
+
+class DouhuomallChangeLogDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return DouhuomallChangeLog::class;
+    }
+}

app/common/dao/gzc/GzcLogDao.php

@@ -11,4 +11,18 @@ class GzcLogDao extends BaseDao
     {
         return GzcLog::class;
     }
+    /**
+     * 公证处推送记录失效
+     */
+    public function loseGzcLog($orderId)
+    {
+        return $this->getModel()::getDB()->where('link_id',$orderId)->update(['gzc' => 0,'success' => 0]);
+    }
+    /**
+     * 恢复正常
+     */
+    public function recoverGzcLogs($orderId)
+    {
+        return $this->getModel()::getDB()->where('link_id',$orderId)->update(['gzc' => 1,'success' => 1]);
+    }
 }

app/common/dao/merchant/order/OrderMerchantDao.php

@@ -62,7 +62,12 @@ class OrderMerchantDao extends BaseDao
     public function merchantSearch($merId, array $where, $sysDel = 0)
     {
         return OrderMerchant::getDB()
-            ->where('mer_id', $merId)
+            ->when($merId, function ($query, $merId) {
+                $query->where('mer_id', $merId);
+            })
+            ->when(!$merId && isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {
+                $query->where('mer_id', $where['mer_id']);
+            })
             ->when(isset($where['date']) && $where['date'] !== '', function ($query) use ($where) {
                 getModelTime($query, $where['date']);
             })

app/common/dao/shared/SharedProsperityRecommendConfigDao.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace app\common\dao\shared;
+
+use app\common\dao\BaseDao;
+use app\common\model\shared\SharedProsperityRecommendConfig;
+
+class SharedProsperityRecommendConfigDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return SharedProsperityRecommendConfig::class;
+    }
+
+    /**
+     * @return array
+     * @author 史晨
+     * @date 2026/2/5 14:43
+     * 获取推荐配置
+     */
+    public function getConfigList(): array
+    {
+        $entityList = [];
+        try {
+            /** @var SharedProsperityRecommendConfig $model */
+            $model = $this->getModel();
+            return $model::getDB()
+                ->select()
+                ->toArray();
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
+}

app/common/dao/shared/SharedProsperityUserDao.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace app\common\dao\shared;
+
+use app\common\dao\BaseDao;
+use app\common\model\shared\SharedProsperityUser;
+use app\entity\data\shared\SharedProsperityUserEntity;
+
+class SharedProsperityUserDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return SharedProsperityUser::class;
+    }
+
+    /**
+     * @param array $userIdList
+     * @return SharedProsperityUserEntity[]
+     */
+    public function getSharedProsperityUserEntityListByUserIdList(array $userIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var SharedProsperityUser $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('user_id', $userIdList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return SharedProsperityUserEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+}

app/common/dao/store/order/StoreOrderDao.php

@@ -16,6 +16,7 @@ use app\common\enum\store\StoreOrderEnum;
 use app\common\model\BaseModel;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\user\User;
+use app\common\repositories\store\order\StoreOrderProductRepository;
 use app\common\repositories\user\UserRepository;
 use app\entity\CommonEntity;
 use app\entity\data\store\StoreOrderEntity;
@@ -112,10 +113,14 @@ class StoreOrderDao extends BaseDao
             })
             ->when(isset($where['keywords']) && $where['keywords'] !== '', function ($query) use ($where) {
                 $query->where(function ($query) use ($where) {
+                    /** @var StoreOrderProductRepository $storeOrderProductRepository */
+                    $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
+                    $orderIdList = $storeOrderProductRepository->getOrderIdListByKeyword($where['keywords']);
                     $query->where('real_name', 'like', "%" . $where['keywords'] . "%")
                         ->whereOr('user_phone', 'like', "%{$where['keywords']}%")
                         ->whereOr('order_sn', 'like', '%' . $where['keywords'] . '%')
-                        ->whereOr('verify_code', 'like', '%' . $where['keywords'] . '%');
+                        ->whereOr('verify_code', 'like', '%' . $where['keywords'] . '%')
+                        ->whereOr('order_id', 'in', $orderIdList);
                 });
             })
             ->when(isset($where['reconciliation_type']) && $where['reconciliation_type'] !== '', function ($query) use ($where) {
@@ -698,4 +703,32 @@ class StoreOrderDao extends BaseDao
                 'settlement_time' => date('Y-m-d H:i:s')
             ]);
     }
+
+    /**
+     * 红积分订单查询（订单ID列表）
+     * @param int $merId
+     * @param array $orderIdList
+     * @return array
+     */
+    public function getRedNumOrders(int $merId, array $orderIdList): array
+    {
+        try {
+            return StoreOrder::getDB()
+                ->alias('o')
+                ->join('user_bill u', 'u.order_sn=o.order_sn')
+                ->where('o.paid', 1)
+                ->where('o.is_red_ylj', 0)
+                ->where('o.mer_id', $merId)
+                ->where('u.commission_type', 5)
+                ->where('u.gzc', 3)
+                ->where('u.status', 0)
+                ->whereIn('o.pay_type', [0, 5])
+                ->whereIn('o.order_id', $orderIdList)
+                ->field('o.order_id,o.order_sn,u.number,u.mark')
+                ->select()
+                ->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/dao/store/order/StoreOrderProductDao.php

@@ -143,4 +143,17 @@ class StoreOrderProductDao extends BaseDao
                 $query->where('B.mer_id', $merId);
             })->where('B.paid', 1)->group('B.mer_id')->limit($limit)->order('total DESC')->select();
     }
+
+    /**
+     * @param $keyword
+     * @return array
+     */
+    public function getOrderIdListByKeyword($keyword): array
+    {
+        /** @var StoreOrderProduct $model */
+        $model = $this->getModel();
+        return $model::getDB()
+            ->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(cart_info, '$.product.store_name')) LIKE ?", ["%{$keyword}%"])
+            ->column('order_id');
+    }
 }

app/common/dao/store/product/ProductAttrValueChangeLogDao.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\dao\store\product;
+
+use app\common\dao\BaseDao;
+use app\common\model\store\product\ProductAttrValueChangeLog as model;
+
+class ProductAttrValueChangeLogDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return model::class;
+    }
+}

app/common/dao/user/UserBillDao.php

@@ -254,4 +254,66 @@ class UserBillDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据order_id与uid查找养老金值（link_id，status=1, pm=1）
+     */
+    public function getYanglaoFromUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('link_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->where('pm', '=', 1)
+                ->where('uid', '=', $uid)
+                ->value('number');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id与uid查找佣金（commission_type=5）
+     */
+    public function getYljFromCommissionTypeUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('link_id', '=', $orderId)
+                ->where('commission_type', '=', 5)
+                ->where('uid', '=', $uid)
+                ->value('number');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id与uid查找佣金（commission_type=3）
+     */
+    public function getYongjinFromCommissionTypeUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('link_id', '=', $orderId)
+                ->where('commission_type', '=', 3)
+                ->where('uid', '=', $uid)
+                ->value('number');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id查找第二推荐佣金uid（commission_type=3，排除当前用户和一级推荐人）
+     */
+    public function getYongjinTwoUidFromOrderId($orderId, $uid, $spreadUid)
+    {
+        try {
+            $value = $this::getModel()::getDB()
+                ->where('link_id', '=', $orderId)
+                ->where('commission_type', '=', 3)
+                ->whereNotIn('uid', [$uid, $spreadUid])
+                ->value('uid');
+            return $value ?: 0;
+        } catch (\Exception $e) {
+            return 0;
+        }
+    }
+}

app/common/dao/user/UserDao.php

@@ -456,4 +456,26 @@ class UserDao extends BaseDao
     {
         return $this::getModel()::getDB()->where('level_id', '=', $userId)->column('uid');
     }
+    /**
+     * 通过uid获取spreadUid
+     */
+    public function getSpreadUidFromUid($uid)
+    {
+        try {
+        return $this::getModel()::getDB()->where('uid', '=', $uid)->value('spread_uid');
+        } catch (\Exception $e) {
+        return [];
+        }
+    }
+    /**
+     * 根据spread查找用户信息
+     */
+    public function getSpreadUserFromUid($spreadUid)
+    {
+        try {
+            return $this::getModel()::getDB()->where('uid', '=', $spreadUid)->find();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/dao/user/UserOrderKillOrRecoverRecordsDao.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\model\user\UserOrderKillOrRecoverRecords;
+
+class UserOrderKillOrRecoverRecordsDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return UserOrderKillOrRecoverRecords::class;
+    }
+
+    /**
+     * 插入撤销或恢复订单记录
+     */
+    public function insertKillOrRecoverRecord(array $data)
+    {
+        try {
+            return $this->getModel()::getDB()->insert($data);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+}
+

app/common/dao/user/UserPvLogDao.php

@@ -86,4 +86,30 @@ class UserPvLogDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据order_id和status查找pv值
+     */
+    public function getPVFromStatusOrderId($orderId)
+    {
+        try {
+            return $this::getModel()::getDB()->where('order_id', '=', $orderId)->where('status','=',1)->value('pv');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id获取pv值（用于备份用户变更记录）
+     */
+    public function getPvForBackupFromOrderId($orderId)
+    {
+        try {
+            $value = $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->value('pv');
+            return $value ?: 0;
+        } catch (\Exception $e) {
+            return 0;
+        }
+    }
+}

app/common/dao/user/UserSignGongxianDao.php

@@ -86,4 +86,20 @@ class UserSignGongxianDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据order_id与uid查找贡献值（status=1, type=1）
+     */
+    public function getGongxianFromUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->where('type', '=', 1)
+                ->where('uid', '=', $uid)
+                ->value('number');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/UserSignScoreDao.php

@@ -87,4 +87,82 @@ class UserSignScoreDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据order_id与uid查找奖励积分值（status=1, source_type=3, pm=1）
+     */
+    public function getRewardScoreFromUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->where('source_type', '=', 3)
+                ->where('uid', '=', $uid)
+                ->where('pm', '=', 1)
+                ->value('reward_socre');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id与uid查找支付积分值（status=1, pm=2）
+     */
+    public function getPayScoreFromUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->where('uid', '=', $uid)
+                ->where('pm', '=', 2)
+                ->value('reward_socre');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id与uid查找奖励积分值（status=1）
+     */
+    public function getRewardScoreFromStatusUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('uid', '=', $uid)
+                ->where('status', '=', 1)
+                ->value('reward_socre');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id查找扫码推荐人uid（mark like '%扫码%', status=1）
+     */
+    public function getUidFromMarkLikeStatusOrderId($orderId)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->whereLike('mark', '%扫码%')
+                ->where('status', '=', 1)
+                ->value('uid');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据上面getUidFromMarkLikeStatusOrderId方法查处的Uid来确定score
+     */
+    public function getScoreFromUidOrderId($orderId, $smSpreadUid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('uid', '=', $smSpreadUid)
+                ->where('status', '=', 1)
+                ->value('reward_socre');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/UserSignVrDao.php

@@ -56,4 +56,30 @@ class UserSignVrDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据订单id和type类型查找vr
+     */
+    public function getVrFromTypeOrderId($orderId)
+    {
+        try {
+            return $this::getModel()::getDB()->where('order_id', '=', $orderId)->where('type','=',2)->value('number');
+        } catch (\Exception $e){
+            return [];
+        }
+    }
+    /**
+     * 根据order_id获取vr值（用于备份用户变更记录）
+     */
+    public function getVrForBackupFromOrderId($orderId)
+    {
+        try {
+            $value = $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('type', '=', 2)
+                ->value('number');
+            return $value ?: 0;
+        } catch (\Exception $e) {
+            return 0;
+        }
+    }
+}

app/common/dao/util/TableOpsDao.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\common\dao\util;
+
+use think\facade\Db;
+
+class TableOpsDao
+{
+    public function backupAndDeleteBatch(array $ops): void
+    {
+        foreach ($ops as [$table, $where]) {
+        $this->backupAndDelete($table, $where);
+        }
+    }
+    public function backupAndDelete(string $table, array $where): void
+    {
+        $rows = Db::name($table)->where($where)->select()->toArray();
+        if ($rows) {
+            Db::name('backup_' . $table)->insertAll($rows);
+            Db::name($table)->where($where)->delete();
+        }
+    }
+
+    public function restore(string $table, array $where): void
+    {
+        $backupTable = 'backup_' . $table;
+        $rows = Db::name($backupTable)->where($where)->select()->toArray();
+        if ($rows) {
+            foreach ($rows as &$row) {
+                if (isset($row['del_time'])) unset($row['del_time']);
+            }
+            unset($row);
+            Db::name($table)->insertAll($rows);
+            Db::name($backupTable)->where($where)->delete();
+        }
+    }
+
+    public function restoreBatch(array $ops): void
+    {
+        foreach ($ops as [$table, $where]) {
+            $this->restore($table, $where);
+        }
+    }
+}
+

app/common/enum/CommonEnum.php

@@ -51,7 +51,8 @@ class CommonEnum
         'PARTNER_DIVIDEND' => ['code' => 11, 'name' => '合伙人分红'],
         'JOINT_CREATOR_DIVIDEND' => ['code' => 12, 'name' => '联创分红'],
         'EQUITY_DIVIDEND' => ['code' => 13, 'name' => '股权分红'],
-        'SHARE_EARNINGS' => ['code' => 20, 'name' => '分享收益']
+        'SHARE_EARNINGS' => ['code' => 20, 'name' => '分享收益'],
+        'COMMISSION_RECORD_V1.0' => ['code' => 21, 'name' => '1.0佣金记录'],
     ];
 
     const USER_GROUP = [

app/common/enum/dividend/DividendLogEnum.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace app\common\enum\dividend;
+
+use app\common\enum\CommonEnum;
+
+class DividendLogEnum extends CommonEnum
+{
+    // 1-合伙人分红；2-联创分红；3-股权分红；4-佣金补贴
+    const TYPE = [
+        'PartnerProfit' => ['code' => 1, 'name' => '合伙人分红'],
+        'CoFounderProfit' => ['code' => 2, 'name' => '联创分红'],
+        'EquityDividend' => ['code' => 3, 'name' => '股权分红'],
+        'CommissionSubsidy' => ['code' => 4, 'name' => '佣金补贴']
+    ];
+
+    const IS_TEST = [
+        'No' => ['code' => 0, 'name' => '否'],
+        'Yes' => ['code' => 1, 'name' => '是']
+    ];
+}

app/common/enum/douhuomall/DouhuomallChangeLogEnum.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace app\common\enum\douhuomall;
+
+use app\common\enum\CommonEnum;
+
+class DouhuomallChangeLogEnum extends CommonEnum
+{
+    const TYPE = [
+        'Adjust' => ['code' => 1, 'name' => '调价'],
+        'Delete' => ['code' => 2, 'name' => '删除']
+    ];
+}

app/common/enum/douhuomall/DouhuomallEnum.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\enum\douhuomall;
+
+use app\common\enum\CommonEnum;
+
+class DouhuomallEnum extends CommonEnum
+{
+    // 微唯宝文档中说明："status": 1,//商品状态（0=下架，1=上架，3=删除）
+    const STATUS = [
+        'Down' => ['code' => 0, 'name' => '下架'],
+        'Up' => ['code' => 1, 'name' => '上架'],
+        'Delete' => ['code' => 3, 'name' => '删除'],
+    ];
+}

app/common/enum/store/ProductEnum.php

@@ -36,4 +36,9 @@ class ProductEnum extends CommonEnum
         'No' => ['code' => 0, 'name' => '否'],
         'Yes' => ['code' => 1, 'name' => '是']
     ];
+
+    const IS_STATUS = [
+        'Automatic' => ['code' => 0, 'name' => '系统自动操作'],
+        'Triggered' => ['code' => 1, 'name' => '人为触发操作']
+    ];
 }

app/common/middleware/AdminTokenMiddleware.php

@@ -32,7 +32,7 @@ class AdminTokenMiddleware extends BaseMiddleware
      */
     public function before(Request $request)
     {
-        \think\facade\Log::info('Midd_ko=>'.\GuzzleHttp\json_encode($request));
+        // \think\facade\Log::info('Midd_ko=>'.\GuzzleHttp\json_encode($request));
         $force = $this->getArg(0, true);
         try {
             $token = trim($request->header('X-Token'));

app/common/model/backup/BackupStoreOrder.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model\backup;
+use app\common\model\BaseModel;
+
+class BackupStoreOrder extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'order_id';
+    }
+    public static function tableName(): string
+    {
+        return 'backup_store_order';
+    }
+}

app/common/model/backup/BackupUser.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\model\backup;
+
+use app\common\model\BaseModel;
+
+class BackupUser extends BaseModel
+{
+    public static function tablePk(): string
+    {
+        return 'uid';
+    }
+    public static function tableName(): string
+    {
+        return 'backup_user';
+    }
+}

app/common/model/backup/BackupUserChange.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\model\backup;
+
+use app\common\model\BaseModel;
+
+class BackupUserChange extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+    public static function tableName(): string
+    {
+        return 'backup_user_change';
+    }
+}

app/common/model/dividend/DividendLog.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\dividend;
+
+use app\common\model\BaseModel;
+
+class DividendLog extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'dividend_logs';
+    }
+}

app/common/model/douhuomall/DouhuomallChangeLog.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\douhuomall;
+
+use app\common\model\BaseModel;
+
+class DouhuomallChangeLog extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return '';
+    }
+
+    public static function tableName(): string
+    {
+        return 'douhuomall_change_logs';
+    }
+}

app/common/model/shared/SharedProsperityRecommendConfig.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\model\shared;
+
+use app\common\model\BaseModel;
+
+class SharedProsperityRecommendConfig extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'shared_prosperity_recommend_config';
+    }
+}

app/common/model/shared/SharedProsperityUser.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\model\shared;
+
+use app\common\model\BaseModel;
+
+class SharedProsperityUser extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'shared_prosperity_user';
+    }
+}

app/common/model/store/product/ProductAttrValueChangeLog.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\store\product;
+
+use app\common\model\BaseModel;
+
+class ProductAttrValueChangeLog extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return '';
+    }
+
+    public static function tableName(): string
+    {
+        return 'store_product_attr_value_change_logs';
+    }
+}

app/common/model/user/UserOrderKillOrRecoverRecords.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\user;
+
+use app\common\model\BaseModel;
+
+class UserOrderKillOrRecoverRecords extends BaseModel
+{
+    public static function tablePk(): ?string//hajimi
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'user_order_kill_or_recover_records';
+    }
+}
+

app/common/model/user/UserOrderKillRecord.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\user;
+
+use app\common\model\BaseModel;
+
+class UserOrderKillRecord extends BaseModel
+{
+    public static function tablePk(): ?string//hajimi
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'user_order_kill_records';
+    }
+}
+

app/common/repositories/agreement/AgreementRepository.php

@@ -23,6 +23,11 @@ class AgreementRepository extends BaseRepository
         return Db::name("user_agreement")->where(['agreement_id'=>$id])->find();
     }
 
+    /*详情*/
+    public function getDetailContent($id){
+        return Db::name("user_agreement")->where(['agreement_id' => $id])->find()['content'] ?? '';
+    }
+
     /*修改*/
     public function updateData($id,$data){
         return Db::name("user_agreement")

app/common/repositories/dividend/DividendLogRepository.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace app\common\repositories\dividend;
+
+use app\common\dao\dividend\DividendLogDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\dividend\DividendLogEntity;
+
+class DividendLogRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * DividendLogRepository constructor.
+     * @param DividendLogDao $dao
+     */
+    public function __construct(DividendLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $id
+     * @return DividendLogEntity
+     */
+    public function getDividendLogEntityById(int $id): DividendLogEntity
+    {
+        $entityList = $this->getDividendLogEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof DividendLogEntity) {
+            return $entity;
+        } else {
+            /** @var DividendLogEntity */
+            return DividendLogEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return DividendLogEntity[]
+     */
+    public function getDividendLogEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getDividendLogEntityListByIdList($idList);
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param DividendLogEntity $dividendLogEntity
+     * @return DividendLogEntity
+     */
+    public function createByEntity(DividendLogEntity $dividendLogEntity): DividendLogEntity
+    {
+        $result = $this->create($dividendLogEntity->toUnderlineArray())->toArray();
+        /** @var DividendLogEntity $entity */
+        $entity = DividendLogEntity::newInstance($result);
+        return $entity;
+    }
+}

app/common/repositories/douhuomall/DouhuomallChangeLogRepository.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace app\common\repositories\douhuomall;
+
+use app\common\dao\douhuomall\DouhuomallChangeLogDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\douhuomall\DouhuomallChangeLogEntity;
+
+class DouhuomallChangeLogRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * DouhuomallChangeLogRepository constructor.
+     * @param DouhuomallChangeLogDao $dao
+     */
+    public function __construct(DouhuomallChangeLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param DouhuomallChangeLogEntity $douhuomallChangeLogEntity
+     * @return DouhuomallChangeLogEntity
+     */
+    public function createByEntity(DouhuomallChangeLogEntity $douhuomallChangeLogEntity): DouhuomallChangeLogEntity
+    {
+        $result = $this->create($douhuomallChangeLogEntity->toUnderlineArray())->toArray();
+        /** @var DouhuomallChangeLogEntity $entity */
+        $entity = DouhuomallChangeLogEntity::newInstance($result);
+        return $entity;
+    }
+}

app/common/repositories/finance/FinanceRepository.php

@@ -1041,6 +1041,7 @@ class FinanceRepository extends BaseRepository
         $query = Db::name('user_bill')
             ->alias('ub')
             ->leftJoin('user u', 'u.uid=ub.uid')
+            ->where('u.test_user', '<>', 1)
             ->when($mer_id, function ($query) use ($mer_id) {
                 $query->where('ub.mer_id', $mer_id);
             })
@@ -1049,7 +1050,7 @@ class FinanceRepository extends BaseRepository
                 $query->where('ub.commission_type', 5);
             }, function ($query) use ($params) {
                 // 非养老金
-                $query->whereIn('ub.commission_type', [3, 16, 14, 10, 12, 20, 15, 7, 19]);
+                $query->whereIn('ub.commission_type', [3, 7, 8, 10, 11, 12, 13, 20, 21]);
             })
             ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
                 $query->where('ub.uid', $params['uid']);
@@ -1075,6 +1076,8 @@ class FinanceRepository extends BaseRepository
         //导出数据
         $is_excel = request()->param('is_excel', 0);
         if($is_excel == 1){
+            ini_set('memory_limit', '-1');
+            set_time_limit(0);
             $date['list'] = $this->date_where($query, $where['date'], 'ub.create_time')
             ->field('ub.bill_id,ub.title,ub.number,ub.mark,ub.take_time,ub.commission_type,u.uid,u.phone,u.nickname,u.user_group,ub.order_sn,ub.take_time,ub.status,ub.create_time')
             ->order('ub.bill_id', 'desc')
@@ -1201,20 +1204,28 @@ class FinanceRepository extends BaseRepository
                 return $item;
             });
         $data['count'] = $query->count();
+        //应用时间筛选条件
+        $query1 = $this->date_where($query1, $where['date'], 'ub.create_time');
         $statistics = $query1->field('sum(ub.number) money,ub.commission_type')->group('ub.commission_type')->select()->toArray();
         $statistics = array_column($statistics, 'money', 'commission_type');
-
+        //应用时间筛选条件
+        $query3 = $this->date_where($query3, $where['date'], 'ub.create_time');
         $statistics_tow = $query3->field('sum(ub.number) money,ub.status')->group('ub.status')->select()->toArray();
         $statistics_tow = array_column($statistics_tow, 'money', 'status');
-
         //佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费 7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12区县代区域收益√ 13消费循环佣金  14-推荐代理收益√ 15邀请小区团长升级√ 16大V经理分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√' 20省级代理区域收益√
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(array_sum($statistics)), 'name' => '佣金奖励总额'];
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($statistics_tow[1] ?? 0), 'name' => '已结算佣金'];
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($statistics_tow[0] ?? 0), 'name' => '未结算佣金'];
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($statistics_tow[-1] ?? 0), 'name' => '已失效佣金'];
-        $transition_vr = Db::name('user_transition_vr')->where('type', 1)->sum('number');
+        //应用时间筛选条件
+        $transition_vr_query = Db::name('user_transition_vr')->where('type', 1);
+        $transition_vr_query = $this->date_where($transition_vr_query, $where['date'], 'create_time', '-', 2);//type为2时，才能根据时间戳来筛选数据。默认是处理Y-m-d H:i:s字符串
+        $transition_vr = $transition_vr_query->sum('number');
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($transition_vr), 'name' => '佣金转VR'];
-        $user_extra_money = Db::name('user_extract')->where('status', 1)->sum('extract_price');
+        //应用时间筛选条件
+        $user_extra_money_query = Db::name('user_extract')->where('status', 1);
+        $user_extra_money_query = $this->date_where($user_extra_money_query, $where['date'], 'create_time');
+        $user_extra_money = $user_extra_money_query->sum('extract_price');
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($user_extra_money), 'name' => '已提现佣金'];
         $data['statistics'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($user_extra_money), 'name' => '已提现金额'];
 
@@ -1835,49 +1846,34 @@ class FinanceRepository extends BaseRepository
      */
     public function vr_list($mer_id = 0)
     {
-        $page = input('page');
-        $limit = input('limit');
+        $page = input('page', 1);
+        $limit = input('limit', 20);
         $where = request()->params(['date']);
-        $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
+        $params = request()->params(['type', 'uid', 'pm', 'phone', 'status']);
 
-        $date = [];
-        //商户ID
+        // 1. 基础查询构建
         $query = Db::name('user_sign_vr')
-        ->alias('uss')
-        ->leftJoin('user u', 'u.uid=uss.uid')
-        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
-        ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
-            $query->where('uss.uid', $params['uid']);
-        })
-        // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
-        //     $query->where('uss.pm', $params['pm']);
-        // })
-        // ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
-        //     $query->where('uss.status', $params['status']);
-        // })
-        ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
-            $query->whereLike('u.phone', '%' . $params['phone'] . '%');
-        })
-        ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
-            $query->where('type', $params['type']);
-        });
-        $query1 = clone $query;
-        $query2 = clone $query;
-        $query3 = clone $query;
-        $query4 = clone $query;
-        $query5 = clone $query;
-        $query6 = clone $query;
-        $query7 = clone $query;
-        $query8 = clone $query;
-        $query9 = clone $query;
+            ->alias('uss')
+            ->leftJoin('user u', 'u.uid = uss.uid')
+            ->leftJoin('store_order o', 'o.order_id = uss.order_id')
+            ->where('u.test_user','<>','1')
+            ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+                $query->where('uss.uid', $params['uid']);
+            })
+            ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+                $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+            })
+            ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
+                $query->where('uss.type', $params['type']);
+            });
 
         //导出数据
         $is_excel = request()->param('is_excel', 0);
         if($is_excel == 1){
             $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
-            ->order('uss.id', 'desc')
-            ->select();
+                ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
+                ->order('uss.id', 'desc')
+                ->select();
             $arr = [];
             foreach ($date['list'] as $k=>$item){
                 switch ($item['type']) {
@@ -1903,32 +1899,78 @@ class FinanceRepository extends BaseRepository
             ], $arr, 'VR统计');
         }
 
-        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
+        // 4. 分页查询
+        $date['list'] = $query->field([
+            'uss.id',
+            'uss.addtime',
+            'u.nickname',
+            'u.phone',
+            'uss.number',
+            'o.order_sn',
+            'uss.type',
+            'uss.mark',
+            'u.score'
+        ])
             ->page($page, $limit)
             ->order('uss.id', 'desc')
             ->select()
             ->each(function ($item) {
-                $item['mark'] = $item['mark'];
                 $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
                 return $item;
             });
+
+        // 5. 统计信息提取到单独方法
         $date['count'] = $query->count();
-        $date['statistics']['all'] = decimal2($query1->sum('number'));
-        // $date['statistics']['clear'] = decimal2($query2->where('uss.type', 1)->sum('number'));
-        $date['statistics']['nclear'] = decimal2($query3->where('uss.type', 2)->sum('number'));
-
-        //按照备注内容分类统计vr
-        $date['statistics']['transfervr'] = decimal2($query4->whereLike('uss.mark', '%消耗VR%')->sum('number'));
-        $date['statistics']['acquirevr'] = decimal2($query5->whereLike('uss.mark', '%到账VR%')->sum('number'));
-        $date['statistics']['transitionvr'] = decimal2($query6->whereLike('uss.mark', '%佣金转VR%')->sum('number'));
-        $date['statistics']['jcshqvr'] = decimal2($query7->whereLike('uss.mark', '%购买精彩%')->sum('number'));
-        $date['statistics']['hyzqvr'] = decimal2($query8->whereLike('uss.mark', '%购买会员%')->sum('number'));
-        $date['statistics']['allbuyvr'] = decimal2($query9->whereLike('uss.mark', '%购买%')->sum('number'));
- 
+        $date['statistics'] = $this->getVrStatistics($query);
+
         return $date;
     }
 
+    /**
+     * 获取VR统计信息
+     */
+    private function getVrStatistics($query)
+    {
+        $statistics = [];
+        $conditions = [
+            'all' => [],
+            'nclear' => ['uss.type' => 2],
+            'transfervr' => function ($subQuery) {
+                $subQuery->where('uss.type', '=', 2)
+                    ->where(function ($q) {
+                        $q->where('uss.mark', 'like', '%消耗%')
+                            ->whereOr('uss.mark', 'like', '%管理员调整vr%');
+                    });
+            },
+            'acquirevr' => function ($subQuery) {
+                $subQuery->where('uss.type', '=', 1)
+                    ->where(function ($q) {
+                        $q->where('uss.mark', 'like', '%到账%')
+                            ->whereOr('uss.mark', 'like', '%管理员调整vr%');
+                    });
+            },
+            'transitionvr' => [['uss.mark', 'like', '%佣金转VR%']],
+            'jcshqvr' => [['uss.mark', 'like', '%购买精彩%']],
+            'hyzqvr' => [['uss.mark', 'like', '%购买会员%']],
+            'allbuyvr' => [['uss.mark', 'like', '%购买%']],
+        ];
+
+        foreach ($conditions as $key => $condition) {
+            $subQuery = clone $query;
+            if (is_callable($condition)) {
+                // 如果是闭包函数，直接调用
+                $condition($subQuery);
+            } elseif (!empty($condition)) {
+                // 如果是数组条件，使用where
+                $subQuery->where($condition);
+            }
+            $statistics[$key] = decimal2($subQuery->sum('uss.number'));
+        }
+
+        return $statistics;
+    }
+
+
 
 
 

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -154,7 +154,7 @@ class OrderMerchantRepository extends BaseRepository
      */
     public function getMerchantListAdmin($merId, array $where, $page, $limit)
     {
-//        $merId=Db::name('merchant')->where('uid',$uid)->value('mer_id');
+        //        $merId=Db::name('merchant')->where('uid',$uid)->value('mer_id');
         $query = $this->dao->merchantSearch($merId, $where);
         $query1 = $this->dao->merchantSearch($merId, $where);
         $statistics = $query1->field('sum(money) money,sum(available) available,sum(swipe_fee) swipe_fee')
@@ -162,21 +162,20 @@ class OrderMerchantRepository extends BaseRepository
             ->where('paid', 1)
             ->whereNull('refund_time')
             ->find();
-
         $count = $query->count();
         $list = $query->with(['merchant', 'merchant' => function ($query) {
             return $query->field('mer_id,mer_name,mer_avatar');
         }])->page($page, $limit)->select()->each(function ($item) {
             $item->actual = bcsub($item->money, ($item->available + $item->swipe_fee), 2);
-//            switch($item->trade_type) {
-//                case 'ALI':
-//                    $item->broadcast = '支付宝收款'.$item->actual.'元';
-//                    break;
-//                case 'WX':
-//                    $item->broadcast = '微信收款'.$item->actual.'元';
-//                    break;
-//                default:break;
-//            }
+            //            switch($item->trade_type) {
+            //                case 'ALI':
+            //                    $item->broadcast = '支付宝收款'.$item->actual.'元';
+            //                    break;
+            //                case 'WX':
+            //                    $item->broadcast = '微信收款'.$item->actual.'元';
+            //                    break;
+            //                default:break;
+            //            }
             //语音内容
             $broadcast = systemConfig('broadcast');
             $item->broadcast = strtr($broadcast, ['{money}' => $item->actual]);
@@ -251,6 +250,7 @@ class OrderMerchantRepository extends BaseRepository
                 $base_commission = merchantConfig(0, 'extension_one_rate');
             }
             if($params['mer_id'] == 3425) $base_commission = 0;
+            if($params['mer_id'] == 3447) $base_commission = 0;
             $merchant_data = Db::name('merchant')->where('mer_id', $params['mer_id'])->find();
             $is_dacang = 0;
             $avaiable = 0;

app/common/repositories/shared/SharedProsperityRecommendConfigRepository.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace app\common\repositories\shared;
+
+use app\common\dao\shared\SharedProsperityRecommendConfigDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\shared\SharedProsperityRecommendConfigEntity;
+
+class SharedProsperityRecommendConfigRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * SharedProsperityUserRepository constructor.
+     * @param SharedProsperityRecommendConfigDao $dao
+     */
+    public function __construct(SharedProsperityRecommendConfigDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param SharedProsperityRecommendConfigEntity $sharedProsperityRecommendConfigEntity
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function createByEntity(SharedProsperityRecommendConfigEntity $sharedProsperityRecommendConfigEntity): SharedProsperityRecommendConfigEntity
+    {
+        $result = $this->create($sharedProsperityRecommendConfigEntity->toUnderlineArray())->toArray();
+        /** @var SharedProsperityRecommendConfigEntity $entity */
+        $entity = SharedProsperityRecommendConfigEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * @return array
+     * @author 史晨
+     * @date 2026/2/5 14:12
+     */
+    public function getList(): array
+    {
+        return $this->dao->getConfigList();
+    }
+}

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace app\common\repositories\shared;
+
+use app\common\dao\shared\SharedProsperityUserDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\shared\SharedProsperityUserEntity;
+use think\db\exception\DbException;
+
+class SharedProsperityUserRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * SharedProsperityUserRepository constructor.
+     * @param SharedProsperityUserDao $dao
+     */
+    public function __construct(SharedProsperityUserDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $userId
+     * @return SharedProsperityUserEntity
+     */
+    public function getSharedProsperityUserEntityByUserId(int $userId): SharedProsperityUserEntity
+    {
+        $entityList = $this->getSharedProsperityUserEntityListByUserIdList([$userId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof SharedProsperityUserEntity) {
+            return $entity;
+        } else {
+            /** @var SharedProsperityUserEntity */
+            return SharedProsperityUserEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $userIdList
+     * @return SharedProsperityUserEntity[]
+     */
+    public function getSharedProsperityUserEntityListByUserIdList(array $userIdList): array
+    {
+        return $this->dao->getSharedProsperityUserEntityListByUserIdList($userIdList);
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param SharedProsperityUserEntity $sharedProsperityUserEntity
+     * @return SharedProsperityUserEntity
+     */
+    public function createByEntity(SharedProsperityUserEntity $sharedProsperityUserEntity): SharedProsperityUserEntity
+    {
+        $result = $this->create($sharedProsperityUserEntity->toUnderlineArray())->toArray();
+        /** @var SharedProsperityUserEntity $entity */
+        $entity = SharedProsperityUserEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * @param $id
+     * @param $data
+     * @return int
+     */
+    public function update($id, $data): int
+    {
+        try {
+            return $this->dao->update($id, $data);
+        } catch (DbException $e) {
+            return 0;
+        }
+    }
+
+    /**
+     * @param SharedProsperityUserEntity $sharedProsperityUserEntity
+     * @return SharedProsperityUserEntity
+     */
+    public function updateByEntity(SharedProsperityUserEntity $sharedProsperityUserEntity): SharedProsperityUserEntity
+    {
+        if (empty($sharedProsperityUserEntity->getId())) {
+            return SharedProsperityUserEntity::newInstance();
+        }
+        $result = $this->update($sharedProsperityUserEntity->getId(), $sharedProsperityUserEntity->toUnderlineArray());
+        if ($result > 0) {
+            return $this->getSharedProsperityUserEntityByUserId($sharedProsperityUserEntity->getUserId());
+        }
+        return SharedProsperityUserEntity::newInstance();
+    }
+
+    /**
+     * 绑定 上级
+     * @param int $userId
+     * @param int $parentId
+     * @return bool
+     */
+    public function bindParentId(int $userId, int $parentId): bool
+    {
+        $sharedProsperityUserEntity = $this->getSharedProsperityUserEntityByUserId($userId);
+        if (empty($sharedProsperityUserEntity->getUserId())) {
+            return false;
+        }
+        $sharedProsperityUserEntityByParentId = $this->getSharedProsperityUserEntityByUserId($parentId);
+        if (empty($sharedProsperityUserEntityByParentId->getUserId())) {
+            return false;
+        }
+        $sharedProsperityUserEntity = $this->updateByEntity($sharedProsperityUserEntity->setParentId($sharedProsperityUserEntityByParentId->getUserId()));
+        if (empty($sharedProsperityUserEntity->getId())) {
+            return false;
+        }
+        return true;
+    }
+}

app/common/repositories/store/order/StoreOrderProductRepository.php

@@ -64,4 +64,17 @@ class StoreOrderProductRepository extends BaseRepository
         }
         return $this->insertAll($dataList);
     }
+
+    /**
+     * 根据关键字 获取订单ID列表
+     * @param $keyword
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getOrderIdListByKeyword($keyword): array
+    {
+        return $this->dao->getOrderIdListByKeyword($keyword);
+    }
 }

app/common/repositories/store/order/StoreOrderRepository.php

@@ -11,10 +11,25 @@
 namespace app\common\repositories\store\order;
 
 
+use app\common\dao\gzc\GzcLogDao;
 use app\common\dao\store\order\StoreOrderDao;
+use app\common\dao\user\UserDao;
+use app\common\dao\user\UserPvLogDao;
+use app\common\dao\user\UserSignVrDao;
+use app\common\dao\user\UserSignScoreDao;
+use app\common\dao\user\UserSignGongxianDao;
+use app\common\dao\user\UserBillDao;
+use app\common\dao\user\UserOrderKillOrRecoverRecordsDao;
+use app\common\dao\backup\BackupUserDao;
+use app\common\dao\backup\BackupUserChangeDao;
+use app\common\dao\util\TableOpsDao;
+use app\common\dao\backup\BackupStoreOrderDao;
 use app\common\enum\CommonEnum;
 use app\common\enum\merchant\MerchantEnum;
 use app\common\enum\shipping\ShippingTemplateEnum;
+use app\common\enum\store\CartEnum;
+use app\common\enum\store\ProductEnum;
+use app\common\enum\store\StoreGroupOrderEnum;
 use app\common\enum\store\StoreOrderEnum;
 use app\common\enum\user\UserBillEnum;
 use app\common\enum\user\UserEnum;
@@ -30,9 +45,15 @@ use app\common\model\store\order\StoreGroupOrder;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\order\StoreRefundOrder;
 use app\common\model\user\User;
+use app\common\model\user\UserCertification;
+use app\common\model\user\UserRich;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
 use app\common\repositories\BaseRepository;
+use app\common\repositories\product\ProductSeckillRepository;
+use app\common\repositories\product\ShareRepository;
+use app\common\repositories\store\coupon\StoreCouponProductRepository;
+use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\coupon\StoreCouponUserRepository;
 use app\common\repositories\store\MerchantTakeRepository;
 use app\common\repositories\store\product\ProductAttrValueRepository;
@@ -45,8 +66,10 @@ use app\common\repositories\store\shipping\ShippingTemplateUndeliveRepository;
 use app\common\repositories\store\StoreSeckillActiveRepository;
 use app\common\repositories\system\attachment\AttachmentRepository;
 use app\common\repositories\system\merchant\FinancialRecordRepository;
+use app\common\repositories\system\merchant\MerchantCategoryRepository;
 use app\common\repositories\system\merchant\MerchantContributionRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
+use app\common\repositories\merchant\MerchantRepository as m;
 use app\common\repositories\user\UserAddressRepository;
 use app\common\repositories\user\UserBillRepository;
 use app\common\repositories\user\UserPvLogRepository;
@@ -62,20 +85,31 @@ use app\common\repositories\user\UserThirdRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatUserRepository;
 use app\controller\api\user\Volunteer;
+use app\entity\data\merchant\MerchantEntity;
+use app\entity\data\product\ProductSeckillEntity;
+use app\entity\data\product\ShareEntity;
+use app\entity\data\store\CartEntity;
 use app\entity\data\store\StoreProductAttrValueEntity;
 use app\entity\data\store\StoreProductEntity;
+use app\entity\data\store\StoreGroupOrderEntity;
 use app\entity\data\store\StoreOrderEntity;
+use app\entity\data\user\UserAddressEntity;
+use app\entity\data\user\UserBillEntity;
 use app\entity\data\user\UserEntity;
 use app\entity\monomer\store\FzonePayTypeEntity;
 use app\entity\request\api\store\order\CalculatePostageRequestEntity;
+use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use app\model\common\JdOrderModel;
 use app\model\common\TbOrderModel;
 use app\traits\GongApiRequest;
 use app\traits\HuiPay;
 use app\traits\ShouxinyiApiRequest;
+use app\utils\ArrayUtil;
+use Carbon\Carbon;
 use crmeb\jobs\PayGiveCouponJob;
 use crmeb\jobs\SendSmsJob;
 use crmeb\jobs\SendTemplateMessageJob;
+use crmeb\services\AliYunSmsService;
 use crmeb\services\ExpressService;
 use crmeb\services\MiniProgramService;
 use crmeb\services\QrcodeService;
@@ -98,6 +132,7 @@ use think\facade\Route;
 use Alipay\AopClient;
 use Alipay\request\AlipayTradeAppPayRequest;
 use Lakala\src\LakalaBoss;
+use vipapis\dvd\DvdAreaSalesService_healthCheck_args;
 use function Couchbase\basicEncoderV1;
 
 /**
@@ -4078,39 +4113,39 @@ class StoreOrderRepository extends BaseRepository
             Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
         }
 
-        // 消费者
-        $userinfo = Db::name("user")->where('uid', $order["uid"])->find();
-        // 直推用户
-        $directThrustUserinfo = User::where('uid', $userinfo["spread_uid"])->find();
-        if (!empty($directThrustUserinfo)) {
-            // 直推养老金
-            $directThrustEstimateannuity = bcmul($order['total_price'], $sanfangfenpei['direct_thrust_ratio'], 2);
-            if ($directThrustEstimateannuity >= 0.01) {
-                $this->add_bill(
-                    '养老金', $directThrustEstimateannuity, $directThrustUserinfo["uid"], "复购-直接推广者获得养老金" . $directThrustEstimateannuity,
-                    5, $order_sn, $order_id, $order["mer_id"], 0, 0, $order["type_shop"]
-                );
-            } else {
-                Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
-            }
-        }
-
-        // 间推用户
-        if ($directThrustUserinfo && !empty($directThrustUserinfo["spread_uid"])) {
-            $indirectThrustUserinfo = User::where('uid', $directThrustUserinfo["spread_uid"])->find();
-            if (!empty($indirectThrustUserinfo)) {
-                // 间推养老金
-                $indirectThrustEstimateannuity = bcmul($order['total_price'], $sanfangfenpei['indirect_thrust_ratio'], 2);
-                if ($indirectThrustEstimateannuity >= 0.01) {
-                    $this->add_bill(
-                        '养老金', $indirectThrustEstimateannuity, $indirectThrustUserinfo["uid"], "复购-间接推广者获得养老金" . $indirectThrustEstimateannuity,
-                        5, $order_sn, $order_id, $order["mer_id"], 0, 0, $order["type_shop"]
-                    );
-                } else {
-                    Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
-                }
-            }
-        }
+        // // 消费者
+        // $userinfo = Db::name("user")->where('uid', $order["uid"])->find();
+        // // 直推用户
+        // $directThrustUserinfo = User::where('uid', $userinfo["spread_uid"])->find();
+        // if (!empty($directThrustUserinfo)) {
+        //     // 直推养老金
+        //     $directThrustEstimateannuity = bcmul($order['total_price'], $sanfangfenpei['direct_thrust_ratio'], 2);
+        //     if ($directThrustEstimateannuity >= 0.01) {
+        //         $this->add_bill(
+        //             '养老金', $directThrustEstimateannuity, $directThrustUserinfo["uid"], "复购-直接推广者获得养老金" . $directThrustEstimateannuity,
+        //             5, $order_sn, $order_id, $order["mer_id"], 0, 0, $order["type_shop"]
+        //         );
+        //     } else {
+        //         Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
+        //     }
+        // }
+        //
+        // // 间推用户
+        // if ($directThrustUserinfo && !empty($directThrustUserinfo["spread_uid"])) {
+        //     $indirectThrustUserinfo = User::where('uid', $directThrustUserinfo["spread_uid"])->find();
+        //     if (!empty($indirectThrustUserinfo)) {
+        //         // 间推养老金
+        //         $indirectThrustEstimateannuity = bcmul($order['total_price'], $sanfangfenpei['indirect_thrust_ratio'], 2);
+        //         if ($indirectThrustEstimateannuity >= 0.01) {
+        //             $this->add_bill(
+        //                 '养老金', $indirectThrustEstimateannuity, $indirectThrustUserinfo["uid"], "复购-间接推广者获得养老金" . $indirectThrustEstimateannuity,
+        //                 5, $order_sn, $order_id, $order["mer_id"], 0, 0, $order["type_shop"]
+        //             );
+        //         } else {
+        //             Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
+        //         }
+        //     }
+        // }
     }
 
     public function yugu_rebate($order)
@@ -5041,6 +5076,16 @@ class StoreOrderRepository extends BaseRepository
     {
         $where['paid'] = 1;
         $query = $this->dao->search($where, null);
+        $kw = trim($where['product_keywords'] ?? '');//从where取出去除空格
+        if ($kw !== '') {
+            $ids =Db::name('store_order_product')
+                ->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(cart_info, '$.product.store_name')) LIKE ?", ["%{$kw}%"])
+                ->column('order_id');
+            if (empty($ids)) {
+                return ['count' => 0, 'list' => []];
+            }
+            $query->whereIn('order_id', $ids);
+        }
         $count = $query->count();
         $list = $query->with([
             'orderProduct', 'merchant' => function ($query) {
@@ -6842,7 +6887,7 @@ class StoreOrderRepository extends BaseRepository
         try {
             $order = Db::name('store_order')->where('status', 0)->where('pay_type', '>', 0)->where('douhuomall', 1)->where('douhuomall_status', 9)->select();
             if ($order) {
-                log::info("传参数据333========");
+                // log::info("传参数据333========");
                 $gong = app()->make(ProductAttrValueRepository::class);
                 $order = $order->toArray();
                 foreach ($order as $key => $value) {
@@ -12194,3 +12239,246 @@ class StoreOrderRepository extends BaseRepository
         }
     }
 }
+    public function useKillOrderRewards($groupOrderId, $orderId, $uid,$adminId)
+    {
+        if (empty($orderId) || empty($groupOrderId) || empty($uid)) {
+            return false;
+        }
+        /** @var UserDao $userDao */
+        $userDao = app()->make(UserDao::class);
+        /** @var UserPvLogDao $userPvLogDao */
+        $userPvLogDao = app()->make(UserPvLogDao::class);
+        /** @var UserSignVrDao $userSignVrDao */
+        $userSignVrDao = app()->make(UserSignVrDao::class);
+        /** @var UserSignScoreDao $userSignScoreDao */
+        $userSignScoreDao = app()->make(UserSignScoreDao::class);
+        /** @var UserSignGongxianDao $userSignGongxianDao */
+        $userSignGongxianDao = app()->make(UserSignGongxianDao::class);
+        /** @var UserBillDao $userBillDao */
+        $userBillDao = app()->make(UserBillDao::class);
+        /** @var GzcLogDao $gzcLogDao */
+        $gzcLogDao = app()->make(GzcLogDao::class);
+        /** @var BackupUserDao $backupUserDao */
+        $backupUserDao = app()->make(BackupUserDao::class);
+        /** @var BackupUserChangeDao $backupUserChangeDao */
+        $backupUserChangeDao = app()->make(BackupUserChangeDao::class);
+        /** @var TableOpsDao $tableOpsDao */
+        $tableOpsDao = app()->make(TableOpsDao::class);
+        /** @var UserOrderKillOrRecoverRecordsDao $userOrderKillOrRecoverRecordsDao */
+        $userOrderKillOrRecoverRecordsDao = app()->make(UserOrderKillOrRecoverRecordsDao::class);
+
+        try {
+            Db::startTrans();
+            //查找是否有推荐人
+            $spreadUid = $userDao->getSpreadUidFromUid($uid);
+            //取出pv
+            $pv = $userPvLogDao->getPVFromStatusOrderId($orderId);
+            //取出 vr
+            $payVr = $userSignVrDao->getVrFromTypeOrderId($orderId);
+            //取出购买赠送积分 / 支出积分
+            $score = $userSignScoreDao->getRewardScoreFromUidOrderId($orderId, $uid);
+            $payScore = $userSignScoreDao->getPayScoreFromUidOrderId($orderId, $uid);
+            // 贡献值
+            $gongXian = $userSignGongxianDao->getGongxianFromUidOrderId($orderId, $uid);
+            // 养老金
+            $yangLaoJin = $userBillDao->getYanglaoFromUidOrderId($orderId, $uid);
+            if ($spreadUid) {
+                $spreadScore = $userSignScoreDao->getRewardScoreFromStatusUidOrderId($orderId, $spreadUid);//积分
+                $spreadGongXian = $userSignGongxianDao->getGongxianFromUidOrderId($orderId, $spreadUid);//贡献
+                $spreadYlj = $userBillDao->getYljFromCommissionTypeUidOrderId($orderId, $spreadUid);//养老金
+                $spreadYongJin = $userBillDao->getYongjinFromCommissionTypeUidOrderId($orderId, $spreadUid);//佣金
+//                $spreadUser = $userDao->getSpreadUserFromUid($spreadUid);//找到推荐人的user表数据
+//                $backupUserDao->saveDelData($spreadUser);//备份原始的user大概是没必要的，user更新数据都靠具体数目加减操作
+                $userUpdateList = [//减去各奖励数目
+                    'id' => $uid,
+                    'score' => Db::raw("score - {$spreadScore}"),
+                    'per_contribute' => Db::raw("per_contribute - {$spreadGongXian}"),
+                    'brokerage_price' => Db::raw("brokerage_price - {$spreadYongJin}"),
+                    'annuity' => Db::raw("annuity - {$spreadYlj}"),
+                ];
+                $userDao->saveAll($userUpdateList);//执行
+                $saveSpreadUserChangeList = [//将奖励数目进行备份
+                    'uid' => $spreadUid,
+                    'order_id' => $orderId,
+                    'score' => $spreadScore ?: 0,
+                    'per_contribute' => $spreadGongXian ?: 0,
+                    'brokerage_price' => $spreadYongJin ?: 0,
+                    'user' => 2,
+                ];
+                $backupUserChangeDao->saveAll($saveSpreadUserChangeList);
+            }
+            $smSpreadUid = $userSignScoreDao->getUidFromMarkLikeStatusOrderId($orderId);//查找扫码消费的uid
+            $smSpreadScore = $userSignScoreDao->getScoreFromUidOrderId($orderId,$smSpreadUid);//扫码消费积分
+            $spreadYongJinTwoUid = $userBillDao->getYongjinTwoUidFromOrderId($orderId, $uid, $spreadUid);//第二推荐
+            $spreadYongJinTwo = $userBillDao->getYongjinFromCommissionTypeUidOrderId($orderId, $spreadYongJinTwoUid);//第二推荐佣金
+            $useScore = $payScore - $score;//将花费的积分减去购买获得的积分
+//            $user = Db::name('user')->where('uid', $uid)->find();
+//            Db::name('backup_user')->insert($user);//用户信息备份，大概也是不需要
+            $updateUserOrderAwardList = [//吧奖励和花费撤回
+                'uid' => $uid,
+                'pv' => Db::raw("pv - {$pv}"),
+                'vr' => Db::raw("vr + {$payVr}"),
+                'score' => Db::raw("score + {$useScore}"),
+                'contribute' => Db::raw("contribute - {$gongXian}"),
+                'annuity' => Db::raw("annuity - {$yangLaoJin}"),
+            ];
+            $userDao->saveAll($updateUserOrderAwardList);
+            $saveUserChangeList = [
+                'uid' => $uid,
+                'order_id' => $orderId,
+                'pv' => $pv ?: 0,
+                'vr' => $payVr ?: 0,
+                'score' => $useScore ?: 0,
+                'contribute' => $gongXian ?: 0,
+                'annuity' => $yangLaoJin ?: 0,
+                'user' => 1,
+            ];
+            $backupUserChangeDao->saveAll($saveUserChangeList);
+            if ($spreadYongJinTwoUid) {
+                $updateSpreadUserTwoList = [
+                    'uid' => $spreadYongJinTwoUid,
+                    'brokerage_price' => $spreadYongJinTwo
+                ];
+                $userDao->saveAll($updateSpreadUserTwoList);
+                $saveSpreadUserTwoChangeList = [
+                    'uid' => $spreadYongJinTwoUid,
+                    'order_id' => $orderId,
+                    'brokerage_price' => $spreadYongJinTwo ?: 0,
+                    'user' => 3,
+                ];
+                $backupUserChangeDao->saveAll($saveSpreadUserTwoChangeList);
+            }
+            if ($smSpreadUid) {
+                $updateSpreadSMUserList = [
+                    'uid' => $smSpreadUid,
+                    'score' => $smSpreadScore
+                ];
+                $userDao->saveAll($updateSpreadSMUserList);
+                $saveSpreadSMUserChangeList = [
+                    'uid' => $smSpreadUid,
+                    'order_id' => $orderId,
+                    'score' => $smSpreadScore ?: 0,
+                    'user' => 4,
+                ];
+                $backupUserChangeDao->saveAll($saveSpreadSMUserChangeList);
+            }
+            $ops = [
+                ['store_order', ['group_order_id' => $groupOrderId]],
+                ['store_group_order', ['group_order_id' => $groupOrderId]],
+                ['user_pv_log', ['order_id' => $orderId]],
+                ['user_sign_vr', ['order_id' => $orderId]],
+                ['user_sign_score', ['order_id' => $orderId]],
+                ['user_sign_gongxian', ['order_id' => $orderId]],
+                ['user_bill', ['link_id' => $orderId]],
+                ['gzc_logs', ['link_id' => $orderId]],
+            ];
+            $tableOpsDao->backupAndDeleteBatch($ops);//备份数据以及删除源数据
+            $gzcLogDao->loseGzcLog($orderId);//公证处设置失效
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return false;
+        }
+        $userOrderKillOrRecoverRecordsDao->insertKillOrRecoverRecord([
+            'operation_id' => $adminId,
+            'uid' => $uid,
+            'order_id' => $orderId,
+            'mark' => '后台管理员撤销订单记录',
+        ]);
+        return true;
+    }
+    public function getKillOrderList()
+    {
+        /**@var BackupStoreOrderDao $backupStoreOrderDao*/
+        $backupStoreOrderDao = app()->make(BackupStoreOrderDao::class);
+        $backupStoreOrderDao->getKillOrderList(20);
+    }
+    public function recoverOrderByAdmin($groupOrderId, $orderId)
+    {
+        if (empty($orderId) || empty($groupOrderId)) {
+            return false;
+        }
+        /** @var TableOpsDao $tableOpsDao */
+        $tableOpsDao = app()->make(TableOpsDao::class);
+        /** @var GzcLogDao $gzcLogDao */
+        $gzcLogDao = app()->make(GzcLogDao::class);
+        /** @var UserOrderKillOrRecoverRecordsDao $userOrderKillOrRecoverRecordsDao */
+        $userOrderKillOrRecoverRecordsDao = app()->make(UserOrderKillOrRecoverRecordsDao::class);
+
+        try {
+            /** @var easterOrder $model */
+            Db::startTrans();
+            $restoreOps = [
+                ['store_order', ['group_order_id' => $groupOrderId]],
+                ['store_group_order', ['group_order_id' => $groupOrderId]],
+                ['user_pv_log', ['order_id' => $orderId]],
+                ['user_sign_vr', ['order_id' => $orderId]],
+                ['user_sign_score', ['order_id' => $orderId]],
+                ['user_sign_gongxian', ['order_id' => $orderId]],
+                ['user_bill', ['link_id' => $orderId]],
+                ['gzc_logs', ['link_id' => $orderId]],
+            ];
+            $tableOpsDao->restoreBatch($restoreOps);
+            $this->easterUserAward(['order_id' => $orderId]);
+            $gzcLogDao->recoverGzcLogs($orderId);//公证处设置有效
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return false;
+        }
+        $userOrderKillOrRecoverRecordsDao->insertKillOrRecoverRecord([
+            'operation_id' => null,
+            'uid' => null,
+            'order_id' => $orderId,
+            'mark' => '后台管理员恢复订单记录',
+        ]);
+        return true;
+    }
+    public function easterUserAward(array $where): void
+    {
+        /** @var BackupUserChangeDao $backupUserChangeDao */
+        $backupUserChangeDao = app()->make(BackupUserChangeDao::class);
+        /** @var UserDao $userDao */
+        $userDao = app()->make(UserDao::class);
+
+        $orderId = $where['order_id'];
+        $row1 = $backupUserChangeDao->getUserOneChangeFromOrderId($orderId);
+        if (!empty($row1)) {
+            $userDao->saveAll([
+            'uid' => $row1['uid'],
+            'pv' => Db::raw("pv + {$row1['pv']}"),
+            'vr' => Db::raw("vr - {$row1['vr']}"),
+            'score' => Db::raw("score - {$row1['score']}"),
+            'contribute' => Db::raw("contribute + {$row1['contribute']}"),
+            'annuity' => Db::raw("annuity + {$row1['annuity']}"),
+            ]);
+        }
+        $row2 = $backupUserChangeDao->getUserTwoChangeFromOrderId($orderId);
+        if (!empty($row2)) {
+            $userDao->saveAll([
+                'uid' => $row2['uid'],
+                'score' => Db::raw("score + {$row2['score']}"),
+                'contribute' => Db::raw("contribute + {$row2['per_contribute']}"),
+                'annuity' => Db::raw("annuity + {$row2['annuity']}"),
+                'brokerage_price' => Db::raw("brokerage_price + {$row2['brokerage_price']}"),
+                'per_contribute' => Db::raw("per_contribute + {$row2['per_contribute']}"),
+            ]);
+        }
+        $row3 = $backupUserChangeDao->getUserThreeChangeFromOrderId($orderId);
+        if (!empty($row3)) {
+            $userDao->saveAll([
+                'uid' => $row3['uid'],
+                'brokerage_price' => Db::raw("brokerage_price + {$row3['brokerage_price']}"),
+            ]);
+        }
+        $row4 = $backupUserChangeDao->getUserFourChangeFromOrderId($orderId);
+        if (!empty($row4)) {
+            $userDao->saveAll([
+                'uid' => $row4['uid'],
+                'score' => Db::raw("score + {$row4['score']}")
+            ]);
+        }
+    }
+}
+
+

app/common/repositories/store/product/ProductAttrValueChangeLogRepository.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace app\common\repositories\store\product;
+
+use app\common\repositories\BaseRepository;
+use app\common\dao\store\product\ProductAttrValueChangeLogDao;
+use app\entity\data\store\StoreProductAttrValueChangeLogEntity;
+
+class ProductAttrValueChangeLogRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * ProductAttrValueChangeLogRepository constructor.
+     * @param ProductAttrValueChangeLogDao $dao
+     */
+    public function __construct(ProductAttrValueChangeLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param StoreProductAttrValueChangeLogEntity $storeProductAttrValueChangeLogEntity
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function createByEntity(StoreProductAttrValueChangeLogEntity $storeProductAttrValueChangeLogEntity): StoreProductAttrValueChangeLogEntity
+    {
+        $result = $this->create($storeProductAttrValueChangeLogEntity->toUnderlineArray())->toArray();
+        /** @var StoreProductAttrValueChangeLogEntity $entity */
+        $entity = StoreProductAttrValueChangeLogEntity::newInstance($result);
+        return $entity;
+    }
+}

app/common/repositories/store/product/ProductAttrValueRepository.php

@@ -112,7 +112,7 @@ class ProductAttrValueRepository extends BaseRepository
         $address_id = '809';
         if($address_code_list){
             $address_id = explode(',',$address_code_list);
-            log::info($address_id);
+            // log::info($address_id);
             $address_id = end($address_id);
         }
         $sku = [[

app/common/repositories/store/product/ProductRepository.php

@@ -23,6 +23,7 @@ use app\common\repositories\user\UserVisitRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatQrcodeRepository;
 use app\controller\merchant\gong\Goods;
+use app\entity\data\store\StoreProductAttrValueChangeLogEntity;
 use app\entity\data\store\StoreProductEntity;
 use app\traits\ShouxinyiApiRequest;
 use crmeb\exceptions\ApiException;
@@ -859,7 +860,7 @@ class ProductRepository extends BaseRepository
 
         //搜索记录
         if ($userInfo && isset($where['keyword']) && !empty($where['keyword'])){
-            log::info("======sousuojilu====");
+            // log::info("======sousuojilu====");
             app()->make(UserVisitRepository::class)->searchProduct($userInfo['uid'], $where['keyword']);
         }
 
@@ -1949,23 +1950,23 @@ class ProductRepository extends BaseRepository
                 $base_commission= floatval(systemConfig('extension_tao_rate'));
                 $logs['extension_tao_rate'] = $base_commission;
                 //返佣总额 返利总额=（交易金额-手续费）*返利比例
-                log::info("计算养老金 good_id： {$good_id},yanglao ： $yanglao");
+                // log::info("计算养老金 good_id： {$good_id},yanglao ： $yanglao");
                 $yanglao=bcmul($yanglao-$souxufees,$base_commission/100,3);
-                log::info("计算养老金 good_id： {$good_id},yanglao-$souxufees 保留三位$yanglao");
+                // log::info("计算养老金 good_id： {$good_id},yanglao-$souxufees 保留三位$yanglao");
             }
             $yanglao = $yanglao * $yanglaojin_admin /100  ;//养老金比例
-            log::info("计算养老金 good_id： {$good_id},yanglao ： $yanglao");
+            // log::info("计算养老金 good_id： {$good_id},yanglao ： $yanglao");
 
             $yanglao= decimal2($yanglao);// 取两位小数 后面舍去
         }
 
-        log::info(json_encode($logs));
-        log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
+        // log::info(json_encode($logs));
+        // log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
 
         return set_price_rtrim($yanglao);
     }
 
-    public function editPrice($product_id, $skuArr, $type = 1)
+    public function editPrice($product_id, $skuArr, $type = 1, $operatorId = 0)
     {
         if (empty($skuArr))
             throw new ApiException('参数错误');
@@ -1977,6 +1978,8 @@ class ProductRepository extends BaseRepository
                 ->select()->toArray();
             $attrInfo = array_column($attrInfo, null, 'gong_sku_id');
             $updateData = [];
+            /** @var ProductAttrValueChangeLogRepository $productAttrValueChangeLogRepository */
+            $productAttrValueChangeLogRepository = app()->make(ProductAttrValueChangeLogRepository::class);
             // 组装数据
             foreach ($skuArr as $key => $value) {
                 if (isset($attrInfo[$value['sku_id']])) {
@@ -1995,7 +1998,17 @@ class ProductRepository extends BaseRepository
                             throw new ApiException('销售价格填写不正确');
                         }
                     }
-
+                    /** @var StoreProductAttrValueChangeLogEntity $storeProductAttrValueChangeLogEntity */
+                    $storeProductAttrValueChangeLogEntity = StoreProductAttrValueChangeLogEntity::newInstance();
+                    $storeProductAttrValueChangeLogEntity->setProductId($product_id)
+                        ->setSkuId($value['sku_id'])
+                        ->setCost($attrInfo[$value['sku_id']]['cost'])
+                        ->setOtPrice($attrInfo[$value['sku_id']]['ot_price'])
+                        ->setPrice($attrInfo[$value['sku_id']]['price'])
+                        ->setPlateMerProfit($attrInfo[$value['sku_id']]['plate_mer_profit'])
+                        ->setOperatorId($operatorId)
+                        ->setCreateTime(date('Y-m-d H:i:s'));
+                    $productAttrValueChangeLogRepository->createByEntity($storeProductAttrValueChangeLogEntity);
                     $updateData[] = [
                         'gong_sku_id'      => $value['sku_id'],
                         'price'            => $value['edit_price'],

app/common/repositories/system/merchant/MerchantRepository.php

@@ -416,11 +416,11 @@ class MerchantRepository extends BaseRepository
      */
     public function productList($merId, $where, $page, $limit, $userInfo,$type439=false,$is_commercetrade = 0)
     {
-        log::info("========j进入prodctList");
-        log::info($merId);
-        log::info( $where);
-        log::info($userInfo);
-        log::info($type439);
+        // log::info("========j进入prodctList");
+        // log::info($merId);
+        // log::info( $where);
+        // log::info($userInfo);
+        // log::info($type439);
         $list=app()->make(ProductRepository::class)->getApiSearch($merId, $where, $page, $limit, $userInfo,$type439);
 
         $arr=[];
@@ -429,7 +429,7 @@ class MerchantRepository extends BaseRepository
             $productMerId = $v['mer_id'] ?? 0;
 //            $v['special_merchant']= merchantConfig($v['mer_id'], 'special_merchant');
 
-            log::info("==========yang= {$k['yanglao']} ");
+            // log::info("==========yang= {$k['yanglao']} ");
 
             $v['yanglao']='';
             $v['pv']='';

app/common/repositories/user/UserRepository.php

@@ -1101,6 +1101,7 @@ class UserRepository extends BaseRepository
                 // 直推佣金
                 case 3:
                     $commission_type = 3;
+                    break;
                 // 锁客收益
                 case 6:
                     $commission_type = 7;
@@ -4622,11 +4623,13 @@ class UserRepository extends BaseRepository
      * @return void
      */
     public function sproductkeywordHistory($uid, $keyword, $type){
-        Db::name('third_history')->insert([
-            'uid' => $uid,
-            'keyword' => $keyword,
-            'type' => $type,
-        ]);
+        if (!empty($keyword)) {
+            Db::name('third_history')->insert([
+                'uid' => $uid,
+                'keyword' => $keyword,
+                'type' => $type,
+            ]);
+        }
     }
 
 

app/controller/admin/agreement/Agreement.php

@@ -42,5 +42,11 @@ class Agreement extends BaseController
         return app("json")->success($this->repository->updateData($id,$data));
     }
 
-
+    /*详情*/
+    public function  detailContent($id){
+        if ($id != 13) {
+            return '';
+        }
+        return $this->repository->getDetailContent($id);
+    }
 }

app/controller/admin/order/MerchantOfflineOrder.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace app\controller\admin\order;
+use app\common\repositories\merchant\order\OrderMerchantRepository;
+use crmeb\basic\BaseController;
+use crmeb\services\SpreadsheetExcelService;
+use think\App;
+
+class MerchantOfflineOrder extends BaseController
+{
+    /**
+     * @var OrderMerchantRepository
+     */
+    protected $repository;
+
+    /**
+     * @var int
+     */
+    protected $merId;
+
+    /**
+     * MerchantIntention constructor.
+     * @param App $app
+     * @param OrderMerchantRepository $repository
+     */
+    public function __construct(App $app, OrderMerchantRepository $repository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+        $this->merId = 0;
+    }
+    /**
+     * @return mixed
+     * 展示线下订单
+     */
+    public function lst()
+    {
+        [$page, $limit] = $this->getPage();
+        $where = $this->request->params(['keyword', 'date', 'status', 'mer_id']);
+        $is_excel = $this->request->param('is_excel', 0);
+        $data = $this->repository->getMerchantListAdmin($this->merId, $where, $page, $limit);
+        $list = $data['list'];
+        if($is_excel){
+            $arr = [];
+            foreach ($list as $item) {
+                switch ($item['status']) {
+                    case 0:
+                        $status = '待支付';
+                        break;
+                    case 1:
+                        $status = '已支付';
+                        break;
+                    case 2:
+                        $status = '申请退款';
+                        break;
+                    case 3:
+                        $status = '退款完成';
+                        break;
+                    case 5:
+                        $status = '已失效';
+                        break;
+                    default:
+                        $status = '未知';
+                        break;
+                }
+                $arr[] = [
+                    $item['id'],
+                    $item['mer_id'],
+                    $item['merchant']['mer_name'] ?? '',
+                    $item['uid'],
+                    $item['money'],
+                    $item['available'],
+                    $item['service_money'],
+                    $item['pension'],
+                    $item['swipe_fee'],
+                    $item['mer_money'],
+                    $item['mer_fanyong'],
+                    $item['actual'],
+                    $status,
+                    $item['create_time'],
+                    $item['out_trade_no']
+                ];
+            }
+            $header = [
+                'ID', '商户ID', '商户名称', '用户ID',
+                '充值金额', '可分佣总额', '服务商返利', '养老金', '刷卡手续费', '商户金额', '商户返佣', '实到金额',
+                '状态', '时间', '订单号'
+            ];
+            return app('json')->success($this->getStatisticsExcel($header, $arr, '线下订单'));
+        }
+        return app('json')->success($data);
+    }
+
+    public function getStatisticsExcel($header,$arr,$title)
+    {
+        $filename = $title.'_'.date('YmdHis').'_'.rand(10000,99999);
+        $name = $filename;
+        $info = '生成时间:' . date('Y-m-d H:i:s',time());
+        $suffix='xlsx';
+        $path='offline_order';
+        unset($_instance);
+
+        $_instance = SpreadsheetExcelService::instance_xin();
+
+        $_path =$_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile($title, $name, $info)
+            ->setExcelContent($arr)
+            ->excelSave($filename, $suffix, $path);
+
+        $domain = request()->domain();
+        $data= [
+            'name' => $filename.'.'.$suffix,
+            'status' => 1,
+            'path' => $domain.'/'.$_path
+        ];
+
+        return $data;
+    }
+}

app/controller/admin/order/Order.php

@@ -33,8 +33,10 @@ class Order extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['date','order_sn','order_type','keywords','username']);
+        $productKeywords = $this->request->param('product_keywords');//商品关键字
         $where['reconciliation_type'] = $this->request->param('status', 1);
         $where['mer_id'] = $id;
+        $where['product_keywords'] = $productKeywords;
         return app('json')->success($this->repository->adminGetList($where, $page, $limit));
     }
 
@@ -339,145 +341,26 @@ class Order extends BaseController
         $group_order_id = request()->param('group_order_id');
         $order_id = request()->param('order_id');
         $uid = request()->param('uid');
+        $adminId = $this->request->adminId();
         if (empty($order_id) || empty($group_order_id) || empty($uid)) {
             return app('json')->fail('参数缺失');
         }
-        try {
-            Db::startTrans();
-            //查找是否有推荐人
-            $spreadUid = Db::name('user')->where('uid', $uid)->value('spread_uid');
-            //取出pv
-            $pv = $this->getValue('user_pv_log', [['order_id', '=', $order_id], ['status', '=', 1],], 'pv');
-            //取出 vr
-            $payVr = $this->getValue('user_sign_vr', [['order_id', '=', $order_id], ['type', '=', 2],], 'number');
-            //取出购买赠送积分 / 支出积分
-            $score = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['status', '=', 1], ['source_type', '=', 3], ['uid', '=', $uid], ['pm', '=', 1],], 'reward_socre');
-            $payScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['status', '=', 1], ['pm', '=', 2], ['uid', '=', $uid],], 'reward_socre');
-            // 贡献值
-            $gongXian = $this->getValue('user_sign_gongxian', [['order_id', '=', $order_id], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $uid],], 'number');
-            // 养老金
-            $yangLaoJin = $this->getValue('user_bill', [['link_id', '=', $order_id], ['status', '=', 1], ['pm', '=', 1], ['uid', '=', $uid],], 'number');
-            if($spreadUid){  //如果有推荐人就执行
-                $spreadScore = 0;
-                $spreadGongXian = 0;
-                $spreadYlj = 0;
-                $spreadYongJin = 0;
-                $spreadScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['uid', '=', $spreadUid], ['status', '=', 1],], 'reward_socre');
-                $spreadGongXian = $this->getValue('user_sign_gongxian', [['order_id', '=', $order_id], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $spreadUid],], 'number');
-                $spreadYlj = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 5], ['uid', '=', $spreadUid],], 'number'); //推荐获得养老金
-                $spreadYongJin = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '=', $spreadUid],], 'number');  //推荐获得佣金
-                $spreadUser = Db::name('user')->where('uid', $spreadUid)->find();
-                Db::name('backup_user')->insert($spreadUser);  //插入备份表
-                Db::name('user')->where('uid', $spreadUid)   //更新数据
-                    ->update([
-                        'score' => Db::raw("score - {$spreadScore}"),
-                        'per_contribute' => Db::raw("per_contribute - {$spreadGongXian}"),
-                        'brokerage_price' => Db::raw("brokerage_price - {$spreadYongJin}"),
-                        'annuity' => Db::raw("annuity - {$spreadYlj}"),
-                    ]);
-                $userhjm1 =[
-                    'uid' => $spreadUid,
-                    'order_id' => $order_id,
-                    'score' => $spreadScore??0,
-                    'per_contribute' => $spreadGongXian??0,
-                    'brokerage_price' => $spreadYongJin??0,
-                    'user' => 2,
-                ];
-                Db::name('backup_user_change')->insert($userhjm1);   //插入更新数据记录表
-            }
-            //扫吗消费
-            $smSpreadUid = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['mark','like','%扫码%'], ['status', '=', 1],], 'uid');
-            $smSpreadScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['uid','=',$smSpreadUid], ['status', '=', 1],], 'reward_socre');
-            //第二推荐
-            $spreadYongJinTwoUid = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', 'not in', [$uid, $spreadUid]],], 'uid');
-            $spreadYongJinTwo = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '=', $spreadYongJinTwoUid],], 'number');
-            //更新购买用户的user表
-            $uscore = $payScore - $score;
-            $user = Db::name('user')->where('uid', $uid)->find();
-            Db::name('backup_user')->insert($user);
-            Db::name('user')->where('uid', $uid)
-                ->update([
-                    'pv'         => Db::raw("pv - {$pv}"),
-                    'vr'         => Db::raw("vr + {$payVr}"),
-                    'score'      => Db::raw("score + {$uscore}"),
-                    'contribute' => Db::raw("contribute - {$gongXian}"),
-                    'annuity'    => Db::raw("annuity - {$yangLaoJin}"),
-                ]);
-            $userhjm =[
-                'uid' => $uid,
-                'order_id' => $order_id,
-                'pv' => $pv??0,
-                'vr' => $payVr??0,
-                'score' => $uscore??0,
-                'contribute' => $gongXian??0,
-                'annuity' => $yangLaoJin??0,
-                'user' => 1,
-            ];
-            Db::name('backup_user_change')->insert($userhjm);//具体修改插入对应表
-            //第二推荐
-            if($spreadYongJinTwoUid) {
-                $spreadUserTwo = Db::name('user')->where('uid', $spreadYongJinTwoUid)->find();
-                Db::name('backup_user')->insert($spreadUserTwo);
-                Db::name('user')->where('uid', $spreadYongJinTwoUid)->dec('brokerage_price', $spreadYongJinTwo)->update();
-                $userhjm2 =[
-                    'uid' => $spreadYongJinTwoUid,
-                    'order_id' => $order_id,
-                    'brokerage_price' => $spreadYongJinTwo??0,
-                    'user' => 3,
-                ];
-                Db::name('backup_user_change')->insert($userhjm2);
-            }//扫码消费
-            if($smSpreadUid){
-                $smUserTwo = Db::name('user')->where('uid', $smSpreadUid)->find();
-                Db::name('backup_user')->insert($smUserTwo);
-                Db::name('user')->where('uid', $smSpreadUid)->dec('score', $smSpreadScore)->update();
-                $userhjm3 =[
-                    'uid' => $smSpreadUid,
-                    'order_id' => $order_id,
-                    'score' => $smSpreadScore??0,
-                    'user' => 4,
-                ];
-                Db::name('backup_user_change')->insert($userhjm3);
-            }
-            // 删除订单相关表p;
-            $this->backupAndDelete('store_order', ['group_order_id' => $group_order_id]);
-            $this->backupAndDelete('store_group_order', ['group_order_id' => $group_order_id]);
-            $this->backupAndDelete('user_pv_log', ['order_id' => $order_id]);
-            $this->backupAndDelete('user_sign_vr', ['order_id' => $order_id]);
-            $this->backupAndDelete('user_sign_score', ['order_id' => $order_id]);
-            $this->backupAndDelete('user_sign_gongxian', ['order_id' => $order_id]);
-            $this->backupAndDelete('user_bill', ['link_id' => $order_id]);
-            $this->backupAndDelete('gzc_logs', ['link_id' => $order_id]);
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-            return app('json')->fail('操作失败'. $e->getMessage());
+        if (!in_array($adminId, [1,28,29])) {//超级管理员,财务,老总
+            return app('json')->fail('后台权限不足');
         }
-        return app('json')->success('操作成功');
-    }
-
-    private function backupAndDelete($table, array $where)//备份并删除
-    {
-        $backupTable = 'backup_' . $table;
-        $rows = Db::name($table)->where($where)->select()->toArray();
-        if ($rows) {
-            Db::name($backupTable)->insertAll($rows);
-            Db::name($table)->where($where)->delete();
+        $ok = $this->repository->useKillOrderRewards($group_order_id, $order_id, $uid,$adminId);
+        if (!$ok) {
+            return app('json')->fail('操作失败');
         }
+        return app('json')->success('操作成功');
     }
-    private function getValue($table, array $where, string $field, $default = 0)//查找
-    {
-        $value = Db::name($table)->where($where)->value($field);
-        return $value ?? $default;
-    }
-
     /**
      * 展示撤回订单列表,恢复订单
      */
     public function killOrderLst()  //撤回订单的列表
     {
-        $query = Db::name('backup_store_order')->paginate(20)->toArray();
-        return app('json')->success($query, '获取成功');
+        $list = $this->repository->getKillOrderList();
+        return app('json')->success($list, '获取成功');
     }
     public function easterKillOrder(){   //恢复订单
         $group_order_id = request()->param('group_order_id');
@@ -485,99 +368,10 @@ class Order extends BaseController
         if (empty($order_id) || empty($group_order_id)) {
             return app('json')->fail('参数缺失');
         }
-        try {
-            Db::startTrans();
-            // 恢复订单相关表
-            $this->easterOrder('store_order', ['group_order_id' => $group_order_id]);
-            $this->easterOrder('store_group_order', ['group_order_id' => $group_order_id]);
-            // 恢复 pv
-            $this->easterOrder('user_pv_log', ['order_id' => $order_id]);
-            // 恢复 vr
-            $this->easterOrder('user_sign_vr', ['order_id' => $order_id]);
-            // 恢复 积分
-            $this->easterOrder('user_sign_score', ['order_id' => $order_id]);
-            // 恢复 贡献值
-            $this->easterOrder('user_sign_gongxian', ['order_id' => $order_id]);
-            // 恢复 佣金/养老金等
-            $this->easterOrder('user_bill', ['link_id' => $order_id]);
-            // 恢复 公证处
-            $this->easterOrder('gzc_logs', ['link_id' => $order_id]);
-            //恢复用户奖励
-            $this->easterUserAward(['order_id' => $order_id]);
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-            return app('json')->fail('撤回失败: '.$e->getMessage());
-        }
-        return app('json')->success('撤回成功');
-    }
-    private function easterOrder($table, array $where)  //恢复表数据
-    {
-        $backupTable = 'backup_' . $table;
-        $rows = Db::name($backupTable)->where($where)->select()->toArray();
-
-        if ($rows) {
-            foreach ($rows as &$row) {
-                if (isset($row['del_time'])) unset($row['del_time']);
-            }
-            unset($row);
-            Db::name($table)->insertAll($rows);
-            Db::name($backupTable)->where($where)->delete();
-        }
-    }
-    private function easterUserAward(array $where){  //恢复奖励
-        $row = Db::name('backup_user_change')->where($where)->where('user', 1)->field('pv, vr, score, contribute, annuity,uid')->find();
-        $uid = $row['uid'];
-        $pv   = $row['pv'];
-        $vr   = $row['vr'];
-        $score= $row['score'];
-        $contribute = $row['contribute'];
-        $annuity = $row['annuity'];
-        Db::name('user') //更新订单用户
-            ->where('uid', $uid)
-            ->update([
-                'pv'         => Db::raw("pv + {$pv}"),
-                'vr'         => Db::raw("vr - {$vr}"),
-                'score'      => Db::raw("score - {$score}"),
-                'contribute' => Db::raw("contribute + {$contribute}"),
-                'annuity'    => Db::raw("annuity + {$annuity}"),
-            ]);
-        $row2 = Db::name('backup_user_change')->where($where)->where('user', 2)->field('brokerage_price, score, per_contribute, annuity,uid')->find();
-        if ($row2) {
-            $spreadUid = $row2['uid'];
-            $spreadScore = $row2['score'];
-            $per_contribute = $row2['per_contribute'];
-            $spreadAnnuity = $row2['annuity'];
-            $spreadYongJin = $row2['brokerage_price'];
-            Db::name('user')     //更新推荐人
-            ->where('uid', $spreadUid)
-                ->update([
-                    'score' => Db::raw("score + {$spreadScore}"),
-                    'contribute' => Db::raw("contribute + {$per_contribute}"),
-                    'annuity' => Db::raw("annuity + {$spreadAnnuity}"),
-                    'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin}"),
-                    'per_contribute'=> Db::raw("per_contribute + {$per_contribute}"),
-                ]);
-        }
-        $row3 = Db::name('backup_user_change')->where($where)->where('user', 3)->field('brokerage_price,uid')->find();
-        if ($row3) {
-            $spreadUidTwo = $row3['uid']; //第二推荐人
-            $spreadYongJin2 = $row3['brokerage_price'];
-            Db::name('user')
-                ->where('uid', $spreadUidTwo)
-                ->update([
-                    'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin2}"),
-                ]);
-        }
-        $row4 = Db::name('backup_user_change')->where($where)->where('user', 4)->field('score,uid')->find();
-        if ($row4) {
-            $spreadUidThree = $row4['uid'];   //扫码
-            $spreadScore3 = $row4['score'];
-            Db::name('user')
-                ->where('uid', $spreadUidThree)
-                ->update([
-                    'score' => Db::raw("score + {$spreadScore3}"),
-                ]);
+        $ok = $this->repository->recoverOrderByAdmin($group_order_id, $order_id);
+        if (!$ok) {
+            return app('json')->fail('操作失败');
         }
+        return app('json')->success('操作成功');
     }
 }

app/controller/admin/system/sharedProsperity/SharedProsperityRecommend.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\controller\admin\system\sharedProsperity;
+
+use app\common\repositories\shared\SharedProsperityRecommendConfigRepository;
+
+class SharedProsperityRecommend
+{
+    /**
+     * @return mixed
+     * @author 史晨
+     * @date 2026/2/5 14:28
+     * 获取推荐奖励配置
+     */
+    public function list()
+    {
+        /** @var SharedProsperityRecommendConfigRepository $repository */
+        $repository = app()->make(SharedProsperityRecommendConfigRepository::class);
+        $list = $repository->getList();
+        return app('json')->success($list);
+    }
+}

app/controller/api/Auth.php

@@ -17,6 +17,8 @@ use app\common\model\user\User;
 use app\common\model\user\UserCertification;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
+use app\common\repositories\product\ShareRepository;
+use app\common\repositories\shared\SharedProsperityUserRepository;
 use app\common\repositories\store\order\StoreGroupOrderRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\order\StoreOrderStatusRepository;
@@ -27,6 +29,7 @@ use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatUserRepository;
 use app\controller\api\user\Volunteer;
 use app\controller\api\util\Signature;
+use app\entity\data\shared\SharedProsperityUserEntity;
 use app\models\routine\RoutineQrcode;
 use app\traits\GongApiRequest;
 use app\traits\GzcApiRequest;
@@ -53,6 +56,7 @@ use think\db\exception\ModelNotFoundException;
 use think\Env;
 use think\Exception;
 use think\exception\HttpResponseException;
+use think\exception\ValidateException;
 use think\facade\Cache;
 use think\facade\Db;
 use think\facade\Log;
@@ -502,13 +506,25 @@ class Auth extends BaseController
         // $repository->insterUser(16328, 14395);
 
         // return "=====";
-        $data = $this->request->params(['phone', 'sms_code', 'spread', 'password',"spread_phone","type","mer_id"]);
+        $data = $this->request->params(['phone', 'sms_code', 'spread', 'password',"spread_phone","type","mer_id", 'share_id']);
+        // $lockKey = 'lock:register:' . $data['phone'];
+        // $redis = \think\facade\Cache::store('redis')->handler();
+        // $acquired = $redis->set($lockKey, 1, ['nx', 'ex' => 15]);
+        // if (!$acquired) {
+        //     return app('json')->fail('正在注册，请稍后');
+        // }
+        $redisHandler = Cache::store('redis')->handler();
+        $isSet = $redisHandler->set('register' . '-' . $data['phone'], 1, ['nx', 'ex' => 30]);
+        if (!$isSet) {
+            return app('json')->fail('请勿重复下单');
+        }
+        try {
         $type=$data['type']??'';
         unset($data['type']);
         $validate->sceneSmslogin()->check($data);
 
         $domain = $this->request->domain();
-        if($data['sms_code'] == '6865' && strpos($domain, 'test.hebeiyhc.com') !== false) {
+        if($data['sms_code'] == '9658' && strpos($domain, 'test.hebeiyhc.com') !== false) {
             // 域名中包含 "test.hebeiyhc.com'" 字符串
         }else if (!$this->checkSmsCode($data['phone'], $data['sms_code']) ){
             return app('json')->fail('验证码不正确');
@@ -519,6 +535,17 @@ class Auth extends BaseController
         $user = $repository->accountByUser($data['phone']);
         if ($user)
             return app('json')->fail('手机号已存在');
+
+            if (!empty($data['share_id'])) {
+                /** @var ShareRepository $shareRepository */
+                $shareRepository = app()->make(ShareRepository::class);
+                $shareEntity = $shareRepository->getShareEntityByShareId($data['share_id']);
+                if (empty($shareEntity->getId())) {
+                    throw new ValidateException('无效的分享信息');
+                }
+                $data['spread'] = $shareEntity->getUid();
+            }
+
         if ($data["spread_phone"]){
             $spread_user = $repository->accountByUser($data['spread_phone']);
             if ($spread_user ){
@@ -529,6 +556,18 @@ class Auth extends BaseController
         }
         // Log::info($data);
         $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,$data['spread']);
+
+            // 注意创建完用户后 需要立马创建 共富体系 用户数据
+            /** @var SharedProsperityUserRepository $sharedProsperityUserRepository */
+            $sharedProsperityUserRepository = app()->make(SharedProsperityUserRepository::class);
+            $sharedProsperityUserEntity = $sharedProsperityUserRepository->createByEntity(
+                SharedProsperityUserEntity::newInstance()
+                    ->setUserId($user->uid)
+            );
+            if (!empty($data['spread']) && !empty($sharedProsperityUserEntity->getUserId())) {
+                $sharedProsperityUserRepository->bindParentId((int)$sharedProsperityUserEntity->getUserId(), (int)$data['spread']);
+            }
+
         // $repository->registr($data['phone'], $data['password'],'APP',$data['spread']);
         $repository->addagent($user);
         $user = $repository->mainUser($user);
@@ -574,6 +613,10 @@ class Auth extends BaseController
         $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
         return app('json')->success($result);
 
+        } finally {
+            // $redis->del($lockKey);
+        }
+
     }
 
     /**
@@ -1446,6 +1489,7 @@ class Auth extends BaseController
                 if (!$data['code'])
                     return app('json')->make(402, '操作过于频繁，请稍后重试~');
             }
+            Cache::set($sms_num_key, $num + 1, 300);
         }
         $sms_key = 'api.auth.sms.' . $data['phone'];
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
@@ -1458,11 +1502,10 @@ class Auth extends BaseController
             return app('json')->fail('操作过于频繁，请稍后重试~');
         }
 
-        log::info("sms_key==={$sms_key}" );
-        log::info("sms_code==={$sms_code}" );
-        log::info("sms_time==={$sms_time}" );
+        // log::info("sms_key==={$sms_key}" );
+        // log::info("sms_code==={$sms_code}" );
+        // log::info("sms_time==={$sms_time}" );
         Cache::set($sms_key, $sms_code,$sms_time * 60);
-        Cache::set($sms_num_key, $num + 1, 300);
         //'短信发送成功'
         return app('json')->success('短信发送成功');
     }
@@ -1572,7 +1615,7 @@ class Auth extends BaseController
         // $domain = $this->request->domain();
 
         //如果手机验证码错误并且验证码不是6865,进入查验团队验证码环节
-        if (!$this->checkSmsCode($data['phone'], $data['sms_code']) && $data['sms_code'] !== '6865') {
+        if (!$this->checkSmsCode($data['phone'], $data['sms_code']) && $data['sms_code'] !== '9658') {
             $uid= Db::name('user')->where("phone", $data["phone"])->value('uid');//通过输入的手机号查询用户的uid
             if($uid){
                 $allTeams = Db::name('user_zero_line')->field('team_uid,custom_code')->select()->toArray();//去user_zero_line表查询团队team_uid和团队自定义的验证码

app/controller/api/Common.php

@@ -393,9 +393,13 @@ class Common extends BaseController
         //安卓
         if ($data['type'] == 1) {
             $config = systemConfig(['about_edition_android', 'about_link_android', 'update_content','Android_forced_update']);
-            if ($data['about'] != $config['about_edition_android']) {
+
+            $version = str_replace('.', '', $data['about']);
+            $sysVersion = str_replace('.', '', $config['about_edition_android']);
+
+            if ($version < $sysVersion) {
                 return app('json')->success($config);
-            } else {
+            }else{
                 return app('json')->fail('已是最新版本');
             }
         }

app/controller/api/douhuomall/Take.php

@@ -24,19 +24,14 @@ class Take
 
             // 2、循环拉取 商品 数据
             $allData = [];
-            $page = 1;
-            $limit = 100;
-            $hasNextPage = true; // 是否有下一页的标志
-            while ($hasNextPage) {
-                $data = GongApiRequest::get_goods_list($page, $limit);
-                if (!$data) {
-                    break; // 如果请求失败，停止循环
-                }
+            $data = GongApiRequest::get_goods_list(1, 100);
+            if (!empty($data)) {
                 $allData = array_merge($allData, $data['list']); // 数据在list键下
-                if (!count($data['list']) || count($data['list']) < $limit) {
-                    $hasNextPage = false; // 如果没有更多页面，停止循环
-                } else {
-                    $page++; // 增加页码数
+                for ($page = $data['pages'] ?? 1; $page >= 2; $page--) {
+                    $pageData = GongApiRequest::get_goods_list($page, 100);
+                    if ($pageData && !empty($pageData['list'])) {
+                        $allData = array_merge($allData, $pageData['list']); // 数据在list键下
+                    }
                 }
             }
 
@@ -72,6 +67,9 @@ class Take
                 //sku信息处理
                 $skuInfo = $goodsInfo['sku_list'];
                 foreach ($skuInfo as $k => $v) {
+                    if (empty($v['plat_price'])) {
+                        continue;
+                    }
                     $skuInfo[$k]['img_url'] = $this->seveImg($value['goods_id'], $v['main_img'], $targetDir);//规格图片
                     $skuInfo[$k]['cost_price'] = bcadd($v['plat_price'], bcmul($v['plat_price'], 0.03, 2), 2);//成本价格 原来进价的基础上加百分之3
                     $skuInfo[$k]['market_price'] = bcadd($skuInfo[$k]['cost_price'], bcmul($skuInfo[$k]['cost_price'], 0.2, 2), 2);//销售价格  售价在成本价格的基础上加百分20
@@ -150,7 +148,7 @@ class Take
             'slider_image' => $slider_image,
         ];
         Db::name('store_product')->where('product_id', $product_id)->update($product_insert_data);
-        echo '更新产品图片数据成功' . json_encode($product_insert_data);
+        // echo '更新产品图片数据成功' . json_encode($product_insert_data);
         $detail = $spuId_info['detail'];
         if (!is_null(json_decode($detail))) {
             $detail_list = json_decode($detail);

app/controller/api/store/merchant/Merchant.php

@@ -133,7 +133,7 @@ class Merchant extends BaseController
         $where['is_used'] = 1;
         $where['product_type'] = 0;
         $where['is_hide'] = 0;
-        log::info("====={$params['mer_cate_id']}===");
+        // log::info("====={$params['mer_cate_id']}===");
         if($params['mer_cate_id']){
             $where['cate_id'] = $params['mer_cate_id'];
         }

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -4,7 +4,15 @@
 namespace app\controller\api\store\merchant;
 
 
+use app\common\enum\CommonEnum;
+use app\common\enum\dividend\DividendLogEnum;
+use app\common\repositories\dividend\DividendLogRepository;
+use app\entity\data\dividend\DividendLogEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 use think\facade\Db;
+use think\facade\Log;
 use think\Request;
 
 class TaskPartnerProfits
@@ -77,6 +85,113 @@ class TaskPartnerProfits
         return $totalPv;
     }
 
+    /**
+     * 获取周期内 所有 有效的下单人ID列表
+     * @param $startTime
+     * @param $endTime
+     * @param array $removeUserIdList
+     * @return array
+     */
+    public function getOrderUidListByTime($startTime, $endTime, array $removeUserIdList = []): array
+    {
+        $orderUidMap = [];
+        try {
+            // 本地订单
+            $storeOrder = Db::name("store_order")
+                ->where('mer_id', '<>', CommonEnum::DESIGN_MERCHANT_ID['Repurchase']['code'])
+                ->whereNotIn('uid', $removeUserIdList)
+                ->whereIn('status', [0, 1, 2, 3])
+                ->whereBetween("pay_time", [$startTime, $endTime])
+                ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
+                ->field('mer_id, status, pay_time, total_price, uid, order_id, order_sn')
+                ->select()
+                ->toArray();
+            foreach ($storeOrder as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'store_order', 'orderId' => $order['order_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $storeOrderUidList = array_column($storeOrder, 'uid');
+            // $uidList = array_merge($uidList, $storeOrderUidList);
+
+            // 话费订单 order_huafei
+            $orderHuafei = Db::name("order_huafei")
+                ->whereNotIn('uid', $removeUserIdList)
+                ->where('status', '<>', 0) // 只要不是待支付的 即算是有效活跃度
+                ->whereBetween("finish_time", [$startTime, $endTime])
+                ->field('order_huafei_id, uid, status, finish_time, amount_price, order_sn')
+                ->select()
+                ->toArray();
+            foreach ($orderHuafei as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_huafei', 'orderId' => $order['order_huafei_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderHuafeiUidList = array_column($orderHuafei, 'uid');
+            // $uidList = array_merge($uidList, $orderHuafeiUidList);
+
+            // 三方订单
+            // 京东
+            $orderJd = Db::name("order_jd")
+                ->whereNotIn('uid', $removeUserIdList)
+                ->where('status', '<>', 15) // 只要不是待支付的 即算是有效活跃度
+                ->whereBetween("create_time", [$startTime, $endTime])
+                ->field('order_jd_id, uid, status, create_time, price, order_sn')
+                ->select()
+                ->toArray();
+            foreach ($orderJd as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_jd', 'orderId' => $order['order_jd_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderJdUidList = array_column($orderJd, 'uid');
+            // $uidList = array_merge($uidList, $orderJdUidList);
+            // 淘宝
+            $orderTb = Db::name("order_tb")
+                ->whereNotIn('uid', $removeUserIdList)
+                // ->where('status', '<>', 15) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
+                ->whereBetween("create_time", [$startTime, $endTime])
+                ->field('order_tb_id, uid, tk_status, create_time, pay_price, order_sn')
+                ->select()
+                ->toArray();
+            foreach ($orderTb as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_tb', 'orderId' => $order['order_tb_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderTbUidList = array_column($orderTb, 'uid');
+            // $uidList = array_merge($uidList, $orderTbUidList);
+            // 拼多多
+            $orderPdd = Db::name("order_pdd")
+                ->whereNotIn('uid', $removeUserIdList)
+                ->where('pin_order_status', '<>', -1) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
+                ->whereBetween("group_time", [strtotime($startTime), strtotime($endTime)])
+                ->field('order_pdd_id, uid, pin_order_status, create_time, pay_money, order_sn')
+                ->select()
+                ->toArray();
+            foreach ($orderPdd as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_pdd', 'orderId' => $order['order_pdd_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderPddUidList = array_column($orderPdd, 'uid');
+            // $uidList = array_merge($uidList, $orderPddUidList);
+            // 唯品会
+            $orderVip = Db::name("order_vip")
+                ->whereNotIn('uid', $removeUserIdList)
+                ->where('status', '<>', 0) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
+                ->whereBetween("order_time", [strtotime($startTime), strtotime($endTime)])
+                ->field('order_vip_id, uid, status, order_time, pay_money, order_sn')
+                ->select()
+                ->toArray();
+            foreach ($orderVip as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_vip', 'orderId' => $order['order_vip_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderVipUidList = array_column($orderVip, 'uid');
+            // $uidList = array_merge($uidList, $orderVipUidList);
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+            Log::error('分红-获取下单用户列表失败：' . json_encode([
+                    'error_message' => $e->getMessage(),
+                    'error_file' => $e->getFile(),
+                    'error_line' => $e->getLine(),
+                    'error_code' => $e->getCode(),
+                    'exception_class' => get_class($e),
+                    'trace' => $e->getTraceAsString()
+                ], JSON_UNESCAPED_UNICODE));
+        }
+        return $orderUidMap;
+    }
+
     public function getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList = [])
     {
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
@@ -121,6 +236,7 @@ class TaskPartnerProfits
 
         $startTime = $request->param('startTime', null);
         $endTime = $request->param('endTime', null);
+        $remark = $request->param('remark', '');
         $isTest = $request->param('isTest', 1);
         $maxAllocationAmount = $request->param('maxAllocationAmount', null);
 
@@ -149,7 +265,7 @@ class TaskPartnerProfits
             try {
                 $spread_user_list = Db::query($sql);
             } catch (\Exception $exception) {
-                return json($exception->getMessage());
+                return app('json')->fail($exception->getMessage());
             }
             $removeUserIdList = array_merge(explode(",", trim($spread_user_list[0]['uids'], '$,')), $removeUserIdList);
         }
@@ -172,7 +288,7 @@ class TaskPartnerProfits
         }
 
         if ($weekRecord <= 0) {
-            return json('无效分红金额');
+            return app('json')->fail('无效分红金额');
         }
 
 
@@ -184,6 +300,19 @@ class TaskPartnerProfits
             ->select()
             ->toArray();//星级等级
 
+        // 组装日志信息
+        /** @var DividendLogEntity $dividendLogEntity */
+        $dividendLogEntity = DividendLogEntity::newInstance();
+        $dividendLogEntity->setType(DividendLogEnum::TYPE['PartnerProfit']['code'])
+            ->setStartTime($startTime)
+            ->setEndTime($endTime)
+            ->setPerformance($performance)
+            ->setAbatement(json_encode([['code' => 'redEnvelope', 'name' => '红包', 'reason' => '发放的红包金额，需要从赚取的业绩中扣除', 'number' => $redEnvelope]]))
+            ->setAllocated($weekRecord)
+            ->setRule(json_encode($starList))
+            ->setIsTest($isTest)
+            ->setRemark($remark);
+
         // 2、循环星级信息 并分组归类
         $salesArr = array_column($starList, null, 'title');
 
@@ -251,6 +380,10 @@ class TaskPartnerProfits
             //周总业绩(8400) * 合伙人级别的分佣比例(15%) = 可分红的佣金(1260)
             //            $salesArr[$key]['fs_money_nums'] = round($weekRecord * $value['profit_rate'], 2);
             $salesArr[$key]['fs_money_nums'] = floor(($weekRecord * ($value['profit_rate'] / 100)) * 100) / 100;
+
+            // 日志表 记录应分配金额
+            $dividendLogEntity->setExpected(bcadd($dividendLogEntity->getExpected() ?: '0.00', $salesArr[$key]['fs_money_nums'], 2));
+
             //可分红的业绩(分为两半，各50%，一部分是分给双联盟比例，一部分是小业绩比例)
             //把本周的业绩(8400) * 合伙人级别的分佣比例(15%) * 0.5 = 630（可分红佣金的 50%）
             //            $salesArr[$key]['fs_money'] = round($salesArr[$key]['fs_money_nums'] / 2, 2);
@@ -298,6 +431,11 @@ class TaskPartnerProfits
             }
         }
 
+        // 6、记录日志
+        // 获取周期内所有符合条件的订单
+        $orderUidMap = $this->getOrderUidListByTime($startTime, $endTime, $removeUserIdList);
+        $feeUids = array_keys($orderUidMap);
+
         // 7、执行分红
         $testRecord = [];
         foreach ($salesArr as $key => $value) {
@@ -349,16 +487,31 @@ class TaskPartnerProfits
                 //                    $testRecord['fg_fushu'][] = ['uid' => $v, 'num' => floor($allAward * 0.1 * 100) / 100, 'exist' => $user_sign_fugou_uid_list[$v]['number'] ?? 0.00, 'fg' => $fg_10];
                 //                }
 
+                if (!in_array($v, $feeUids)) {
+                    $feeWaiverUids = $dividendLogEntity->getFeeWaiverUids() ?: [];
+                    $feeWaiverUids[] = [
+                        'uid' => $v,
+                        'remark' => '周期内未完成订单任务'
+                    ];
+                    $dividendLogEntity->setFeeWaiverUids($feeWaiverUids);
+                    continue;
+                }
+                $dividendLogEntity->setArrivalPoint(bcadd($dividendLogEntity->getArrivalPoint() ?: '0.00', $allAward, 2));
+                $arrivalInfo = $dividendLogEntity->getArrivalInfo() ?: [];
+                $arrivalInfo[$v]['allAward'] = $allAward;
+                $arrivalInfo[$v]['orderInfo'] = $orderUidMap[$v];
+                $dividendLogEntity->setArrivalInfo($arrivalInfo);
+
                 if ($isTest == 0) {
                     $userdatassss = db::name("old_user_jbp")->where("id", $v)->find();
                     $datas_log = [
                         'note' => "名称:" . $userdatassss['nick_name'] . " 用户:" . $v . " 双联盟总业绩:" . $maxValueAll . " 我的双区业绩:" . $myBill . " 小区总业绩:" . $userPvSmallNum . " 我的业绩小的:" . $myMixMoney . "  可分红佣金:" . $amount . "  可分红总佣金:" . $fsMoneyNums . "  小区业绩可分红:" . $myMixMoney . " 双区业绩可分红:" . $myWeightMoney . " 实际分得:" . $yj_90,
                         'create_time' => date('Y-m-d H:i:s')
                     ];
-                    $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
+                    Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
 
                     # code...
-                    $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
+                    Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
 
                     Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
                     Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
@@ -411,7 +564,13 @@ class TaskPartnerProfits
             }
             $salesArr['cs'] = $testRecord;
         }
-        return json($salesArr);
+        $dividendLogEntity->setResult(json_encode($salesArr, JSON_UNESCAPED_UNICODE));
+
+        /** @var DividendLogRepository $dividendLogRepository */
+        $dividendLogRepository = app()->make(DividendLogRepository::class);
+        $dividendLogRepository->createByEntity($dividendLogEntity);
+
+        return app('json')->success($salesArr);
     }
 
     /**
@@ -854,4 +1013,134 @@ class TaskPartnerProfits
 
         Db::name('user_sign_fugou')->insert($bill);
     }
+
+    /**
+     * 补发分红
+     * @param Request $request
+     * @return mixed
+     */
+    public function resendUnissued(Request $request)
+    {
+        $dividendLogId = $request->param('dividendLogId', 0);
+        if (empty($dividendLogId)) {
+            return app('json')->fail('无效记录ID');
+        }
+        /** @var DividendLogRepository $dividendLogRepository */
+        $dividendLogRepository = app()->make(DividendLogRepository::class);
+        $dividendLogEntity = $dividendLogRepository->getDividendLogEntityById($dividendLogId);
+        if (empty($dividendLogEntity->getId())) {
+            return app('json')->fail('无效记录');
+        }
+
+        $dividendLogEntityByResend = DividendLogEntity::newInstance()
+            ->setType($dividendLogEntity->getType())
+            ->setStartTime($dividendLogEntity->getStartTime())
+            ->setEndTime($dividendLogEntity->getEndTime())
+            ->setPerformance($dividendLogEntity->getPerformance())
+            ->setAbatement($dividendLogEntity->getAbatement())
+            ->setAllocated($dividendLogEntity->getAllocated())
+            ->setRule($dividendLogEntity->getRule())
+            ->setExpected(bcsub($dividendLogEntity->getExpected(), $dividendLogEntity->getArrivalPoint(), 2))
+            ->setFeeWaiverUids([])
+            ->setResult($dividendLogEntity->getResult())
+            ->setIsTest(DividendLogEnum::IS_TEST['No']['code'])
+            ->setReissueId($dividendLogEntity->getId())
+            ->setRemark('补发合伙人分佣未发放部分');
+
+        $startTime = $dividendLogEntity->getStartTime();
+        $endTime = $dividendLogEntity->getEndTime();
+        $performance = $dividendLogEntity->getPerformance();
+        $weekRecord = $dividendLogEntity->getAllocated();
+        $feeWaiverUids = $dividendLogEntity->getFeeWaiverUids();
+        $feeWaiverUids = array_column($feeWaiverUids, 'uid');
+        $redEnvelope = 0.00;
+        if (!empty($dividendLogEntity->getAbatement())) {
+            $abatement = json_decode($dividendLogEntity->getAbatement(), true);
+            if (is_array($abatement)) {
+                foreach ($abatement as $item) {
+                    if ($item['code'] == 'redEnvelope') {
+                        $redEnvelope = $item['number'] ?? 0.00;
+                    }
+                }
+            }
+        }
+
+        $salesArr = $dividendLogEntity->getResult();
+        $salesArr = is_array($salesArr) ?: json_decode($salesArr, true);
+        foreach ($salesArr as $key => $value) {
+            if (empty($value)) {
+                continue;
+            }
+            if (count($value['dividerPeoplePv']) <= 0) {
+                continue;
+            }
+            $fsMoneyNums = $value['fs_money_nums'];//中级合伙人级别，可分红的总佣金
+            $maxValueAll = $value['maxValueAll'];//当前级别合伙人下面所有的双联盟业绩
+            $sumOfOthersAll = $value['sumOfOthersAll'];//当前级别合伙人下面所有的小区(业绩小的部分)总业绩
+
+            //每人分红金额
+            foreach ($value['dividerPeoplePv'] as $uid => $item) {
+
+
+                $allAward = bcadd($item['myWeightMoney'], $item['myMixMoney'], 2);
+                //90%给佣金，10给复购金
+                $yj_90 = floor($allAward * 0.9 * 100) / 100;
+                $fg_10 = floor($allAward * 0.1 * 100) / 100;
+
+                if (!in_array($uid, $feeWaiverUids)) {
+                    // $feeWaiverUids = $dividendLogEntity->getFeeWaiverUids() ?: [];
+                    // $feeWaiverUids[] = [
+                    //     'uid' => $uid,
+                    //     'remark' => '此次发放为补发，只发放上次未发放人员数据'
+                    // ];
+                    // $dividendLogEntity->setFeeWaiverUids($feeWaiverUids);
+                    continue;
+                }
+                $dividendLogEntityByResend->setArrivalPoint(bcadd($dividendLogEntityByResend->getArrivalPoint() ?: '0.00', $allAward, 2));
+                $arrivalInfo = $dividendLogEntityByResend->getArrivalInfo() ?: [];
+                $arrivalInfo[$uid]['allAward'] = $allAward;
+                $arrivalInfo[$uid]['orderInfo'] = [];
+                $dividendLogEntityByResend->setArrivalInfo($arrivalInfo);
+
+
+                # code...
+                Db::name("user")->where("uid", $uid)->inc("total_amount_old", $yj_90)->save();
+                Db::name("user")->where("uid", $uid)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+                Db::name("user")->where("uid", $uid)->inc("brokerage_price", $yj_90)->save();
+                Db::name("user")->where("uid", $uid)->inc("fugou", $fg_10)->save();
+
+                $this->change_user_log($uid, 'amount_old', 1, $yj_90, "member_award", "星级分红入账" . "-" . $value['title']);//释放佣金
+
+                // 入账记录
+                $week_data = [];
+                $week_data['user_id'] = $uid;
+                $week_data['user_group'] = $value['user_group'];
+                $week_data['start_time'] = $startTime;
+                $week_data['end_time'] = $endTime;
+                $week_data['performance'] = $performance;
+                $week_data['red_envelope'] = $redEnvelope;
+                $week_data['reality_performance'] = $weekRecord;
+                $week_data['dividend_ratio'] = $value['profit_rate'];
+                $week_data['dividend'] = $fsMoneyNums;
+                $week_data['performance_part'] = $item['sumOfOthers'] ?? '0.00';
+                $week_data['performance_part_all'] = $sumOfOthersAll;
+                $week_data['part_money'] = $item['myMixMoney'];
+                $week_data['performance_total'] = bcadd($item['maxValue'] ?? '0.00', $item['sumOfOthers'] ?? '0.00', 2);
+                $week_data['performance_total_all'] = ($maxValueAll + $sumOfOthersAll);
+                $week_data['total_money'] = $item['myWeightMoney'];
+                $week_data['brokerage'] = $yj_90;
+                $week_data['fugou'] = $fg_10;
+                $week_data['radio'] = 2;
+                $week_data['create_time'] = date('Y-m-d H:i:s');
+                Db::name("partner_profit_records")->insert($week_data);
+
+                $this->bill_user_log111111($uid, "合伙人分佣", $yj_90, "合伙人分佣明细入账（补发）", 11);//联创分佣明细2.0系统
+                $this->fugou_user_log($uid, $fg_10, 16, 1, 1);//复购金明细入账
+            }
+        }
+        /** @var DividendLogRepository $dividendLogRepository */
+        $dividendLogRepository = app()->make(DividendLogRepository::class);
+        $dividendLogRepository->createByEntity($dividendLogEntityByResend);
+        return app('json')->success($salesArr);
+    }
 }

app/controller/api/store/merchant/Taskorderguquan.php

@@ -18,52 +18,14 @@ class Taskorderguquan
     {
 
         /**
-        * 补贴下面人员
-         * 13231658486周行体300
-         * 13333069689魏   新300
-         * 13959100621周金花200
-         * 13701061395李素红200
-         * 17501006833邢艳丽100
-         * 15631982690魏震洪100
-         * 18603401312黄金花50
-         * 13521438652徐立苹200
-         * 15832971815孟晓玮100
-         * 15810064711 王   玲 100
-         * 13932925303会强100
-         * 13601071082隋彩云100
-         * 13601179856陈瑞元50
-         * 13161909228刘银霞100
-         * 18760167163刘春梅20
-         * 13215917919李小秋20
-         * 15532683963李玉芝50
-         * 13381085923王建军50
-         * 13231658486周军市场补贴400
-         * 13331043787张吉良65
-         * 15332507711 张传莲 50
-         * 18715313601大饼200
+         * 业绩25000分配
+         * 补贴下面人员
+         * 13331043787张吉良55
+         *
+         * 其余部分做分红
          */
         $data = [
-            '13231658486' => 700,
-            '13333069689' => 300,
-            '13959100621' => 200,
-            '13701061395' => 200,
-            '17501006833' => 100,
-            '15631982690' => 100,
-            '18603401312' => 50,
-            '13521438652' => 200,
-            '15832971815' => 100,
-            '15810064711' => 100,
-            '13932925303' => 100,
-            '13601071082' => 100,
-            '13601179856' => 50,
-            '13161909228' => 100,
-            '18760167163' => 20,
-            '13215917919' => 20,
-            '15532683963' => 50,
-            '13381085923' => 50,
-            '13331043787' => 65,
-            '15332507711' => 50,
-            '18715313601' => 200
+            '13331043787' => 55
         ];
 
         $result = Db::name("user")

app/controller/api/store/merchant/Taskordervr.php

@@ -47,6 +47,9 @@ class Taskordervr extends BaseController
     //接收VR和收款人信息
     public function lst4()
     {
+        if (strtotime('2026-01-29 00:00:00') < time()) {
+            return json(['code'=>400,'msg'=>'该功能已关闭!']);
+        }
 
         // return json(['code'=>400,'msg'=>'获取失败!']);
         $phone = input("post.phone");
@@ -117,7 +120,7 @@ class Taskordervr extends BaseController
             $user_res_log = Db::name("user_sign_vr")->insert( $log_data);
 
             //收款账号
-            $jieshouuser_res = Db::name("user")->where("account",$phone)->update(['vr'=>$user_data['vr'] + $vr]);
+            $jieshouuser_res = Db::name("user")->where("uid",$user_data['uid'])->update(['vr'=>$user_data['vr'] + $vr]);
 
             if( $jieshouuser_res){
 

app/controller/api/store/product/DaTaoKe.php

@@ -13,9 +13,11 @@ use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserThirdRepository;
 use app\model\common\TbOrderModel;
 use app\model\common\UserThirdModel;
+use app\utils\TimeUtil;
 use http\Exception;
 use think\facade\Db;
 use think\facade\Log;
+use think\Request;
 use function GuzzleHttp\Promise\iter_for;
 
 /**
@@ -24,9 +26,12 @@ use function GuzzleHttp\Promise\iter_for;
  */
 class DaTaoKe
 {
-    public static $appKey = '6002a6fd58162';
-    public static $appSecret = '0e4f0cdf9b1a58d763bcb956b56578da';
-    public static $pid = 'mm_1411990095_2149000369_111007900247';//推广位ID
+    // public static $appKey = '6002a6fd58162';
+    // public static $appSecret = '0e4f0cdf9b1a58d763bcb956b56578da';
+    // public static $pid = 'mm_1411990095_2149000369_111007900247';//推广位ID
+    public static $appKey = '691e84c785246';
+    public static $appSecret = '6b701ad73c7cc4c2de56a4afcb876af2';
+    public static $pid = 'mm_9436146813_3362200454_116174700455';//推广位ID
 
     //大淘客生产签名方法
     public static function makeSign($data, $appSecret)
@@ -212,48 +217,236 @@ class DaTaoKe
 
 
     //订单查询接口(20分钟一个时间段)
-    public function getOrder()
+    public function getOrder(Request $request)
     {
+        // // 立即返回响应，断开客户端连接
+        // header('Content-Length: 0');
+        // header('Connection: close');
+        // ob_end_clean();
+        // ob_start();
+        // echo 'Request accepted'; // 可选的初始响应
+        //
+        // // 获取内容长度并发送头部
+        // header('Content-Length: ' . ob_get_length());
+        // ob_end_flush();
+        // flush();
+        //
+        // // 如果是FastCGI，还需要额外的刷新
+        // if (function_exists('fastcgi_finish_request')) {
+        //     fastcgi_finish_request();
+        // }
+
+        // 从这里开始，客户端已经断开，脚本可以长时间运行
+        ignore_user_abort(true); // 忽略用户中断
+        set_time_limit(0); // 取消时间限制
+        $scene = $request->get('scene', 1);
+
         try {
-            $startTime = date("Y-m-d H:i:00", strtotime("-50 minutes"));
-            $endTime = date("Y-m-d H:i:00");
             $url = 'https://openapi.dataoke.com/api/tb-service/get-order-details';
-            $queryTypes = [1, 2, 3];//1：按照订单淘客创建时间查询，2:按照订单淘客付款时间查询，3:按照订单淘客结算时间查询
             $orders = [];
-            foreach ($queryTypes as $queryType) {
-                $queryData = [
-                    'appKey' => self::$appKey,
-                    'version' => 'v1.0.0',
-                    'queryType' => $queryType,
-                    'pageSize' => 80,
-                    'startTime' => $startTime,
-                    'endTime' => $endTime,
-                    //1:常规订单，2:渠道订单，3:会员运营订单 默认为1
-                    'orderScene' => 2,
-                ];
-                $queryData['sign'] = self::makeSign($queryData, self::$appSecret);
-                $fullUrl = "{$url}?" . http_build_query($queryData);
-                $response = self::sendCurl($fullUrl);
-                $isError = $response['data']['error_response'] ?? '';
-                if ($isError) {//查询订单出错
-                    return app('json')->fail("拉取淘宝客订单出错", $response);
-                }
-                $responseOrders = $response['data']['results']['publisher_order_dto'] ?? [];
-                if ($responseOrders) {
-                    $orders = array_merge($orders, $responseOrders);
-                }
+
+            // 场景1：实时同步最近20分钟内有更新的订单
+            $recentOrders = $this->queryRecentOrders($url);
+            $orders = array_merge($orders, $recentOrders);
+
+            // 场景2：分批次查询历史订单（避免时间范围过大） 平时只需要开场景1 场景二主要目的是 指定时间内（比如10天内） 有漏掉的订单，可以开启执行一次；注意执行一次后再给关闭，防止资源浪费
+            if ($scene == 2) {
+                $refundOrders = $this->queryOrdersByBatch($url);
+                $orders = array_merge($orders, $refundOrders);
             }
+
             if ($orders) {
-                //格式化拉取到的订单列表
-                $formatLists = self::formatOrderList($orders);
-                //创建/更新淘宝订单
+                // 去重处理
+                $uniqueOrders = $this->removeDuplicateOrders($orders);
+
+                // 格式化拉取到的订单列表
+                $formatLists = self::formatOrderList($uniqueOrders);
+                // 创建/更新淘宝订单
                 self::operateOrder($formatLists);
+
+                Log::info("订单处理完成". json_encode([
+                    '总订单数' => count($orders),
+                    '去重后订单数' => count($uniqueOrders),
+                    '处理时间' => date('Y-m-d H:i:s')
+                ], JSON_UNESCAPED_UNICODE));
+            } else {
+                Log::info("未获取到新订单");
             }
+
             return app('json')->success("拉取并处理淘宝客订单成功");
+
         } catch (\Throwable $throwable) {
-            return app('json')->fail("拉取并处理淘宝客订单出错{$throwable->getMessage()}");
+            Log::error("拉取订单异常". json_encode([
+                '错误信息' => $throwable->getMessage(),
+                '堆栈' => $throwable->getTraceAsString()
+            ], JSON_UNESCAPED_UNICODE));
+            return app('json')->fail("拉取并处理淘宝客订单出错: {$throwable->getMessage()}");
+        }
+
+        // try {
+        //     $startTime = date("Y-m-d H:i:00", strtotime("-50 minutes"));
+        //     $endTime = date("Y-m-d H:i:00");
+        //     $url = 'https://openapi.dataoke.com/api/tb-service/get-order-details';
+        //     $queryTypes = [1, 2, 3];//1：按照订单淘客创建时间查询，2:按照订单淘客付款时间查询，3:按照订单淘客结算时间查询
+        //     $orders = [];
+        //     foreach ($queryTypes as $queryType) {
+        //         $queryData = [
+        //             'appKey' => self::$appKey,
+        //             'version' => 'v1.0.0',
+        //             'queryType' => $queryType,
+        //             'pageSize' => 100,
+        //             'startTime' => $startTime,
+        //             'endTime' => $endTime,
+        //             //1:常规订单，2:渠道订单，3:会员运营订单 默认为1
+        //             'orderScene' => 2,
+        //             'tkStatus' => 3
+        //         ];
+        //         $queryData['sign'] = self::makeSign($queryData, self::$appSecret);
+        //         $fullUrl = "{$url}?" . http_build_query($queryData);
+        //         $response = self::sendCurl($fullUrl);
+        //         $isError = $response['data']['error_response'] ?? '';
+        //         if ($isError) {//查询订单出错
+        //             return app('json')->fail("拉取淘宝客订单出错", $response);
+        //         }
+        //         $responseOrders = $response['data']['results']['publisher_order_dto'] ?? [];
+        //         if ($responseOrders) {
+        //             $orders = array_merge($orders, $responseOrders);
+        //         }
+        //     }
+        //     if ($orders) {
+        //         //格式化拉取到的订单列表
+        //         $formatLists = self::formatOrderList($orders);
+        //         //创建/更新淘宝订单
+        //         self::operateOrder($formatLists);
+        //     }
+        //     return app('json')->success("拉取并处理淘宝客订单成功");
+        // } catch (\Throwable $throwable) {
+        //     return app('json')->fail("拉取并处理淘宝客订单出错{$throwable->getMessage()}");
+        // }
+
+    }
+
+    /**
+     * 查询最近20分钟内有更新的订单
+     */
+    private function queryRecentOrders($url)
+    {
+        $endTime = date("Y-m-d H:i:00");
+        $startTime = date("Y-m-d H:i:00", strtotime("-20 minutes"));
+
+        $queryData = [
+            'appKey' => self::$appKey,
+            'version' => 'v1.0.0',
+            'queryType' => 4, // 按照订单更新时间查询
+            'pageSize' => 100,
+            'startTime' => $startTime,
+            'endTime' => $endTime,
+            'orderScene' => 2,
+        ];
+
+        $queryData['sign'] = self::makeSign($queryData, self::$appSecret);
+        $fullUrl = "{$url}?" . http_build_query($queryData);
+
+        Log::info("查询最近订单". json_encode(['时间范围' => "{$startTime} 至 {$endTime}"], JSON_UNESCAPED_UNICODE));
+
+        $response = self::sendCurl($fullUrl);
+        $isError = $response['data']['error_response'] ?? '';
+
+        if ($isError) {
+            Log::error("查询最近订单错误". json_encode(['错误' => $isError], JSON_UNESCAPED_UNICODE));
+            return [];
+        }
+
+        return $response['data']['results']['publisher_order_dto'] ?? [];
+    }
+
+    /**
+     * 分批查询退款订单
+     */
+    private function queryOrdersByBatch($url): array
+    {
+        $allRefundOrders = [];
+
+        // 定义查询的时间段 大促期间 只能查20分钟的
+        $batchIntervals = TimeUtil::generateTimeIntervals(
+            date("Y-m-d H:i:00", strtotime("-10 days")), // 开始时间：10天前
+            date("Y-m-d H:i:00"),   // 结束时间 当前
+            20
+        );
+
+        foreach ($batchIntervals as $interval) {
+            $orders = $this->queryOrdersInInterval($url, $interval['start'], $interval['end']);
+            $allRefundOrders = array_merge($allRefundOrders, $orders);
+
+            // 添加延迟，避免请求过于频繁
+            usleep(500000); // 注意 这是微妙
+        }
+
+        Log::info("分批查询退款订单完成". json_encode([
+            '时间段数量' => count($batchIntervals),
+            '退款订单数' => count($allRefundOrders)
+        ], JSON_UNESCAPED_UNICODE));
+
+        return $allRefundOrders;
+    }
+
+    /**
+     * 在指定时间区间内查询退款订单
+     */
+    private function queryOrdersInInterval($url, $startTime, $endTime)
+    {
+        $queryData = [
+            'appKey' => self::$appKey,
+            'version' => 'v1.0.0',
+            'queryType' => 2, // 按照 付款时间查询
+            'pageSize' => 100,
+            'startTime' => $startTime,
+            'endTime' => $endTime,
+            'orderScene' => 2,
+            // 'tkStatus' => 13
+        ];
+
+        $queryData['sign'] = self::makeSign($queryData, self::$appSecret);
+        $fullUrl = "{$url}?" . http_build_query($queryData);
+
+        Log::debug("查询订单时间段". json_encode([
+            '开始时间' => $startTime,
+            '结束时间' => $endTime,
+            '时间差(分钟)' => round((strtotime($endTime) - strtotime($startTime)) / 60, 2)
+        ], JSON_UNESCAPED_UNICODE));
+
+        $response = self::sendCurl($fullUrl);
+        Log::debug("查询结果". json_encode($response, JSON_UNESCAPED_UNICODE));
+        $isError = $response['data']['error_response'] ?? '';
+
+        if ($isError) {
+            Log::warning("查询订单出错". json_encode([
+                '时间段' => "{$startTime} 至 {$endTime}",
+                '错误' => $isError
+            ], JSON_UNESCAPED_UNICODE));
+            return [];
+        }
+
+        return $response['data']['results']['publisher_order_dto'] ?? [];
+    }
+
+    /**
+     * 订单去重
+     */
+    private function removeDuplicateOrders($orders): array
+    {
+        $uniqueOrders = [];
+        $orderIds = [];
+
+        foreach ($orders as $order) {
+            $orderId = $order['trade_parent_id'] ?? '';
+            if ($orderId && !in_array($orderId, $orderIds)) {
+                $uniqueOrders[] = $order;
+                $orderIds[] = $orderId;
+            }
         }
 
+        return $uniqueOrders;
     }
 
     //订单查询接口(20分钟一个时间段)
@@ -365,15 +558,16 @@ class DaTaoKe
     //处理淘宝客订单
     public static function operateOrder($formatLists)
     {
+        /** @var UserThirdRepository $orderThird */
         $orderThird = app()->make(UserThirdRepository::class);
         foreach ($formatLists as $k => $order) {
-            log::info("=++++==taobaoorder=====+++");
+            // log::info("=++++==taobaoorder=====+++");
 
             if (empty($order)) continue;
             //判断数据库有无此订单
             $localOrder = TbOrderModel::getInstance()->getOne(['order_sn' => $order['order_sn']]);
-            log::info("localOrder========");
-            log::info($localOrder);
+            // log::info("localOrder========");
+            // log::info($localOrder);
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = TbOrderModel::create($order);
@@ -395,6 +589,13 @@ class DaTaoKe
                     $localOrder['order_sn'],
                     5
                 );
+                if($order['tk_status'] == 13){
+                    //修改积分和贡献,yanglaojin值记录
+                    $orderThird->updateJilu(
+                        $localOrder['uid'],
+                        $localOrder['order_tb_id'],
+                        5);
+                }
             } else {
                 if($localOrder['tk_status']!=$order['tk_status']) {
                     log::info("=============更新订单");

app/controller/api/store/product/Jd.php

@@ -115,7 +115,7 @@ class Jd extends BaseController
         if (empty($apiName)) {
             return false;
         }
-        log::info("url京东111");
+        // log::info("url京东111");
         //公共请求参数
         $requestParams = [
             'method'            => $apiName,
@@ -130,8 +130,8 @@ class Jd extends BaseController
         $sign = $this->paramSign($orderData);
         $requestParams['sign'] = $sign;
         $res = $this->apiSign($requestParams);
-        log::info("url京东end");
-        log::info($res);
+        // log::info("url京东end");
+        // log::info($res);
         return $res;
     }
 
@@ -216,7 +216,9 @@ class Jd extends BaseController
             ];
             $goods_obj = $goods_obj->whereIn('cid', $oldToNewMapping[$_cid]);
         }
+        $salt = (int)(time() / 100);
         $list = $goods_obj->page($page, $limit)
+            ->orderRaw("RAND({$salt})")
             ->select()->toArray();
 
         $formatList = [];

app/controller/api/store/product/Other.php

@@ -522,8 +522,8 @@ class Other extends BaseController
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $value['status_name'] = $this->statusName[$value['status']];
-                        if (strpos($value['goods_img'], 'http') === false){
-                            $value['goods_img'] = "http:".$value['goods_img'];
+                        if (strpos($tb_list['goods_img'], 'http') === false){
+                            $value['goods_img'] = "http:".$tb_list['goods_img'];
                         }
                         $value['yanglao'] = $yanglao;
                         $value = array_merge($value,$tb_list);

app/controller/api/store/product/TaoKe.php

@@ -184,7 +184,7 @@ class TaoKe extends BaseController
 
         $params['cat_id'] = $cat_id;
 
-        Log::info($params);
+        // Log::info($params);
 
         $apiName = 'pdd.ddk.goods.search';
         $result = $this->getUrlResult($apiName, $params);
@@ -204,7 +204,7 @@ class TaoKe extends BaseController
 
         foreach ($goodsResult as $goods) {
 
-            log::info("=======min_normal_price====={$goods['min_normal_price']}==============");
+            // log::info("=======min_normal_price====={$goods['min_normal_price']}==============");
             //var_dump($goods);
             $min_normal_price = sprintf('%.2f', $goods['min_normal_price'] / 100);
             $groupPrice = sprintf('%.2f', $goods['min_group_price'] / 100);
@@ -213,7 +213,7 @@ class TaoKe extends BaseController
             //佣金比例,千分比
             $commissionRate = $goods['promotion_rate'];
 
-            log::info("=======min_normal_price====={$groupPrice}==========={$commissionRate}===");
+            // log::info("=======min_normal_price====={$groupPrice}==========={$commissionRate}===");
             $commission = sprintf('%.2f', (($groupPrice * $commissionRate) /1000));  //佣金
             //将佣金根据用户等级转成积分
             //$userCommissionIntegral = getCommission($userLevel, $commission);
@@ -229,12 +229,12 @@ class TaoKe extends BaseController
 
 //            $pv=sprintf('%.2f',$commission* 0.5);  //PV
 //            $yanglaojin=$pv; //新的养老金
-            Log::info("养老金：".$yanglaojin);
+//             Log::info("养老金：".$yanglaojin);
             // if($yanglaojin < 0.1) {
             //     continue;
             // }
 
-            
+
             try {
                 $current_goods= [
                     'type' => 1,//拼多多商品
@@ -243,13 +243,13 @@ class TaoKe extends BaseController
                     'name' => $goods['goods_name'],
                     'commission' => $yanglaojin, //养老金  //app()->make(ProductRepository::class)->thirdYanglaojin(0, $commission),
                     'commission_' => $commission,
-    
+
                     'yanglaojin' => $yanglaojin,
                     'pv' => $pv,
                     'gongxian'=>$pv,
                     'jifen'=>$pv,
-                    
-    
+
+
                     'commission_rate' => $commissionRate,
                     'sales' => $goods['sales_tip'],
                     //'desc' => $goods['goods_desc'],
@@ -257,12 +257,12 @@ class TaoKe extends BaseController
                     //'market_price' => $groupPrice,
                     'market_price' => set_price_rtrim(sprintf('%.2f', $min_normal_price - $couponMoney)),
                     'price' => set_price_rtrim(sprintf('%.2f', $groupPrice - $couponMoney)),
-    
+
                     'shopName'=>$goods['mall_name'], //店铺名称
                     'monthSales'=>$goods['sales_tip']>0?$goods['sales_tip']:mt_rand(100,10000), //月销量
                     'cat_ids'=>$goods['cat_ids']
                 ];
-                Log::info($current_goods);
+                // Log::info($current_goods);
                 $goodsList[] =$current_goods;
                 $cid=isset($goods['cat_ids'][0])?$goods['cat_ids'][0]:0;
                 // Db::name("third_party_goods")->insert([
@@ -274,10 +274,10 @@ class TaoKe extends BaseController
             } catch (\Throwable $th) {
                 Log::error($th->getMessage());
             }
-            
+
 
         }
-        
+
         shuffle($goodsList);
         $uid = $uid ?? 0;
         $repository->sproductkeywordHistory($uid, $keyword, 3);
@@ -404,7 +404,7 @@ class TaoKe extends BaseController
 
     //获取多多进宝商品详情
     public function pdd_detail()
-    {       
+    {
         $goodsId = $this->request->param('goodsId');
         try{
             $uid = $this->request->uid();
@@ -412,10 +412,10 @@ class TaoKe extends BaseController
             $uid=0;
         }
 
-        log::info("===doGetPinDetail==={$goodsId}+======{$uid}");
+        // log::info("===doGetPinDetail==={$goodsId}+======{$uid}");
         //获取商品详情
         $result = $this->doGetPinDetail($goodsId, $uid);
-        log::info("===doGetPinDetail=={$uid}");
+        // log::info("===doGetPinDetail=={$uid}");
 //        log::info($result);
         $log = [
             'flag' => '拼多多详情',
@@ -450,7 +450,7 @@ class TaoKe extends BaseController
 
         $apiName = 'pdd.ddk.goods.detail';
         $result = $this->getUrlResult($apiName, $params);
-        Log::info($result);
+        // Log::info($result);
         if(isset($result['error_response']['error_code']) && $result['error_response']['error_code']==50001)
             return ['code' => 2, 'data' => '该商品已下架或不存在~'];
         $response = $result['goods_detail_response']['goods_details'] ?? [];
@@ -462,14 +462,14 @@ class TaoKe extends BaseController
         // $detail['yanglao'] = app()->make(ProductRepository::class)
         //     ->thirdYanglaojin(0, sprintf('%.2f', $commission));
 
-        log::info("commission==={$commission}");
+        // log::info("commission==={$commission}");
         $systemvalueObj= $goods_obj = Db::name('system_config_value')
             -> where('config_key','sanfangfenpei')->find();;
         $sanfangfenpei=json_decode($systemvalueObj['value'],true);
         $ppv=$commission*$sanfangfenpei['pv'];
         $pv3=round($ppv,3);  //PV
         $pv=round($ppv,2);  //PV
-        log::info("pv==={$pv}===========ppv3={$pv3}");
+        // log::info("pv==={$pv}===========ppv3={$pv3}");
         $yanglaojin=round($commission*$sanfangfenpei['yanglaojin'],2); //新的养老金
 
 
@@ -477,7 +477,7 @@ class TaoKe extends BaseController
 
 //            $pv=sprintf('%.2f', $commission *0.5);  //PV
 //            $yanglaojin=$pv; //新的养老金
-        
+
         $gongxian=$pv;
         $jifen=$pv;
         $detail['yanglaojin'] =$yanglaojin;
@@ -559,7 +559,7 @@ class TaoKe extends BaseController
             //mobile_short_url-唤醒拼多多app的推广短链接
             //we_app_web_view_short_url-唤起微信app推广短链接
             //short_url-web推广短链接
-            $shortUrl = $result['mobile_short_url'];
+            $shortUrl = $result['mobile_short_url'] ?? '';
             $wxUrl = $result['we_app_web_view_short_url'] ?? '';
             $url['mobile_url'] = $shortUrl;
             $url['url'] = $shortUrl;
@@ -901,12 +901,12 @@ class TaoKe extends BaseController
             if (empty($order)) continue;
             //判断数据库有无此订单
             $type_shop = 1;
-            log::info("pddsnsnsn==={$order['order_sn']}");
+            // log::info("pddsnsnsn==={$order['order_sn']}");
             $localOrder = PddOrderModel::getInstance()->getOne(['order_sn' => $order['order_sn']]);
-            log::info("localOrder========");
-            log::info($localOrder);
-            log::info("pddorder===");
-            log::info($localOrder);
+            // log::info("localOrder========");
+            // log::info($localOrder);
+            // log::info("pddorder===");
+            // log::info($localOrder);
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = PddOrderModel::create($order);

app/controller/api/store/product/Vip.php

@@ -308,11 +308,13 @@ class Vip extends BaseController
         if($_cid){
             $goods_obj=$goods_obj->where('cid', $_cid);
         }
+        $salt = (int)(time() / 100);
         $data=$goods_obj->page($page, $limit)
+            ->orderRaw("RAND({$salt})")
             ->select()->toArray();
 
-        Log::info("vip=================");
-        log::info($data);
+        // Log::info("vip=================");
+        // log::info($data);
 
         // 获取列表数据
         // $data = Db::name('third_party_goods')->where('type', 5)->page($page, $limit)->select()->toArray();
@@ -543,7 +545,7 @@ class Vip extends BaseController
             'realCall' => 'true',
         ];
 
-        log::info($requestIn);
+        // log::info($requestIn);
         $params['request'] = $requestIn;
         $result = $this->getUrlResult($apiName, "getByGoodsIds", $params);
 //        log::info($result);
@@ -761,8 +763,8 @@ class Vip extends BaseController
                     "{$value}TimeStart" => $startTime,
                     "{$value}TimeEnd" => $endTime,
                 ];
-                log::info("====VIP 订单===");
-                log::info($params);
+                // log::info("====VIP 订单===");
+                // log::info($params);
 
                 $result = $this->doOrderVip($params);
                 $result && $orderList[] = $result;
@@ -809,8 +811,8 @@ class Vip extends BaseController
         do {
             $request = ['queryModel' => $queryModel];
             $result = $this->getUrlResult($apiName, "orderList", $request, '2.0.0');
-            log::info("vip===返回订单数据");
-            log::info($result);
+            // log::info("vip===返回订单数据");
+            // log::info($result);
             $lists = $result['result']['orderInfoList'] ?? [];
             $countList = count($lists);
             if (!empty($countList)) {

app/controller/api/store/service/Huafei.php

@@ -162,6 +162,7 @@ class Huafei extends BaseController
 
     //充值话费推送
     public function recharge(){
+        return app('json')->fail('系统维护中');
 		$uid = $this->request->uid();
 		$params = $this->request->params(['phone', 'money']);
 		if(!$params['phone']) return app('json')->fail('请提交电话号码');

app/controller/api/user/User.php

@@ -200,14 +200,14 @@ class User extends BaseController
 
     // 红包
     public function  hongbao_info(){
-        log::info("============hongbao");
+        // log::info("============hongbao");
         $user = $this->request->userInfo();
         if($user->uid>0){
             // 已经入账红包
             $data['total_source']=$user->hongbao;
             // 为生效红包
             $data['no_total_source']=Db::name('user_sign_hongbao')->where('status', -1)->where('uid', $user->uid)->sum('number');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
 
         }
@@ -408,7 +408,7 @@ class User extends BaseController
 
             // 未生效贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
         }
 
@@ -481,7 +481,7 @@ class User extends BaseController
             $data['total_source'] = $user->jingdou;// 临时使用
             // 为生效京豆
             $data['no_total_source']=Db::name('user_sign_jingdou')->where('status', -1)->where('uid', $user->uid)->sum('number');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
 
             return app('json')->success($data);
 
@@ -530,7 +530,7 @@ class User extends BaseController
             $data['total_source']=$user->fugou;
             // 为生效京豆
             $data['no_total_source']=Db::name('user_sign_fugou')->where('status', -1)->where('uid', $user->uid)->sum('number');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
 
         }
@@ -577,7 +577,7 @@ class User extends BaseController
             // 为生效京豆
             $data['no_total_source']=0;
             //$data['no_total_source']=Db::name('user_sign_vr')->where('status', -1)->where('uid', $user->uid)->sum('number');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
 
         }
@@ -618,7 +618,7 @@ class User extends BaseController
             $data['total_source']=$user->score;
             // 为生效积分
             $data['no_total_source']=Db::name('user_sign_score')->where('status', -1)->where('uid', $user->uid)->sum('reward_socre');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
 
         }

app/controller/merchant/gong/Goods.php

@@ -253,7 +253,13 @@ class Goods extends BaseController
             $spuId_info = json_decode($data['spuId_info'], true);
             $slider_image = $spuId_info['detail_img_list'] ?? '';
             $image = $spuId_info['cover_url'] ?? '';
-            $slider_image = empty($slider_image) ? $image : implode(',', json_decode($slider_image, true));
+            if (empty($slider_image)) {
+                $slider_image = $image;
+            } else if (is_string($slider_image)) {
+                $slider_image = implode(',', json_decode($slider_image, true));
+            } else if (is_array($slider_image)) {
+                $slider_image = implode(',', $slider_image);
+            }
             $yanglaojin_scale = (!empty($data['pension']) && !empty($data['market_price'])) ? bcdiv($data['pension'], $data['market_price'], 2) : 0;
 
             // 4、商品入库数据

app/controller/merchant/store/product/Product.php

@@ -78,11 +78,12 @@ class Product extends BaseController
     {
         $skuArr = $this->request->param('skuArr', []);
         $type = $this->request->param('type');
+        $merchant_admin_id = $this->request->adminInfo()?$this->request->adminInfo()->merchant_admin_id:0;
 
         if (empty($skuArr) ||  !is_array($skuArr)) {
             return app('json')->fail('参数错误');
         }
-        $this->repository->editPrice($id, $skuArr, $type);
+        $this->repository->editPrice($id, $skuArr, $type, $merchant_admin_id);
         return app('json')->success("修改成功");
     }
 
@@ -90,7 +91,7 @@ class Product extends BaseController
     // 供应链商品删除
     public function deleteXp($id) {
         if (empty($id)) return app('json')->fail('请选择商品');
-        $this->repository->changeDelete($id,);
+        $this->repository->changeDelete($id);
         return app('json')->success('删除成功');
     }
 

app/entity/data/dividend/DividendLogEntity.php

@@ -0,0 +1,344 @@
+<?php
+
+namespace app\entity\data\dividend;
+
+use app\entity\data\DataEntity;
+
+class DividendLogEntity extends DataEntity
+{
+    public $id = null;  // 主键
+    public $type = null;  // 分润类型：1合伙人分红；2联创分红；3股权分红；4佣金补贴
+    public $startTime = null;  // 分润周期开始时间
+    public $endTime = null;  // 分润周期结束时间
+    public $performance = null;  // 业绩
+    public $abatement = null;  // 扣减项（原因）
+    public $allocated = null;  // 实际分配业绩
+    public $rule = null;  // 分配规则
+    public $expected = null;
+    public $feeWaiverUids = null;  // 免分配人员ID集合（可能由于业绩不达标）
+    public $arrivalPoint = null;  // 到账金额
+    public $arrivalInfo = null;  // 到账金额
+    public $result = null;  // 实际分配结果
+    public $isTest = null;  // 是否为测试数据
+    public $remark = null;  // 备注
+    public $createTime = null;  // 创建时间
+    public $reissueId = null;  // 补发ID
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return DividendLogEntity
+     */
+    public function setId($id): DividendLogEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param mixed $type
+     * @return DividendLogEntity
+     */
+    public function setType($type): DividendLogEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getStartTime()
+    {
+        return $this->startTime;
+    }
+
+    /**
+     * @param mixed $startTime
+     * @return DividendLogEntity
+     */
+    public function setStartTime($startTime): DividendLogEntity
+    {
+        $this->startTime = $startTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEndTime()
+    {
+        return $this->endTime;
+    }
+
+    /**
+     * @param mixed $endTime
+     * @return DividendLogEntity
+     */
+    public function setEndTime($endTime): DividendLogEntity
+    {
+        $this->endTime = $endTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPerformance()
+    {
+        return $this->performance;
+    }
+
+    /**
+     * @param mixed $performance
+     * @return DividendLogEntity
+     */
+    public function setPerformance($performance): DividendLogEntity
+    {
+        $this->performance = $performance;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAbatement()
+    {
+        return $this->abatement;
+    }
+
+    /**
+     * @param mixed $abatement
+     * @return DividendLogEntity
+     */
+    public function setAbatement($abatement): DividendLogEntity
+    {
+        $this->abatement = $abatement;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAllocated()
+    {
+        return $this->allocated;
+    }
+
+    /**
+     * @param mixed $allocated
+     * @return DividendLogEntity
+     */
+    public function setAllocated($allocated): DividendLogEntity
+    {
+        $this->allocated = $allocated;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRule()
+    {
+        return $this->rule;
+    }
+
+    /**
+     * @param mixed $rule
+     * @return DividendLogEntity
+     */
+    public function setRule($rule): DividendLogEntity
+    {
+        $this->rule = $rule;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getExpected()
+    {
+        return $this->expected;
+    }
+
+    /**
+     * @param mixed $expected
+     * @return DividendLogEntity
+     */
+    public function setExpected($expected): DividendLogEntity
+    {
+        $this->expected = $expected;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getFeeWaiverUids()
+    {
+        if (is_string($this->feeWaiverUids)) {
+            return json_decode($this->feeWaiverUids, true);
+        }
+        return $this->feeWaiverUids;
+    }
+
+    /**
+     * @param mixed $feeWaiverUids
+     * @return DividendLogEntity
+     */
+    public function setFeeWaiverUids($feeWaiverUids): DividendLogEntity
+    {
+        if (is_array($feeWaiverUids)) {
+            $feeWaiverUids = json_encode($feeWaiverUids);
+        }
+        $this->feeWaiverUids = $feeWaiverUids;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getArrivalPoint()
+    {
+        return $this->arrivalPoint;
+    }
+
+    /**
+     * @param mixed $arrivalPoint
+     * @return DividendLogEntity
+     */
+    public function setArrivalPoint($arrivalPoint): DividendLogEntity
+    {
+        $this->arrivalPoint = $arrivalPoint;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getArrivalInfo()
+    {
+        if (is_string($this->arrivalInfo)) {
+            return json_decode($this->arrivalInfo, true);
+        }
+        return $this->arrivalInfo;
+    }
+
+    /**
+     * @param mixed $arrivalInfo
+     * @return DividendLogEntity
+     */
+    public function setArrivalInfo($arrivalInfo): DividendLogEntity
+    {
+        if (is_array($arrivalInfo)) {
+            $arrivalInfo = json_encode($arrivalInfo);
+        }
+        $this->arrivalInfo = $arrivalInfo;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
+
+    /**
+     * @param mixed $result
+     * @return DividendLogEntity
+     */
+    public function setResult($result): DividendLogEntity
+    {
+        $this->result = $result;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getIsTest()
+    {
+        return $this->isTest;
+    }
+
+    /**
+     * @param mixed $isTest
+     * @return DividendLogEntity
+     */
+    public function setIsTest($isTest): DividendLogEntity
+    {
+        $this->isTest = $isTest;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRemark()
+    {
+        return $this->remark;
+    }
+
+    /**
+     * @param mixed $remark
+     * @return DividendLogEntity
+     */
+    public function setRemark($remark): DividendLogEntity
+    {
+        $this->remark = $remark;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return DividendLogEntity
+     */
+    public function setCreateTime($createTime): DividendLogEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getReissueId()
+    {
+        return $this->reissueId;
+    }
+
+    /**
+     * @param mixed $reissueId
+     * @return DividendLogEntity
+     */
+    public function setReissueId($reissueId): DividendLogEntity
+    {
+        $this->reissueId = $reissueId;
+        return $this;
+    }
+}

app/entity/data/douhuomall/DouhuomallChangeLogEntity.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace app\entity\data\douhuomall;
+
+use app\entity\data\DataEntity;
+
+class DouhuomallChangeLogEntity extends DataEntity
+{
+    public $id = null;  // 主键ID
+    public $spuId = null;  // spuID
+    public $dataJson = null;  // 历史数据信息
+    public $effectProductJson = null;  // 供应链sku_id
+    public $createTime = null;  // 记录时间
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setId($id): DouhuomallChangeLogEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSpuId()
+    {
+        return $this->spuId;
+    }
+
+    /**
+     * @param mixed $spuId
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setSpuId($spuId): DouhuomallChangeLogEntity
+    {
+        $this->spuId = $spuId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getDataJson()
+    {
+        return $this->dataJson;
+    }
+
+    /**
+     * @param mixed $dataJson
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setDataJson($dataJson): DouhuomallChangeLogEntity
+    {
+        if (is_array($dataJson)) {
+            $dataJson = json_encode($dataJson, JSON_UNESCAPED_UNICODE);
+        }
+        $this->dataJson = $dataJson;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEffectProductJson()
+    {
+        return $this->effectProductJson;
+    }
+
+    /**
+     * @param mixed $effectProductJson
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setEffectProductJson($effectProductJson): DouhuomallChangeLogEntity
+    {
+        if (is_array($effectProductJson)) {
+            $effectProductJson = json_encode($effectProductJson, JSON_UNESCAPED_UNICODE);
+        }
+        $this->effectProductJson = $effectProductJson;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setCreateTime($createTime): DouhuomallChangeLogEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+}

app/entity/data/shared/SharedProsperityRecommendConfigEntity.php

@@ -0,0 +1,158 @@
+<?php
+
+namespace app\entity\data\shared;
+
+use app\entity\data\DataEntity;
+
+class SharedProsperityRecommendConfigEntity extends DataEntity
+{
+    public $id = null;  // 主键
+    public $level = null;  // 等级
+    public $name = null;  // 描述
+    public $rewardRatio = null;  // 推荐奖励占比
+    public $profitRatio = null;  // 分红奖励占比
+    public $pv = null;  // 业绩
+    public $createTime = null;  // 创建时间
+    public $updateTime = null;  // 更新时间
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function setId($id): SharedProsperityRecommendConfigEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getLevel()
+    {
+        return $this->level;
+    }
+
+    /**
+     * @param mixed $level
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function setLevel($level): SharedProsperityRecommendConfigEntity
+    {
+        $this->level = $level;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param mixed $name
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function setName($name): SharedProsperityRecommendConfigEntity
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRewardRatio()
+    {
+        return $this->rewardRatio;
+    }
+
+    public function getProfitRatio()
+    {
+        return $this->profitRatio;
+    }
+
+    /**
+     * @param mixed $rewardRatio
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function setRewardRatio($rewardRatio): SharedProsperityRecommendConfigEntity
+    {
+        $this->rewardRatio = $rewardRatio;
+        return $this;
+    }
+
+    /**
+     * @param mixed $profitRatio
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function setProfitRatio($profitRatio): SharedProsperityRecommendConfigEntity
+    {
+        $this->profitRatio = $profitRatio;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPv()
+    {
+        return $this->pv;
+    }
+
+    /**
+     * @param mixed $pv
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function setPv($pv): SharedProsperityRecommendConfigEntity
+    {
+        $this->pv = $pv;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function setCreateTime($createTime): SharedProsperityRecommendConfigEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUpdateTime()
+    {
+        return $this->updateTime;
+    }
+
+    /**
+     * @param mixed $updateTime
+     * @return SharedProsperityRecommendConfigEntity
+     */
+    public function setUpdateTime($updateTime): SharedProsperityRecommendConfigEntity
+    {
+        $this->updateTime = $updateTime;
+        return $this;
+    }
+}

app/entity/data/shared/SharedProsperityUserEntity.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace app\entity\data\shared;
+
+use app\entity\data\DataEntity;
+
+class SharedProsperityUserEntity extends DataEntity
+{
+    public $id = null;  // 主键
+    public $userId = null;  // 用户id
+    public $parentId = null;  // 推荐人用户id
+    public $pv = null;  // pv
+    public $teamPv = null;  // 团队pv
+    public $withdrawalLimit = null;  // 提现额度
+    public $partnerLevel = null;  // 合伙人等级
+    public $createTime = null;  // 创建时间
+    public $updateTime = null;  // 更新时间
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return SharedProsperityUserEntity
+     */
+    public function setId($id): SharedProsperityUserEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUserId()
+    {
+        return $this->userId;
+    }
+
+    /**
+     * @param mixed $userId
+     * @return SharedProsperityUserEntity
+     */
+    public function setUserId($userId): SharedProsperityUserEntity
+    {
+        $this->userId = $userId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getParentId()
+    {
+        return $this->parentId;
+    }
+
+    /**
+     * @param mixed $parentId
+     * @return SharedProsperityUserEntity
+     */
+    public function setParentId($parentId): SharedProsperityUserEntity
+    {
+        $this->parentId = $parentId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPv()
+    {
+        return $this->pv;
+    }
+
+    /**
+     * @param mixed $pv
+     * @return SharedProsperityUserEntity
+     */
+    public function setPv($pv): SharedProsperityUserEntity
+    {
+        $this->pv = $pv;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getTeamPv()
+    {
+        return $this->teamPv;
+    }
+
+    /**
+     * @param mixed $teamPv
+     * @return SharedProsperityUserEntity
+     */
+    public function setTeamPv($teamPv): SharedProsperityUserEntity
+    {
+        $this->teamPv = $teamPv;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getWithdrawalLimit()
+    {
+        return $this->withdrawalLimit;
+    }
+
+    /**
+     * @param mixed $withdrawalLimit
+     * @return SharedProsperityUserEntity
+     */
+    public function setWithdrawalLimit($withdrawalLimit): SharedProsperityUserEntity
+    {
+        $this->withdrawalLimit = $withdrawalLimit;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPartnerLevel()
+    {
+        return $this->partnerLevel;
+    }
+
+    /**
+     * @param mixed $partnerLevel
+     * @return SharedProsperityUserEntity
+     */
+    public function setPartnerLevel($partnerLevel): SharedProsperityUserEntity
+    {
+        $this->partnerLevel = $partnerLevel;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return SharedProsperityUserEntity
+     */
+    public function setCreateTime($createTime): SharedProsperityUserEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUpdateTime()
+    {
+        return $this->updateTime;
+    }
+
+    /**
+     * @param mixed $updateTime
+     * @return SharedProsperityUserEntity
+     */
+    public function setUpdateTime($updateTime): SharedProsperityUserEntity
+    {
+        $this->updateTime = $updateTime;
+        return $this;
+    }
+}

app/entity/data/store/StoreProductAttrValueChangeLogEntity.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace app\entity\data\store;
+
+use app\entity\data\DataEntity;
+
+class StoreProductAttrValueChangeLogEntity extends DataEntity
+{
+    public $id = null;  // 主键ID
+    public $productId = null;  // 商品ID
+    public $skuId = null;  // 供应链sku_id
+    public $cost = null;  // 成本价
+    public $otPrice = null;  // 原价
+    public $price = null;  // 价格
+    public $plateMerProfit = null;  // 商户创客利润
+    public $operatorId = null;  // 操作人ID
+    public $createTime = null;  // 记录时间
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setId($id): StoreProductAttrValueChangeLogEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getProductId()
+    {
+        return $this->productId;
+    }
+
+    /**
+     * @param mixed $productId
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setProductId($productId): StoreProductAttrValueChangeLogEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSkuId()
+    {
+        return $this->skuId;
+    }
+
+    /**
+     * @param mixed $skuId
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setSkuId($skuId): StoreProductAttrValueChangeLogEntity
+    {
+        $this->skuId = $skuId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCost()
+    {
+        return $this->cost;
+    }
+
+    /**
+     * @param mixed $cost
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setCost($cost): StoreProductAttrValueChangeLogEntity
+    {
+        $this->cost = $cost;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getOtPrice()
+    {
+        return $this->otPrice;
+    }
+
+    /**
+     * @param mixed $otPrice
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setOtPrice($otPrice): StoreProductAttrValueChangeLogEntity
+    {
+        $this->otPrice = $otPrice;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPrice()
+    {
+        return $this->price;
+    }
+
+    /**
+     * @param mixed $price
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setPrice($price): StoreProductAttrValueChangeLogEntity
+    {
+        $this->price = $price;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPlateMerProfit()
+    {
+        return $this->plateMerProfit;
+    }
+
+    /**
+     * @param mixed $plateMerProfit
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setPlateMerProfit($plateMerProfit): StoreProductAttrValueChangeLogEntity
+    {
+        $this->plateMerProfit = $plateMerProfit;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getOperatorId()
+    {
+        return $this->operatorId;
+    }
+
+    /**
+     * @param mixed $operatorId
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setOperatorId($operatorId): StoreProductAttrValueChangeLogEntity
+    {
+        $this->operatorId = $operatorId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setCreateTime($createTime): StoreProductAttrValueChangeLogEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+}

app/event.php

@@ -19,7 +19,7 @@ return [
             \crmeb\listens\AutoUnLockBrokerageListen::class,//自动解冻佣金
             \crmeb\listens\AutoSendPayOrderSmsListen::class,//查询10分钟内未支付的订单，发送短信提示用户
             \crmeb\listens\SyncSmsResultCodeListen::class,//查询短信发送记录后 api返回结果
-            \crmeb\listens\SyncBroadcastStatusListen::class,
+            // \crmeb\listens\SyncBroadcastStatusListen::class,
             \crmeb\listens\ExcelFileDelListen::class,
 //            \crmeb\listens\RefundOrderAgreeListen::class,//商户自动处理退款订单期限（天）
             \crmeb\listens\SeckillTImeCheckListen::class,//自动检测秒杀结束失败

app/middleware.php

@@ -3,7 +3,9 @@
 return [
     // 接口请求记录中间件
     \app\middleware\ApiRequestLogMiddleware::class,
-    
+    // 安全中间件 防注入
+    \app\middleware\SecurityMiddleware::class,
+
     // 全局请求缓存
     // \think\middleware\CheckRequestCache::class,
     // 多语言加载

app/middleware/SecurityMiddleware.php

@@ -0,0 +1,509 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\middleware;
+
+use think\facade\Db;
+use think\facade\Log;
+use think\facade\Cache;
+use think\Request;
+use think\Response;
+
+/**
+ * 安全防护中间件
+ */
+class SecurityMiddleware
+{
+    // 配置参数
+    protected $config = [
+        'enable_logging' => true,        // 是否记录攻击日志
+        'enable_blocking' => true,       // 是否自动封禁攻击IP
+        'max_param_length' => 500,       // 参数最大长度（超过部分截断）
+        'max_logs_per_ip' => 100,        // 单个IP最大攻击记录数
+        'block_duration' => 86400,       // 封禁时长（秒），默认24小时
+        'attack_threshold' => 10,        // 攻击阈值（超过此次数自动封禁）
+    ];
+
+    /**
+     * 处理请求
+     */
+    public function handle(Request $request, \Closure $next)
+    {
+        // 检查IP是否已被封禁
+        if ($this->isIpBlocked($request->ip())) {
+            $this->logBlockedAccess($request);
+            return $this->blockResponse();
+        }
+
+        // 安全检查
+        $attackDetected = $this->checkSecurity($request);
+
+        if ($attackDetected) {
+            // 记录攻击并可能封禁IP
+            $this->handleAttack($request, $attackDetected);
+
+            // 返回通用错误，不泄露信息
+            return $this->errorResponse();
+        }
+
+        return $next($request);
+    }
+
+    /**
+     * 安全检查
+     */
+    protected function checkSecurity(Request $request): array
+    {
+        $attacks = [];
+
+        // 检查GET参数
+        foreach ($request->get() as $key => $value) {
+            if ($this->detectAttack($value, $key)) {
+                $attacks[] = [
+                    'type' => $this->detectAttackType($value),
+                    'param' => $key,
+                    'value' => $value
+                ];
+            }
+        }
+
+        // 检查POST参数
+        foreach ($request->post() as $key => $value) {
+            if ($this->detectAttack($value, $key)) {
+                $attacks[] = [
+                    'type' => $this->detectAttackType($value),
+                    'param' => $key,
+                    'value' => $value
+                ];
+            }
+        }
+
+        // 检查请求头（可选）
+        if ($this->checkHeaders($request)) {
+            $attacks[] = [
+                'type' => 'header_injection',
+                'param' => 'headers',
+                'value' => json_encode($request->header(), JSON_UNESCAPED_UNICODE)
+            ];
+        }
+
+        return $attacks;
+    }
+
+    /**
+     * 检测攻击
+     */
+    protected function detectAttack($value, $key): bool
+    {
+        if (!is_string($value)) {
+            return false;
+        }
+
+        // 检查SQL注入
+        if ($this->detectSqlInjection($value)) {
+            return true;
+        }
+
+        // 检查XSS攻击
+        if ($this->detectXss($value)) {
+            return true;
+        }
+
+        // 检查命令注入
+        if ($this->detectCommandInjection($value)) {
+            return true;
+        }
+
+        // 检查路径遍历
+        if ($this->detectPathTraversal($value)) {
+            return true;
+        }
+
+        // 检查文件包含
+        if ($this->detectFileInclusion($value)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 检测SQL注入
+     */
+    protected function detectSqlInjection(string $input): bool
+    {
+        $patterns = [
+            // Union注入
+            '/union\s+(all\s+)?select/i',
+
+            // 注释符
+            '/--\s+|\/\*.*?\*\//s',
+
+            // 延时注入
+            '/sleep\s*\(\s*\d+\s*\)/i',
+            '/benchmark\s*\(.*?\)/i',
+            '/waitfor\s+delay/i',
+
+            // 条件语句
+            '/or\s+[\'"]?[\d\w][\'"]?\s*=\s*[\'"]?[\d\w][\'"]?/i',
+            '/and\s+[\'"]?[\d\w][\'"]?\s*=\s*[\'"]?[\d\w][\'"]?/i',
+
+            // 堆叠查询
+            '/;\s*(select|insert|update|delete|drop|create|alter|exec)/i',
+
+            // 错误注入
+            '/extractvalue\s*\(|updatexml\s*\(/i',
+
+            // 盲注
+            '/if\s*\(.*?,\s*.*?,\s*.*?\)/i',
+        ];
+
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $input)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 检测XSS攻击
+     */
+    protected function detectXss(string $input): bool
+    {
+        $patterns = [
+            // 脚本标签
+            '/<script\b[^>]*>(.*?)<\/script>/is',
+            '/javascript\s*:/i',
+            '/on(load|error|click|mouse|key|focus|blur|submit)\s*=/i',
+
+            // 事件处理
+            '/<\w+\s+[^>]*on\w+\s*=[^>]*>/i',
+
+            // 数据协议
+            '/data\s*:/i',
+            '/vbscript\s*:/i',
+
+            // 框架/对象
+            '/<iframe\b[^>]*>/i',
+            '/<object\b[^>]*>/i',
+            '/<embed\b[^>]*>/i',
+            '/<applet\b[^>]*>/i',
+        ];
+
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $input)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 检测命令注入
+     */
+    protected function detectCommandInjection(string $input): bool
+    {
+        $patterns = [
+            // 系统命令
+            '/(?:system|exec|shell_exec|passthru|proc_open|popen|pcntl_exec)\s*\(/i',
+
+            // 管道符
+            '/\|\s*\w+/',
+            '/;\s*\w+/',
+
+            // 危险命令
+            '/\b(?:rm\s+-|cat\s+\/|wget\s+|curl\s+|nc\s+)\b/i',
+
+            // 反引号
+            '/`.*?`/',
+        ];
+
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $input)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 检测路径遍历
+     */
+    protected function detectPathTraversal(string $input): bool
+    {
+        $patterns = [
+            '/\.\.\//',
+            '/\.\.\\\/',
+            '/\/etc\/passwd/i',
+            '/\/proc\/self/i',
+            '/\.\.%2f/i',
+            '/\.\.%5c/i',
+        ];
+
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $input)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 检测文件包含
+     */
+    protected function detectFileInclusion(string $input): bool
+    {
+        $patterns = [
+            '/include\s*\(|require\s*\(|include_once|require_once/i',
+            '/php:\/\/filter/i',
+            '/phar:\/\//i',
+            '/zip:\/\//i',
+            '/expect:\/\//i',
+        ];
+
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $input)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 检查请求头
+     */
+    protected function checkHeaders(Request $request): bool
+    {
+        $suspiciousHeaders = [
+            'x-forwarded-for' => '/^[\d\.\,]+$/',
+            'user-agent' => '', // 可以为空，但可以检查恶意UA
+            'referer' => '',    // 检查可疑referer
+        ];
+
+        foreach ($suspiciousHeaders as $header => $pattern) {
+            $value = $request->header($header);
+            if ($value && $pattern && !preg_match($pattern, $value)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 检测攻击类型
+     */
+    protected function detectAttackType(string $input): string
+    {
+        if ($this->detectSqlInjection($input)) {
+            return 'sql_injection';
+        }
+        if ($this->detectXss($input)) {
+            return 'xss';
+        }
+        if ($this->detectCommandInjection($input)) {
+            return 'command_injection';
+        }
+        if ($this->detectPathTraversal($input)) {
+            return 'path_traversal';
+        }
+        if ($this->detectFileInclusion($input)) {
+            return 'file_inclusion';
+        }
+
+        return 'unknown';
+    }
+
+    /**
+     * 处理攻击
+     */
+    protected function handleAttack(Request $request, array $attacks): void
+    {
+        $ip = $this->getRealIp($request);
+
+        // 记录攻击日志
+        foreach ($attacks as $attack) {
+            $this->logAttack($ip, $request, $attack);
+        }
+
+        // 检查是否达到封禁阈值
+        if ($this->config['enable_blocking']) {
+            $this->checkAndBlockIp($ip);
+        }
+    }
+
+    /**
+     * 获取真实客户端IP（支持Swoole模式）
+     */
+    protected function getRealIp(Request $request): string
+    {
+        $ip = '0.0.0.0';
+
+        // 1. 优先从Swoole的header中获取
+        if ($this->isSwooleMode()) {
+            // Swoole模式下，真实IP通常在x-real-ip或x-forwarded-for中
+            $ip = $request->header('x-real-ip', '');
+
+            if (empty($ip)) {
+                // 如果有多个代理，x-forwarded-for是逗号分隔的列表，取第一个
+                $xff = $request->header('x-forwarded-for', '');
+                if (!empty($xff)) {
+                    $ips = explode(',', $xff);
+                    $ip = trim($ips[0]);
+                }
+            }
+        }
+
+        // 2. 如果Swoole模式获取失败，尝试常规方法
+        if (empty($ip) || !filter_var($ip, FILTER_VALIDATE_IP)) {
+            $ip = $request->ip();
+        }
+
+        // 3. 验证IP格式
+        return filter_var($ip, FILTER_VALIDATE_IP) ? $ip : '0.0.0.0';
+    }
+
+    /**
+     * 检查是否运行在Swoole模式
+     */
+    protected function isSwooleMode(): bool
+    {
+        return extension_loaded('swoole') &&
+            defined('SWOOLE_VERSION') &&
+            (php_sapi_name() === 'cli' || isset($_SERVER['SWOOLE_SERVER']));
+    }
+
+    /**
+     * 记录攻击日志到数据库
+     */
+    protected function logAttack(string $ip, Request $request, array $attack): void
+    {
+        if (!$this->config['enable_logging']) {
+            return;
+        }
+
+        try {
+            // 限制参数值长度
+            $paramValue = mb_substr($attack['value'], 0, $this->config['max_param_length'], 'UTF-8');
+
+            // 获取用户代理
+            $userAgent = $request->header('user-agent', '');
+
+            // 获取其他信息
+            $requestData = [
+                'method' => $request->method(),
+                'url' => $request->url(),
+                'full_url' => $request->url(true),
+                'get_params' => json_encode($request->get(), JSON_UNESCAPED_UNICODE),
+                'post_params' => json_encode($request->post(), JSON_UNESCAPED_UNICODE),
+            ];
+
+            // 使用参数绑定防止二次注入
+            Db::name('security_log')->insert([
+                'attack_type' => $attack['type'],
+                'ip_address' => $ip,
+                'param_name' => $attack['param'],
+                'param_value' => $paramValue,
+                'user_agent' => mb_substr($userAgent, 0, 500, 'UTF-8'),
+                'request_method' => $request->method(),
+                'request_url' => mb_substr($request->url(), 0, 500, 'UTF-8'),
+                'request_data' => json_encode($requestData, JSON_UNESCAPED_UNICODE),
+                'create_time' => date('Y-m-d H:i:s'),
+                'update_time' => date('Y-m-d H:i:s')
+            ]);
+
+            // 更新IP攻击计数
+            $this->incrementIpAttackCount($ip);
+
+        } catch (\Exception $e) {
+            // 数据库写入失败时记录到文件日志
+            Log::error('安全日志记录失败: ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 增加IP攻击计数
+     */
+    protected function incrementIpAttackCount(string $ip): void
+    {
+        $key = 'security:attack_count:' . $ip;
+        $count = Cache::inc($key, 1);
+
+        // 设置24小时过期
+        if ($count === 1) {
+            Cache::expire($key, 86400);
+        }
+    }
+
+    /**
+     * 检查并封禁IP
+     */
+    protected function checkAndBlockIp(string $ip): void
+    {
+        $key = 'security:attack_count:' . $ip;
+        $count = Cache::get($key, 0);
+
+        if ($count >= $this->config['attack_threshold']) {
+            $blockKey = 'security:blocked_ip:' . $ip;
+            Cache::set($blockKey, 1, $this->config['block_duration']);
+
+            // 记录封禁日志
+            Log::warning('IP被封禁', [
+                'ip' => $ip,
+                'attack_count' => $count,
+                'block_duration' => $this->config['block_duration']
+            ]);
+        }
+    }
+
+    /**
+     * 检查IP是否被封禁
+     */
+    protected function isIpBlocked(string $ip): bool
+    {
+        $key = 'security:blocked_ip:' . $ip;
+        return Cache::has($key);
+    }
+
+    /**
+     * 记录封禁访问
+     */
+    protected function logBlockedAccess(Request $request): void
+    {
+        Log::info('封禁IP访问被阻止', [
+            'ip' => $request->ip(),
+            'url' => $request->url(),
+            'method' => $request->method(),
+            'user_agent' => $request->header('user-agent', '')
+        ]);
+    }
+
+    /**
+     * 封禁响应
+     */
+    protected function blockResponse(): Response
+    {
+        return Response::create([
+            'code' => 403,
+            'msg'  => '访问被拒绝'
+        ], 'json')->code(403);
+    }
+
+    /**
+     * 错误响应
+     */
+    protected function errorResponse(): Response
+    {
+        return Response::create([
+            'code' => 400,
+            'msg'  => '请求参数错误'
+        ], 'json')->code(400);
+    }
+}

app/traits/GongApiRequest.php

@@ -633,9 +633,9 @@ trait GongApiRequest
             $data = strstr($data,'{');
         }
         if ($url != 'https://www.douhuomall.com/api/category/get_list'){
-            log::info('供应链【'.$url.'】body:'.json_encode($postFields,JSON_UNESCAPED_UNICODE));
-            log::info('供应链【'.$url.'】headerArray:'.json_encode($header,JSON_UNESCAPED_UNICODE));
-            log::info('供应链【'.$url.'】data:'.$data);
+            // log::info('供应链【'.$url.'】body:'.json_encode($postFields,JSON_UNESCAPED_UNICODE));
+            // log::info('供应链【'.$url.'】headerArray:'.json_encode($header,JSON_UNESCAPED_UNICODE));
+            // log::info('供应链【'.$url.'】data:'.$data);
 //            Db::name("log")->insert(array('data'=>'供应链【'.$url.'】body:'.json_encode($postFields)));//日志记录
 //            Db::name("log")->insert(array('data'=>'供应链【'.$url.'】headerArray:'.json_encode($header)));//日志记录
 //            Db::name("log")->insert(array('data'=>'供应链【'.$url.'】data:'.$data));//日志记录

app/traits/GzcApiRequest.php

@@ -56,7 +56,11 @@ trait GzcApiRequest
      */
     public static function checkAmount($user)
     {
-        $cardType = $user['card_type'] ? $user['card_type'] : 10;
+        Log::info('用户实名信息：' . json_encode($user));
+        $cardType = $user['card_type'];
+        if ($user['card_type'] == 2) {
+            $cardType = '10';
+        }
         $cxbData = [
             'platformNo' => env('GZC.PLATFORM_NO'),
             'appNo' => env('GZC.APP_NO'),
@@ -87,8 +91,6 @@ trait GzcApiRequest
 
         $amount = $cxbResponseData['extendData']['amount'] + $xfbResponseData['extendData']['amount'];
         return $amount;
-
-
     }
     public function getAmountFromGzc()
     {
@@ -107,17 +109,18 @@ trait GzcApiRequest
             return app('json')->fail('查询失败（第三方异常）');
         }
 
-        if (!is_array($res) || ($res['code'] ?? -1) !== 0) {
-            return app('json')->fail($res['message'] ?? '查询失败');
-        }
-
-        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? 0;
-        $amount = floatval($amountCents) * 0.01;
+        // 提取 amount（兼容多种字段位置）
+        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? null;
+        $amount = $amountCents === null ? 0.0 : floatval($amountCents) * 0.01;
         $formatted = sprintf('%.2f', $amount);
 
+        // 从 checkAmount 返回的 debug（若存在）
+        $debug = $res['debug'] ?? null;
+
+        // 返回 amount 与 debug 给调用方（前端 / 调试）
         return app('json')->success([
             'amount' => $formatted,
-            'debug'  => $res['debug'] ?? null,
+            'debug'  => $debug
         ]);
     }
     /**

app/utils/TimeUtil.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\utils;
+
+class TimeUtil
+{
+    /**
+     * 生成时间间隔数组
+     */
+    public static function generateTimeIntervals($startTime, $endTime, $intervalMinutes = 20): array
+    {
+        $intervals = [];
+        $currentStart = strtotime($startTime);
+        $endTimestamp = strtotime($endTime);
+
+        while ($currentStart < $endTimestamp) {
+            $currentEnd = $currentStart + ($intervalMinutes * 60);
+
+            // 确保不超过结束时间
+            if ($currentEnd > $endTimestamp) {
+                $currentEnd = $endTimestamp;
+            }
+
+            $intervals[] = [
+                'start' => date("Y-m-d H:i:00", $currentStart),
+                'end' => date("Y-m-d H:i:00", $currentEnd)
+            ];
+
+            $currentStart = $currentEnd;
+
+            // 如果已经到达结束时间，退出循环
+            if ($currentStart >= $endTimestamp) {
+                break;
+            }
+        }
+
+        return $intervals;
+    }
+
+}

config/console.php

@@ -33,5 +33,6 @@ return [
         'movie_order' => 'app\command\MovieOrderCommand',
         'repair_pay_success' => 'app\command\repairPaySuccess',
         'repair_fzone_pay_type' => 'app\command\repairFzonePayType',
+        'wiwibaoproductsync' => 'app\command\WiwibaoProductSync',
     ],
 ];

config/middleware.php

@@ -1,9 +1,15 @@
 <?php
 // 中间件配置
 return [
+    // 全局中间件
+    '' => [
+        // ... 其他中间件
+        app\middleware\SecurityMiddleware::class,
+    ],
     // 别名或分组
     'alias'    => [
         'api_log' => \app\middleware\ApiRequestLogMiddleware::class,
+        'security' => \app\middleware\SecurityMiddleware::class,
     ],
     // 优先级设置，此数组中的中间件会按照数组中的顺序优先执行
     'priority' => [],

crmeb/listens/AutoCancelGroupOrderListen.php

@@ -5,7 +5,7 @@
  * @author xaboy
  * @day 2020/6/9
  *
- * 
+ *
  */
 
 namespace crmeb\listens;
@@ -31,7 +31,15 @@ class AutoCancelGroupOrderListen implements ListenerInterface
                 try {
                     $storeGroupOrderRepository->cancel($id);
                 } catch (\Exception $e) {
-                    Log::info('自动关闭订单失败' . var_export($id, 1));
+                    Log::error('自动关闭订单失败' . json_encode([
+                            'order_id' => $id,
+                            'error_message' => $e->getMessage(),
+                            'error_file' => $e->getFile(),
+                            'error_line' => $e->getLine(),
+                            'error_code' => $e->getCode(),
+                            'exception_class' => get_class($e),
+                            'trace' => $e->getTraceAsString()
+                        ], JSON_UNESCAPED_UNICODE));
                 }
             }
         });
@@ -47,7 +55,15 @@ class AutoCancelGroupOrderListen implements ListenerInterface
                         $storeGroupOrderRepository->cancel($id);
                     }
                 } catch (\Exception $e) {
-                    Log::info('自动关闭订单失败' . var_export($id, 1));
+                    Log::error('自动关闭代付订单失败' . json_encode([
+                            'order_id' => $id,
+                            'error_message' => $e->getMessage(),
+                            'error_file' => $e->getFile(),
+                            'error_line' => $e->getLine(),
+                            'error_code' => $e->getCode(),
+                            'exception_class' => get_class($e),
+                            'trace' => $e->getTraceAsString()
+                        ], JSON_UNESCAPED_UNICODE));
                 }
             }
         });

route/admin.php

@@ -2,6 +2,8 @@
 
 use think\facade\Route;
 
+Route::get('agreement/detailContent/:id', 'admin.agreement.Agreement/detailContent');
+
 Route::group(config('admin.admin_prefix'), function () {
     Route::miss(function () {
         $DB = DIRECTORY_SEPARATOR;
@@ -111,6 +113,9 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         Route::get('getConfig/:name', 'admin.system.config.ConfigValue/getByName');
         Route::post('saveConfig', 'admin.system.config.ConfigValue/saveByName');
 
+        // 共富区配置
+        Route::get('sharedProsperity/Recommend', 'admin.system.sharedProsperity.SharedProsperityRecommend/list');
+
         //组合数据
         Route::group('group', function () {
             Route::get('lst', '/lst')->name('groupLst');
@@ -976,6 +981,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::post('killOrderRewards', 'Order/killOrderRewards');//撤回订单
             Route::post('killOrderLst', 'Order/killOrderLst');//撤回订单的列表
             Route::post('easterKillOrder', 'Order/easterKillOrder');//撤回撤回订单
+            Route::get('merchantOfflineOrder', 'MerchantOfflineOrder/lst');//线下订单展示
         })->prefix('admin.order.');
 
         //第三方订单

route/api.php

@@ -1341,6 +1341,7 @@ Route::group('api/', function () {
     ->middleware(\app\common\middleware\CheckSiteOpenMiddleware::class);
 Route::get('/test/assignment', 'api.store.merchant.Taskorderguquan/assignment');
 Route::get('test_hehuoren', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
+Route::get('test_resendUnissued', 'api.store.merchant.TaskPartnerProfits/resendUnissued');
 Route::get('test_hehuoren_zero', 'api.store.merchant.TaskZeroLinePartnerProfits/partnerProfitsByZeroLine');
 Route::get('test_guquan', 'api.store.merchant.Taskorderguquan/lst6');
 Route::get('test_lianchuang', 'api.store.merchant.Taskorderlianc/lst2');