111

app/common/dao/user/UserBillDao.php

@@ -226,7 +226,7 @@ class UserBillDao extends BaseDao
         try {
             $dataList = UserBill::getDB()
                 ->where('type_shop', '=', $typeShop)
-                ->whereIn('order_id', $orderIdList)
+                ->whereIn('link_id', $orderIdList)
                 ->where('status', '=', UserBillEnum::STATUS['PENDING']['code'])
                 ->select()
                 ->toArray();

app/common/dao/user/UserSignFugouDao.php

@@ -3,12 +3,20 @@
 namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignFugouEnum;
+use app\common\model\BaseModel;
 use app\common\model\user\UserSignFugou;
 use app\entity\CommonEntity;
 use app\entity\data\user\UserSignFugouEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 class UserSignFugouDao extends BaseDao
 {
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return UserSignFugou::class;
@@ -18,7 +26,7 @@ class UserSignFugouDao extends BaseDao
      * @param array $idList
      * @return CommonEntity[]
      */
-    public function getStoreSignFugouEntityListByIdList(array $idList): array
+    public function getUserSignFugouEntityListByIdList(array $idList): array
     {
         $entityList = [];
         try {
@@ -38,4 +46,46 @@ class UserSignFugouDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignFugouEntity[]
+     */
+    public function getUserSignFugouEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignFugou $model */
+            $model = $this->getModel();
+            $dataList = $model::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignFugouEnum::STATUS['Pending']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignFugouEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/enum/CommonEnum.php

@@ -135,11 +135,11 @@ class CommonEnum
         'MemberZone' => [
             'Fixed' => [
                 'Basic' => [ // 售价 => 基础计算价格 (历史原因：原价是1000、2000...等，后来单间成本价上调了180，所以售价调整了，考虑到涨价前后的奖励应保持一致，所以设置了基础计算值)
-                    1180.00 => 1000.00,
-                    2360.00 => 2000.00,
-                    9440.00 => 8000.00,
-                    10620.00 => 9000.00,
-                    11800.00 => 10000.00
+                    '1180.00' => 1000.00,
+                    '2360.00' => 2000.00,
+                    '9440.00' => 8000.00,
+                    '10620.00' => 9000.00,
+                    '11800.00' => 10000.00
                 ]
             ],
             'Self' => [

app/common/model/Region.php

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

app/common/model/store/shipping/ShippingTemplateFree.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateFree extends BaseModel
 {
@@ -41,7 +42,8 @@ class ShippingTemplateFree extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }
         return $result;

app/common/model/store/shipping/ShippingTemplateRegion.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateRegion extends BaseModel
 {
@@ -40,7 +41,8 @@ class ShippingTemplateRegion extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }
         return $result;

app/common/model/store/shipping/ShippingTemplateUndelivery.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateUndelivery extends BaseModel
 {
@@ -40,7 +41,8 @@ class ShippingTemplateUndelivery extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }else{
             $result['city_id'] = [];

app/common/repositories/finance/FinanceRepository.php

@@ -1953,7 +1953,6 @@ class FinanceRepository extends BaseRepository
         $query = Db::name('user_pv_log')
         ->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']);
         })
@@ -1976,49 +1975,46 @@ class FinanceRepository extends BaseRepository
 
         //导出数据
         $is_excel = request()->param('is_excel', 0);
-        if($is_excel == 1){
+        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.pv,o.order_sn,uss.status,uss.mark,u.score')
-            ->order('uss.id', 'desc')
-            ->select();
+                ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark')
+                ->order('uss.id', 'desc')
+                ->select();
             $arr = [];
-            foreach ($date['list'] as $k=>$item){
+            foreach ($date['list'] as $k => $item) {
                 switch ($item['status']) {
-                    case '1':
-                        $item['status'] = '有效';
-                        break;
-                    case '-1':
-                        $item['status'] = '待确认';
-                        break;
-                    case '0':
-                        $item['status'] = '已失效';
-                        break;
+                    case '1': $statusLabel = '有效'; break;
+                    case '-1': $statusLabel = '待确认'; break;
+                    case '0': $statusLabel = '已失效'; break;
+                    default: $statusLabel = (string)$item['status'];
                 }
-                $arr[] = array(
+                $addtimeFormatted = is_numeric($item['addtime']) ? date('Y-m-d H:i:s', $item['addtime']) : $item['addtime'];
+                $arr[] = [
                     $item['id'],
-                    date('Y-m-d H:i:s', $item['addtime']),
+                    $addtimeFormatted,
                     $item['nickname'],
                     $item['phone'],
                     $item['pv'],
-                    $item['status'],
-                    $item['order_sn'],
+                    $statusLabel,
+                    $item['order_id'],
                     $item['mark']
-                );
+                ];
             }
             return $this->getStatisticsExcel([
-                'ID','时间','用户昵称','手机号','PV数','状态','关联订单','说名',
+                'ID', '时间', '用户昵称', '手机号', 'PV数', '状态', '关联订单号', '说明',
             ], $arr, 'PV统计');
         }
 
 
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,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']);
+                $item['addtime'] = is_numeric($item['addtime']) ? date('Y-m-d H:i:s', $item['addtime']) : $item['addtime'];
+                $item['order_sn'] = $item['order_id'];
                 return $item;
             });
         $date['count'] = $query->count();

app/common/repositories/gzc/GzcLogRepository.php

@@ -47,6 +47,7 @@ class GzcLogRepository extends BaseRepository
      */
     public function addGzcLog(int $uid, string $userName, string $mobile, string $userCard, int $orderType, string $orderId, float $pension, int $payType = 0): GzcLogEntity
     {
+        $linkId = 0;
         $orderSn = '';
         $payTime = '';
         if ($orderType == CommonEnum::ORDER_TYPE['Platform']['code']) {
@@ -68,6 +69,7 @@ class GzcLogRepository extends BaseRepository
         /** @var GzcLogEntity $gzcLogEntity */
         $gzcLogEntity = GzcLogEntity::newInstance();
         $gzcLogEntity->setUid($uid)
+            ->setPlatformNo('IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999))
             ->setUserName($userName)
             ->setMobile($mobile)
             ->setUserCard($userCard)
@@ -77,7 +79,8 @@ class GzcLogRepository extends BaseRepository
             ->setOrderType($orderType)
             ->setPayTime($payTime)
             ->setCreateTime($createTime)
-            ->setUpdateTime($createTime);
+            ->setUpdateTime($createTime)
+            ->setLinkId($orderId);
 
         return $this->createByEntity($gzcLogEntity);
     }

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

@@ -85,6 +85,7 @@ 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;
@@ -11289,7 +11290,7 @@ class StoreOrderRepository extends BaseRepository
                             /** @var UserBillRepository $userBillRepository */
                             $userBillRepository = app()->make(UserBillRepository::class);
                             $userBillRepository->addUserBill(
-                                $storeOrderEntity->getUid(),
+                                $userEntityBySpreadUid->getUid(),
                                 UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
                                 UserBillEnum::PM['INCOME']['code'],
                                 $yanglaojinBySpreadUid,
@@ -11648,6 +11649,17 @@ class StoreOrderRepository extends BaseRepository
                 $userBillRepository->executeByIdList($billIdList);
             }
 
+            /** @var UserSignFugouRepository $userSignFugouRepository */
+            $userSignFugouRepository = app()->make(UserSignFugouRepository::class);
+            $userSignFugouEntityList = $userSignFugouRepository->getUserSignFugouEntityListByOrderIdListAndPending(UserSignFugouEnum::ORDER_TYPE['Platform']['code'], $unsettledOrderIdList);
+            if (!empty($userSignFugouEntityList)) {
+                $fugouIdList = array_map(function ($userSignFugouEntity) {
+                    return $userSignFugouEntity->getId();
+                }, $userSignFugouEntityList);
+                // 去结算 养老金 和佣金
+                $userSignFugouRepository->executeByIdList($fugouIdList);
+            }
+
             /** 结算 积分 */
             /** @var UserSignScoreRepository $userSignScoreRepository */
             $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
@@ -11706,6 +11718,7 @@ class StoreOrderRepository extends BaseRepository
         $userEntity = $verifyResult['userEntity'];
         /** @var CartEntity[] $cartEntityList 发起创建订单的购物车列表 */
         $cartEntityList = $verifyResult['cartEntityList'];
+        /** @var CartEntity[] $cartEntityMap 发起创建订单的购物车映射 */
         $cartEntityMap = array_column($cartEntityList, null, 'cartId');
         $cartIdList = array_keys($cartEntityMap);
         /** @var UserAddressEntity $addressEntity 地址信息 */
@@ -11733,19 +11746,6 @@ class StoreOrderRepository extends BaseRepository
         // /** @var StoreCouponUserRepository $storeCouponUserRepository */
         // $storeCouponUserRepository = app()->make(StoreCouponUserRepository::class);
 
-        // 获取 运费表数据  商品 对应的 运费模板
-        /** @var ShippingTemplateRepository $shippingTemplateRepository */
-        $shippingTemplateRepository = app()->make(ShippingTemplateRepository::class);
-        // 获取  商品 对应的 运费模板 de 指定不配送区域表
-        /** @var ShippingTemplateUndeliveRepository $shippingTemplateUndeliveRepository */
-        $shippingTemplateUndeliveRepository = app()->make(ShippingTemplateUndeliveRepository::class);
-        // 获取  商品 对应的 运费模板 de 指定包邮信息表
-        /** @var ShippingTemplateFreeRepository $shippingTemplateFreeRepository */
-        $shippingTemplateFreeRepository = app()->make(ShippingTemplateFreeRepository::class);
-        // 获取  商品 对应的 运费模板 de 配送区域表
-        /** @var ShippingTemplateRegionRepository $shippingTemplateRegionRepository */
-        $shippingTemplateRegionRepository = app()->make(ShippingTemplateRegionRepository::class);
-
         // 商品
         /** @var ProductRepository $productRepository */
         $productRepository = app()->make(ProductRepository::class);
@@ -11834,85 +11834,14 @@ class StoreOrderRepository extends BaseRepository
             $price = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getPrice(), CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
 
             // 计算运费 获取该商品的运费模板 运费表
-            // TODO  注意 这个地址好像有问题，我再 客户端->收货地址管理中 （rrx_user_address）增加的廊坊市 对应的城市编号是（code_list）315 且city_id 字段的值是 2，而我再后台设置 可配送地址时 ，廊坊市对应的编码是 58247
             // 判断商品是否是 供应链(微唯宝)商品
-            $postage = 0.00;
-            if (!empty($productAttrValueEntity->getGongSkuId())) {
-                $freight = GongApiRequest::freight($addressEntity->getCityId(), [['sku_id' => $productAttrValueEntity->getGongSkuId(), 'num' => $cartEntity->getCartNum()]]);
-                $postage = $freight['freight'] ?? 0;
-            } else {
-                $shippingTemplateEntity = $shippingTemplateRepository->getShippingTemplateEntityByShippingTemplateId($productEntity->getTempId());
-                if (empty($shippingTemplateEntity->getShippingTemplateId())) {
-                    throw new ValidateException('未查询到商品所绑定的运费模板');
-                } else {
-                    // 判断是否开启 开启指定区域不配送
-                    if ($shippingTemplateEntity->getUndelivery() == ShippingTemplateEnum::UNDELIVERY['Yes']['code']) {
-                        // 获取运费模板的 指定不配送区域列表
-                        $shippingTemplateUndeliveryEntityList = $shippingTemplateUndeliveRepository->getShippingTemplateUndeliveryEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
-                        foreach ($shippingTemplateUndeliveryEntityList as $shippingTemplateUndeliveryEntity) {
-                            // 验证 此次配送地址 是否在不配送区域中
-                            if (in_array($addressEntity->getCityId(), $shippingTemplateUndeliveryEntity->getCityIdList())) {
-                                throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
-                            }
-                        }
-                    }
-
-                    $isBaoYou = false;
-                    $number = 0.00;
-                    // 获取 当前商品的 计费方式 （计费方式 0=数量 1=重量 2=体积）
-                    if ($shippingTemplateEntity->getType() == ShippingTemplateEnum::TYPE['Quantity']['code']) {
-                        $number = $cartEntity->getCartNum();
-                    } else if ($shippingTemplateEntity->getType() == ShippingTemplateEnum::TYPE['Weight']['code']) {
-                        $number = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getWeight(), 2);
-                    } else {
-                        $number = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getVolume(), 2);
-                    }
-
-                    // 获取 指定包邮信息 包邮信息表
-                    $shippingTemplateFreeEntityList = $shippingTemplateFreeRepository->getShippingTemplateFreeEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
-                    foreach ($shippingTemplateFreeEntityList as $shippingTemplateFreeEntity) {
-                        // 判断当前收货地址 是不是 在 指定 包邮 地点内
-                        if (in_array($addressEntity->getCityId(), $shippingTemplateFreeEntity->getCityIdList())) {
-                            // 判断当前 商品 是否符合 最高包邮数量上限 和 最低包邮金额
-                            if ($number <= $shippingTemplateFreeEntity->getNumber() && $price >= $shippingTemplateFreeEntity->getPrice()) {
-                                $isBaoYou = true;
-                            }
-                        }
-                    }
-
-                    // 如果不包邮 则需要计算邮费
-                    if (!$isBaoYou){
-                        // 配送区域表
-                        $shippingTemplateRegionEntityList = $shippingTemplateRegionRepository->getShippingTemplateRegionEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
-                        if (empty($shippingTemplateRegionEntityList)) {
-                            throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
-                        }
-                        $isPeiSong = false;
-                        foreach ($shippingTemplateRegionEntityList as $shippingTemplateRegionEntity) {
-                            // 判断当前收货地址 是否在可配送区域内
-                            if (in_array($addressEntity->getCityId(), $shippingTemplateRegionEntity->getCityIdList())) {
-                                // 比如 该商品 重量 5.03kg 首件重量 2kg 运费 2元  续件重量 3kg 续费3元
-                                // 那本次 运费就是 首件运费 + （（重量 - 首件重量）/续件重量） * 续费单价
-                                // 那本次 运费就是 2 + （（5.03 - 2）/3）向上取整 * 3 = 8
-                                // 首件（重量or体积） 运费计算
-                                if ($number > $shippingTemplateRegionEntity->getFirst()) {
-                                    // 数量（重量or体积） 超出 首件部分 也就是续费部分
-                                    $excess = bcsub($number, $shippingTemplateRegionEntity->getFirst(), 3);
-                                    // 查看 需 续费几次 并向上取整
-                                    $continueNum = ceil(bcdiv($excess, $shippingTemplateRegionEntity->getContinue(), 3));
-                                    $postage = bcmul($continueNum, $shippingTemplateRegionEntity->getContinuePrice(), 2);
-                                } else {
-                                    $postage = $shippingTemplateRegionEntity->getFirstPrice();
-                                }
-                                $isPeiSong = true;
-                            }
-                        }
-                        if (!$isPeiSong) {
-                            throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
-                        }
-                    }
-                }
-            }
+            // $postage = $this->calculatePostage(
+            //     $productEntity,
+            //     $productAttrValueEntity,
+            //     $cartEntity->getCartNum(),
+            //     $addressEntity->getCityId()
+            // );
+            $postage = 0.00; // 默认全都包邮s
 
             // 汇付手续费 （订单价格 + 邮费） * 汇付手续费比例
             $commissionRate = bcmul(bcadd($price, $postage, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT), CommonEnum::HUIFU_COMMISSION_CHARGE, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
@@ -11969,7 +11898,7 @@ class StoreOrderRepository extends BaseRepository
                 ->setSeckill($productSeckillEntity->getId())
                 ->setYouhuiPrice($youhuiPrice)
                 ->setDouhuomall(empty($productEntity->getSpuId())?StoreOrderEnum::DOHUOMALL['PlatformOrder']['code']:StoreOrderEnum::DOHUOMALL['SupplyChainOrder']['code'])
-                ->setDouhuomallStatus(StoreOrderEnum::DOHUOMALL_STATUS['NotSubmittedToWeiweiBao']['code'])
+                ->setDouhuomallStatus(empty($productEntity->getSpuId()) ? null : StoreOrderEnum::DOHUOMALL_STATUS['NotSubmittedToWeiweiBao']['code'])
                 ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType())
                 ->setConPri($serviceMoney);
             $storeOrderEntityList[] = $storeOrderEntity;
@@ -12140,7 +12069,8 @@ class StoreOrderRepository extends BaseRepository
         }
 
         /** 验证分享信息 分享 */
-        $shareEntity = [];
+        /** @var ShareEntity $shareEntity */
+        $shareEntity = ShareEntity::newInstance();
         if (!empty($storeOrderCreateRequestEntity->getShareId())) {
             /** @var ShareRepository $shareRepository */
             $shareRepository = app()->make(ShareRepository::class);
@@ -12290,4 +12220,143 @@ class StoreOrderRepository extends BaseRepository
             'storeProductAttrValueEntityMap' => $storeProductAttrValueEntityMap,
         ];
     }
+
+    /**
+     * 根据 商品属性 唯一值、城市ID、数量 计算运费
+     * @param CalculatePostageRequestEntity $calculatePostageRequestEntity
+     * @return float|int|mixed|string
+     */
+    public function getPostageByUniqueAndCityIdAndNum(CalculatePostageRequestEntity $calculatePostageRequestEntity)
+    {
+        // 商品属性
+        /** @var ProductAttrValueRepository $storeProductAttrValueRepository */
+        $storeProductAttrValueRepository = app()->make(ProductAttrValueRepository::class);
+        $storeProductAttrValueEntityList = $storeProductAttrValueRepository->getStoreProductAttrValueEntityByUnique($calculatePostageRequestEntity->getUnique());
+        if (empty($storeProductAttrValueEntityList->getProductId())) {
+            throw new ValidateException('未查询到商品属性信息');
+        }
+
+        // 商品
+        /** @var ProductRepository $storeProductRepository */
+        $storeProductRepository = app()->make(ProductRepository::class);
+        $storeProductEntity = $storeProductRepository->getStoreProductEntityByProductId($storeProductAttrValueEntityList->getProductId());
+        if (empty($storeProductEntity->getProductId())) {
+            throw new ValidateException('未查询到商品信息');
+        }
+
+        return $this->calculatePostage(
+            $storeProductEntity,
+            $storeProductAttrValueEntityList,
+            $calculatePostageRequestEntity->getNum(),
+            $calculatePostageRequestEntity->getCityId()
+        );
+    }
+
+    /**
+     * 计算运费
+     * @param StoreProductEntity $productEntity
+     * @param StoreProductAttrValueEntity $productAttrValueEntity
+     * @param int $num
+     * @param int $cityId
+     * @return float|int|mixed|string
+     */
+    public function calculatePostage(StoreProductEntity $productEntity, StoreProductAttrValueEntity $productAttrValueEntity, int $num, int $cityId)
+    {
+        // 获取 运费表数据  商品 对应的 运费模板
+        /** @var ShippingTemplateRepository $shippingTemplateRepository */
+        $shippingTemplateRepository = app()->make(ShippingTemplateRepository::class);
+        // 获取  商品 对应的 运费模板 de 指定不配送区域表
+        /** @var ShippingTemplateUndeliveRepository $shippingTemplateUndeliveRepository */
+        $shippingTemplateUndeliveRepository = app()->make(ShippingTemplateUndeliveRepository::class);
+        // 获取  商品 对应的 运费模板 de 指定包邮信息表
+        /** @var ShippingTemplateFreeRepository $shippingTemplateFreeRepository */
+        $shippingTemplateFreeRepository = app()->make(ShippingTemplateFreeRepository::class);
+        // 获取  商品 对应的 运费模板 de 配送区域表
+        /** @var ShippingTemplateRegionRepository $shippingTemplateRegionRepository */
+        $shippingTemplateRegionRepository = app()->make(ShippingTemplateRegionRepository::class);
+        // 计算 该款商品 总金额
+        $price = bcmul($num, $productAttrValueEntity->getPrice(), CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+        $postage = 0.00;
+
+        if (!empty($productAttrValueEntity->getGongSkuId())) {
+            $freight = GongApiRequest::freight($cityId, [['sku_id' => $productAttrValueEntity->getGongSkuId(), 'num' => $num]]);
+            $postage = $freight['freight'] ?? 0;
+        } else {
+            $shippingTemplateEntity = $shippingTemplateRepository->getShippingTemplateEntityByShippingTemplateId($productEntity->getTempId());
+            if (empty($shippingTemplateEntity->getShippingTemplateId())) {
+                throw new ValidateException('未查询到商品所绑定的运费模板');
+            } else {
+                // 判断是否开启 开启指定区域不配送
+                if ($shippingTemplateEntity->getUndelivery() == ShippingTemplateEnum::UNDELIVERY['Yes']['code']) {
+                    // 获取运费模板的 指定不配送区域列表
+                    $shippingTemplateUndeliveryEntityList = $shippingTemplateUndeliveRepository->getShippingTemplateUndeliveryEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
+                    foreach ($shippingTemplateUndeliveryEntityList as $shippingTemplateUndeliveryEntity) {
+                        // 验证 此次配送地址 是否在不配送区域中
+                        if (in_array($cityId, $shippingTemplateUndeliveryEntity->getCityIdList())) {
+                            throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
+                        }
+                    }
+                }
+
+                $isBaoYou = false;
+                $number = 0.00;
+                // 获取 当前商品的 计费方式 （计费方式 0=数量 1=重量 2=体积）
+                if ($shippingTemplateEntity->getType() == ShippingTemplateEnum::TYPE['Quantity']['code']) {
+                    $number = $num;
+                } else if ($shippingTemplateEntity->getType() == ShippingTemplateEnum::TYPE['Weight']['code']) {
+                    $number = bcmul($num, $productAttrValueEntity->getWeight(), 2);
+                } else {
+                    $number = bcmul($num, $productAttrValueEntity->getVolume(), 2);
+                }
+
+                // 获取 指定包邮信息 包邮信息表
+                $shippingTemplateFreeEntityList = $shippingTemplateFreeRepository->getShippingTemplateFreeEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
+                foreach ($shippingTemplateFreeEntityList as $shippingTemplateFreeEntity) {
+                    // 判断当前收货地址 是不是 在 指定 包邮 地点内
+                    if (in_array($cityId, $shippingTemplateFreeEntity->getCityIdList())) {
+                        // 判断当前 商品 是否符合 最高包邮数量上限 和 最低包邮金额
+                        if ($number <= $shippingTemplateFreeEntity->getNumber() && $price >= $shippingTemplateFreeEntity->getPrice()) {
+                            $isBaoYou = true;
+                            break;
+                        }
+                    }
+                }
+
+                // 如果不包邮 则需要计算邮费
+                if (!$isBaoYou) {
+                    // 配送区域表
+                    $shippingTemplateRegionEntityList = $shippingTemplateRegionRepository->getShippingTemplateRegionEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
+                    if (empty($shippingTemplateRegionEntityList)) {
+                        throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
+                    }
+                    $isPeiSong = false;
+                    foreach ($shippingTemplateRegionEntityList as $shippingTemplateRegionEntity) {
+                        // 判断当前收货地址 是否在可配送区域内
+                        if (in_array($cityId, $shippingTemplateRegionEntity->getCityIdList()) || $shippingTemplateRegionEntity->getCityId() == 0) {
+                            // 比如 该商品 重量 5.03kg 首件重量 2kg 运费 2元  续件重量 3kg 续费3元
+                            // 那本次 运费就是 首件运费 + （（重量 - 首件重量）/续件重量） * 续费单价
+                            // 那本次 运费就是 2 + （（5.03 - 2）/3）向上取整 * 3 = 8
+                            // 首件（重量or体积） 运费计算
+                            if ($number > $shippingTemplateRegionEntity->getFirst()) {
+                                // 数量（重量or体积） 超出 首件部分 也就是续费部分
+                                $excess = bcsub($number, $shippingTemplateRegionEntity->getFirst(), 3);
+                                // 查看 需 续费几次 并向上取整
+                                $continueNum = ceil(bcdiv($excess, $shippingTemplateRegionEntity->getContinue(), 3));
+                                $postage = bcmul($continueNum, $shippingTemplateRegionEntity->getContinuePrice(), 2);
+                            } else {
+                                $postage = $shippingTemplateRegionEntity->getFirstPrice();
+                            }
+                            $isPeiSong = true;
+                            break;
+                        }
+                    }
+                    if (!$isPeiSong) {
+                        throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
+                    }
+                }
+            }
+        }
+
+        return $postage;
+    }
 }

app/common/repositories/user/UserBillRepository.php

@@ -590,7 +590,7 @@ class UserBillRepository extends BaseRepository
 
                 } else if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
 
-                    if ($userBillEntity->getGzc() == UserBillEnum::GZC_STATUS['NOT_ENTERED']) {
+                    if ($userBillEntity->getGzc() == UserBillEnum::GZC_STATUS['NOT_ENTERED']['code']) {
                         if (!empty($userCertificationEntityMapByUid[$userBillEntity->getUid()])) {
                             $userCertificationEntity = $userCertificationEntityMapByUid[$userBillEntity->getUid()];
                             // 创建公证处记录
@@ -600,7 +600,7 @@ class UserBillRepository extends BaseRepository
                                 $userCertificationEntity->getMobile(),
                                 $userCertificationEntity->getUserCard(),
                                 $userBillEntity->getTypeShop(),
-                                $userBillEntity->getOrderSn(),
+                                $userBillEntity->getLinkId(),
                                 $userBillEntity->getNumber()
                             );
 

app/common/repositories/user/UserRepository.php

@@ -3126,9 +3126,7 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId){
-        //推荐人信息
-        $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
+    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId,$spread){
         //被推荐人信息
         $identity=Db::name("user")->where('uid',$uid)->field("identity,spread_uid")->find();
 //        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
@@ -3162,15 +3160,13 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_level_uid($uid, $account, $level_account, $mark,$adminId){
-        $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
-        $levelId = Db::name("user")->where('account',$account)->value("uid");
+    public function update_level_uid($uid, $olld_id, $level_account, $mark,$adminId,$level){
         if($level){
             try{
                 Db::name("user_level_change_records")->insert([
                     'operation_id' => $adminId,
                     'uid' => $uid,
-                    'old_level_id' => $levelId,
+                    'old_level_id' => $olld_id,
                     'new_level_id' => $level['uid'],
                     'mark' => $mark ]);
                 return Db::name("user")->where(["uid"=>$uid])->update(['level_id'=>$level['uid']]);

app/common/repositories/user/UserSignFugouRepository.php

@@ -6,6 +6,7 @@ use app\common\dao\user\UserSignFugouDao;
 use app\common\enum\user\UserSignFugouEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
 use app\entity\data\user\UserSignFugouEntity;
 use think\db\exception\DbException;
 use think\exception\ValidateException;
@@ -21,9 +22,9 @@ class UserSignFugouRepository extends BaseRepository
      * @param int $id
      * @return UserSignFugouEntity
      */
-    public function getStoreSignFugouEntityById(int $id): UserSignFugouEntity
+    public function getUserSignFugouEntityById(int $id): UserSignFugouEntity
     {
-        $entityList = $this->getStoreSignFugouEntityListByIdList([$id]);
+        $entityList = $this->getUserSignFugouEntityListByIdList([$id]);
         $entity = array_shift($entityList);
         if ($entity instanceof UserSignFugouEntity) {
             return $entity;
@@ -37,9 +38,19 @@ class UserSignFugouRepository extends BaseRepository
      * @param array $idList
      * @return UserSignFugouEntity[]
      */
-    public function getStoreSignFugouEntityListByIdList(array $idList): array
+    public function getUserSignFugouEntityListByIdList(array $idList): array
     {
-        return $this->dao->getStoreSignFugouEntityListByIdList($idList);
+        return $this->dao->getUserSignFugouEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignFugouEntity[]
+     */
+    public function getUserSignFugouEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserSignFugouEntityListByOrderIdListAndPending($orderType, $orderIdList);
     }
 
     public function create($data)
@@ -104,49 +115,122 @@ class UserSignFugouRepository extends BaseRepository
     /**
      * 将 复购 记录设置为生效状态 并对用户的 复购 字段进行增减
      * @param int $id
-     * @return UserSignFugouEntity
+     * @return int
      */
-    public function execute(int $id): UserSignFugouEntity
+    public function execute(int $id): int
     {
-        $UserSignFugouEntity = $this->getStoreSignFugouEntityById($id);
-        if (empty($UserSignFugouEntity->getId()) || empty($UserSignFugouEntity->getUid())) {
-            throw new ValidateException('无效的复购记录');
-        }
-        if ($UserSignFugouEntity->getStatus() == UserSignFugouEnum::STATUS['Invalid']['code']) {
-            throw new ValidateException('该复购记录已失效');
-        }
-        if (!empty($UserSignFugouEntity->getSettlementTime()) || $UserSignFugouEntity->getStatus() == UserSignFugouEnum::STATUS['Valid']['code']) {
-            throw new ValidateException('该复购记录已更新，请勿重复操作');
-        }
+        $result = $this->executeByIdList([$id]);
+        return array_shift($result);
+    }
 
-        /** @var UserRepository $userRepository */
-        $userRepository = app()->make(UserRepository::class);
-        $userEntity = $userRepository->getUserEntityByUid($UserSignFugouEntity->getUid());
-        if (empty($userEntity->getUid())) {
-            throw new ValidateException('未查询到用户信息');
-        }
-        if ($UserSignFugouEntity->getType() == UserSignFugouEnum::TYPE['Consume']['code']) {
-            $surplus = bcsub($userEntity->getFugou(), $UserSignFugouEntity->getNumber(), 2);
-            if ($surplus < 0.00) {
-                throw new ValidateException('用户复购不足');
+    /**
+     * 将 复购 记录设置为生效状态 并对用户的 复购 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userSignFugouEntityList = $this->getUserSignFugouEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignFugouEntityList = array_filter($userSignFugouEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserSignFugouEnum::STATUS['Pending']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
             }
-        } else {
-            $surplus = bcadd($userEntity->getFugou(), $UserSignFugouEntity->getNumber(), 2);
-        }
-        try {
-            $UserSignFugouEntity
-                ->setSurplus($surplus)
-                ->setSettlementTime(date('Y-m-d H:i:s'))
-                ->setStatus(UserSignFugouEnum::STATUS['Valid']['code']);
-            $userRepository->update($userEntity->getUid(), ['Fugou' => $surplus]);
-            $this->dao->update($UserSignFugouEntity->getId(), [
-                'surplus' => $UserSignFugouEntity->getSurplus(),
-                'settlement_time' => $UserSignFugouEntity->getSettlementTime(),
-                'status' => $UserSignFugouEntity->getStatus()
-            ]);
-        } catch (DbException $e) {
+            return false;
+        });
 
+        if (!empty($userSignFugouEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserSignFugouEntity[] $updateUserFugouEntityList */
+            $updateUserFugouEntityList = [];
+            foreach ($userSignFugouEntityList as $userSignFugouEntity) {
+
+                $userEntity = $userEntityMapByUid[$userSignFugouEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(FugouId:{$userSignFugouEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setFugou($userEntity->getFugou());
+
+                }
+                // 组建 账单 记录
+                if (isset($updateUserFugouEntityList[$userSignFugouEntity->getId()])) {
+                    $updateUserSignFugouEntity = $updateUserFugouEntityList[$userSignFugouEntity->getId()];
+                } else {
+                    /** @var UserSignFugouEntity $updateUserSignFugouEntity */
+                    $updateUserSignFugouEntity = UserSignFugouEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignFugouEntity
+                        ->setId($userSignFugouEntity->getId())
+                        ->setStatus(UserSignFugouEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+
+                if ($userSignFugouEntity->getType() == UserSignFugouEnum::TYPE['Consume']['code']) {
+                    // 支出
+                    $updateUserEntity->setFugou(bcsub($updateUserEntity->getFugou(), $userSignFugouEntity->getNumber(), 2));
+                    if ($updateUserEntity->getFugou() < 0.00) {
+                        throw new ValidateException('用户复购金不足');
+                    }
+                } else {
+                    $updateUserEntity->setFugou(bcadd($updateUserEntity->getFugou(), $userSignFugouEntity->getNumber(), 2));
+                }
+                $updateUserSignFugouEntity->setSurplus($updateUserEntity->getFugou());
+
+                $updateUserEntityList[$userSignFugouEntity->getUid()] = $updateUserEntity;
+                $updateUserFugouEntityList[$userSignFugouEntity->getId()] = $updateUserSignFugouEntity;
+            }
+            try {
+                if (!empty($updateUserEntityList)) {
+                    $userRepository->batchUpdateUserDataByDataList(
+                        array_map(function (UserEntity $updateUserEntity) {
+                            return $updateUserEntity->toUnderlineArray();
+                        }, $updateUserEntityList)
+                    );
+                }
+
+                if (!empty($updateUserFugouEntityList)) {
+                    $this->batchUpdateUserSignFugouDataByDataList(
+                        array_map(function (UserSignFugouEntity $updateUserSignFugouEntity) {
+                            return $updateUserSignFugouEntity->toUnderlineArray();
+                        }, $updateUserFugouEntityList)
+                    );
+                }
+            } catch (\Exception $e) {
+                throw new ValidateException('用户复购金结算失败');
+            }
         }
-        return $UserSignFugouEntity;
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignFugouDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
     }
 }

app/common/repositories/user/UserSignGongxianRepository.php

@@ -214,7 +214,7 @@ class UserSignGongxianRepository extends BaseRepository
                 );
             }
 
-            if (!empty($updateUserBillEntityList)) {
+            if (!empty($updateUserScoreEntityList)) {
                 $this->batchUpdateUserSignGongxianDataByDataList(
                     array_map(function (UserSignGongxianEntity $updateUserSignGongxianEntity) {
                         return $updateUserSignGongxianEntity->toUnderlineArray();

app/common/repositories/user/UserSignScoreRepository.php

@@ -228,8 +228,8 @@ class UserSignScoreRepository extends BaseRepository
                         }, $updateUserScoreEntityList)
                     );
                 }
-            } catch (DbException $e) {
-
+            } catch (\Exception $e) {
+                throw new ValidateException('用户积分结算失败');
             }
         }
         return $idList;

app/controller/admin/order/Order.php

@@ -331,4 +331,103 @@ class Order extends BaseController
         }
         return app('json')->fail('操作失败');
     }
+
+    /**
+     * 撤回订单,并撤回订单奖励
+     */
+    public function killOrderRewards(){
+        $group_order_id = request()->param('group_order_id');
+        $order_id = request()->param('order_id');
+        $uid = request()->param('uid');
+        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)->dec('score', $spreadScore)->update();
+                Db::name('user')->where('uid', $spreadUid)->dec('per_contribute', $spreadGongXian)->update();
+                Db::name('user')->where('uid', $spreadUid)->dec('annuity', $spreadYlj)->update();
+                Db::name('user')->where('uid', $spreadUid)->dec('brokerage_price', $spreadYongJin)->update();
+            }
+            //扫吗消费
+            $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');
+            //第二推荐
+            $spreadYongJinTwo = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '<>', $spreadUid],], 'number');
+            $spreadYongJinTwoUid = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '<>', $spreadUid],], 'uid');
+            //更新对应的user表
+            $user = Db::name('user')->where('uid', $uid)->find();
+            Db::name('backup_user')->insert($user);
+            Db::name('user')->where('uid', $uid)->dec('pv', $pv)->update();
+            Db::name('user')->where('uid', $uid)->inc('vr', $payVr)->update();
+            Db::name('user')->where('uid', $uid)->inc('score', $payScore)->update();
+            Db::name('user')->where('uid', $uid)->dec('score', $score)->update();
+            Db::name('user')->where('uid', $uid)->dec('contribute', $gongXian)->update();
+            Db::name('user')->where('uid', $uid)->dec('annuity', $yangLaoJin)->update();
+            //第二推荐
+            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();
+            }
+            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();
+            }
+            // 删除订单相关表
+            $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());
+        }
+        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();
+        }
+    }
+    private function getValue($table, array $where, string $field, $default = 0)
+    {
+        $value = Db::name($table)->where($where)->value($field);
+        return $value ?? $default;
+    }
 }

app/controller/admin/user/User.php

@@ -815,9 +815,19 @@ class User extends BaseController
     {
         $spread_account = $this->request->param('spread_account');
         $adminId = $this->request->adminId();
-        $mark = $this->getMark($adminId,'spread');
+        $adminInfo = $this->request->adminInfo();
+        $operation = $adminInfo['account'].'修改用户推荐人';
+        $mark = $this->request->param('mark');
+        if (!empty($mark)) {
+            $mark = "($mark)";
+        }
+        $mark = $operation.$mark;
         $olld_id = Db::name('user')->where('uid', $id)->value('spread_uid')??0;
-        if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId)){
+        $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
+        if(!$spread){
+            return app('json')->fail("推荐人信息不存在");
+        }
+        if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId,$spread)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");
@@ -849,14 +859,23 @@ class User extends BaseController
      * */
     public function changeProLevel($id,UserRepository $repository) {
         $level_account = $this->request->param('level_account');
-        $level_account_old = $this->request->param('level_account_old');
-        $account = explode('(', $level_account_old)[0];
+        $olld_id = Db::name('user')->where('uid', $id)->value('level_id')??0;
         $adminId = $this->request->adminId();
-        $mark = $this->getMark($adminId,'level');
+        $adminInfo = $this->request->adminInfo();
+        $operation = $adminInfo['account'].'修改用户节点人';
+        $mark = $this->request->param('mark');
+        if (!empty($mark)) {
+            $mark = "($mark)";
+        }
+        $mark = $operation.$mark;
+        $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
+        if(!$level){
+            return app('json')->fail("节点人信息不存在");
+        }
         if (!$id) {
             return app('json')->fail("参数丢失");
         }
-        if($repository->update_level_uid($id,$account,$level_account,$mark,$adminId)){
+        if($repository->update_level_uid($id,$olld_id,$level_account,$mark,$adminId,$level)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败"); }
@@ -874,11 +893,16 @@ class User extends BaseController
     }
     public function changeProGroup($id,UserRepository $repository)
     {
-        $adminId = $this->request->adminId();
         $old_identity_id = $this->request->param('old_identity_id');
         $new_identity_id = $this->request->param('new_identity_id');
         $adminId = $this->request->adminId();
-        $mark = $this->getMark($adminId,'identity');
+        $adminInfo = $this->request->adminInfo();
+        $operation = $adminInfo['account'].'修改用户身份';
+        $mark = $this->request->param('mark');
+        if (!empty($mark)) {
+            $mark = "($mark)";
+        }
+        $mark = $operation.$mark;
         if (empty($id) || empty($old_identity_id) || empty($new_identity_id)) {
             return app('json')->fail("参数丢失");
         }
@@ -2038,9 +2062,9 @@ class User extends BaseController
         $records = Db::name('user_identity_change_records')
             ->alias('r')
             ->join('user u', 'r.uid = u.uid', 'LEFT')
-            ->field('r.operation_id,r.old_identity_id,r.new_identity_id,r.mark,r.create_time,u.nickname,u.account');
+            ->field('r.operation_id,r.old_identity_id,r.uid,r.new_identity_id,r.mark,r.create_time,u.nickname,u.account');
             if($uid){
-                $records->where('uid', $uid);
+                $records->where('r.uid', $uid);
             }
             $query=$records
             ->order('create_time DESC')
@@ -2055,7 +2079,7 @@ class User extends BaseController
             ->alias('r')
             ->join('user u', 'u.uid = r.old_spread_id', 'LEFT')
             ->join('user ua', 'ua.uid = r.new_spread_id', 'LEFT')
-            ->field('r.operation_id,r.uid,u,account as old_account,ua.account as new_account,r.mark, r.create_time');
+            ->field('r.operation_id,r.uid,u.account as old_account,ua.account as new_account,r.mark, r.create_time');
 
         if ($uid) {
             $records->where('r.uid', $uid);
@@ -2100,47 +2124,4 @@ class User extends BaseController
             ->toArray();
         return app('json')->success($query, '获取成功');
     }
-    /**
-     * 通过后台管理员id和修改信息来区别默认备注
-     */
-    protected function getMark($adminId, string $type)
-    {
-        $mark = $this->request->param('mark');
-        if ($mark) {
-            return $mark;
-        }
-        $defaultMap = [
-            'spread'   => '后台管理员修改用户推荐人',
-            'level'     => '后台管理员修改用户节点人',
-            'identity' => '后台管理员修改用户身份',
-        ];
-        $markMap = [
-            'spread' => [
-                1 => 'admin修改用户推荐人',
-                10 => '商户+文章管理员修改用户推荐人',
-                25 => '运营管理员修改用户推荐人',
-                27 => '订单发货管理员修改用户推荐人',
-                28 => '财务管理员修改用户推荐人',
-                29 => '超级管理员修改用户推荐人',
-            ],
-            'node' => [
-                1 => 'admin修改用户节点人',
-                10 => '商户+文章管理员修改用户节点人',
-                25 => '运营管理员修改用户节点人',
-                27 => '订单发货管理员修改用户节点人',
-                28 => '财务管理员修改用户节点人',
-                29 => '超级管理员修改用户节点人',
-            ],
-            'identity' => [
-                1 => 'admin修改用户身份',
-                10 => '商户+文章管理员修改用户身份',
-                25 => '运营管理员修改用户身份',
-                27 => '订单发货管理员修改用户身份',
-                28 => '财务管理员修改用户身份',
-                29 => '超级管理员修改用户身份',
-            ]
-        ];
-        return $markMap[$type][$adminId] ?? ($defaultMap[$type] ?? '哈基米修改用户信息');
-    }
-
 }

app/controller/api/store/order/StoreOrder.php

@@ -20,8 +20,10 @@ use app\common\repositories\store\product\ProductAttrValueRepository;
 use app\common\repositories\user\UserAddressRepository;
 use app\common\repositories\user\UserRepository;
 use app\entity\data\user\UserEntity;
+use app\entity\request\api\store\order\CalculatePostageRequestEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use app\traits\ShouxinyiApiRequest;
+use app\validate\api\store\order\CalculatePostageValidate;
 use app\validate\api\store\order\StoreOrderCreateValidate;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreCartRepository;
@@ -1999,4 +2001,30 @@ class StoreOrder extends BaseController
     }
 
 
+    /**
+     * 计算运费
+     *
+     * @param CalculatePostageValidate $calculatePostageValidate
+     * @return mixed
+     */
+    public function calculatePostage(CalculatePostageValidate $calculatePostageValidate)
+    {
+        // 1、接收参数
+        $calculatePostageValidateResult = $calculatePostageValidate->validateRequest();
+        // 如果验证失败，返回错误
+        if ($calculatePostageValidateResult['status'] == 'error') {
+            return app('json')->fail($calculatePostageValidateResult['message']);
+        }
+
+        // 验证通过，继续处理数据
+        /** @var CalculatePostageRequestEntity $calculatePostageRequestEntity */
+        $calculatePostageRequestEntity = $calculatePostageValidateResult['data'];
+
+        // 2. 获取运费
+        $postage = $this->repository->getPostageByUniqueAndCityIdAndNum($calculatePostageRequestEntity);
+
+        return app('json')->success([
+            'postage' => $postage
+        ]);
+    }
 }

app/entity/data/user/UserBillEntity.php

@@ -6,49 +6,49 @@ use app\entity\data\DataEntity;
 
 class UserBillEntity extends DataEntity
 {
-    public $bill_id = null;           // 用户账单id
-    public $uid = null;               // 用户uid
-    public $link_id = null;           // 关联订单id
-    public $pm = null;                // 0 = 支出 1 = 获得
-    public $title = null;             // 账单标题
-    public $category = null;          // 明细种类
-    public $type = null;              // 明细类型 commission佣金
-    public $number = null;            // 明细数字
-    public $balance = null;           // 剩余
-    public $mark = null;              // 备注
-    public $create_time = null;       // 添加时间
-    public $status = null;            // 0 = 待确定 1 = 有效 -1 = 无效
-    public $commission_type = null;   // 佣金类型
-    public $order_sn = null;          // 订单号
-    public $tripartite = null;        // 三方支付类型
-    public $type_shop = null;         // 平台或店铺类型
-    public $mer_id = null;            // 商户id
-    public $source = null;            // 1 线下 0线上
-    public $order_type = null;        // 订单类型 1自营 2 第三方
-    public $is_red_brokerage = null;  // 红积分对冲佣金 0正常佣金
-    public $gzc = null;               // 养老金是否已进入公证处log表
-    public $is_gzc = null;            // 养老金是否发起过
-    public $take_time = null;         // 结算时间
-    public $district_id = null;       // 区域ID
-    public $street_id = null;         // 街道ID
-    public $month = null;             // 月份
-    public $num = null;               // 份数
+    public $billId = null;  // 用户账单id
+    public $uid = null;  // 用户uid
+    public $linkId = null;  // 关联订单id
+    public $pm = null;  // 0 = 支出 1 = 获得
+    public $title = null;  // 账单标题
+    public $category = null;  // 明细种类
+    public $type = null;  // 明细类型
+    public $number = null;  // 明细数字
+    public $balance = null;  // 剩余
+    public $mark = null;  // 备注
+    public $createTime = null;  // 添加时间
+    public $status = null;  // 0 = 待确定 1 = 有效 -1 = 无效
+    public $commissionType = null;  // 佣金类型
+    public $orderSn = null;  // 订单号
+    public $tripartite = null;
+    public $typeShop = null;  // 0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上 9话费
+    public $merId = null;  // 商户id
+    public $source = null;  // 1 线下 0线上
+    public $orderType = null;  // 1自营 2 第三方 订单类型
+    public $isRedBrokerage = null;  // 1红积分对冲佣金 0正常佣金
+    public $gzc = null;  // 养老金是否已进入公证处log表0：未进入。1：已进入
+    public $isGzc = null;  // 0：未发起 1：已发起 2：已成功
+    public $takeTime = null;  // 结算时间
+    public $districtId = null;
+    public $streetId = null;
+    public $month = null;  // 月份
+    public $num = null;  // 份数
 
     /**
      * @return mixed
      */
     public function getBillId()
     {
-        return $this->bill_id;
+        return $this->billId;
     }
 
     /**
-     * @param mixed $bill_id
+     * @param mixed $billId
      * @return UserBillEntity
      */
-    public function setBillId($bill_id): UserBillEntity
+    public function setBillId($billId): UserBillEntity
     {
-        $this->bill_id = $bill_id;
+        $this->billId = $billId;
         return $this;
     }
 
@@ -75,16 +75,16 @@ class UserBillEntity extends DataEntity
      */
     public function getLinkId()
     {
-        return $this->link_id;
+        return $this->linkId;
     }
 
     /**
-     * @param mixed $link_id
+     * @param mixed $linkId
      * @return UserBillEntity
      */
-    public function setLinkId($link_id): UserBillEntity
+    public function setLinkId($linkId): UserBillEntity
     {
-        $this->link_id = $link_id;
+        $this->linkId = $linkId;
         return $this;
     }
 
@@ -219,16 +219,16 @@ class UserBillEntity extends DataEntity
      */
     public function getCreateTime()
     {
-        return $this->create_time;
+        return $this->createTime;
     }
 
     /**
-     * @param mixed $create_time
+     * @param mixed $createTime
      * @return UserBillEntity
      */
-    public function setCreateTime($create_time): UserBillEntity
+    public function setCreateTime($createTime): UserBillEntity
     {
-        $this->create_time = $create_time;
+        $this->createTime = $createTime;
         return $this;
     }
 
@@ -255,16 +255,16 @@ class UserBillEntity extends DataEntity
      */
     public function getCommissionType()
     {
-        return $this->commission_type;
+        return $this->commissionType;
     }
 
     /**
-     * @param mixed $commission_type
+     * @param mixed $commissionType
      * @return UserBillEntity
      */
-    public function setCommissionType($commission_type): UserBillEntity
+    public function setCommissionType($commissionType): UserBillEntity
     {
-        $this->commission_type = $commission_type;
+        $this->commissionType = $commissionType;
         return $this;
     }
 
@@ -273,16 +273,16 @@ class UserBillEntity extends DataEntity
      */
     public function getOrderSn()
     {
-        return $this->order_sn;
+        return $this->orderSn;
     }
 
     /**
-     * @param mixed $order_sn
+     * @param mixed $orderSn
      * @return UserBillEntity
      */
-    public function setOrderSn($order_sn): UserBillEntity
+    public function setOrderSn($orderSn): UserBillEntity
     {
-        $this->order_sn = $order_sn;
+        $this->orderSn = $orderSn;
         return $this;
     }
 
@@ -309,16 +309,16 @@ class UserBillEntity extends DataEntity
      */
     public function getTypeShop()
     {
-        return $this->type_shop;
+        return $this->typeShop;
     }
 
     /**
-     * @param mixed $type_shop
+     * @param mixed $typeShop
      * @return UserBillEntity
      */
-    public function setTypeShop($type_shop): UserBillEntity
+    public function setTypeShop($typeShop): UserBillEntity
     {
-        $this->type_shop = $type_shop;
+        $this->typeShop = $typeShop;
         return $this;
     }
 
@@ -327,16 +327,16 @@ class UserBillEntity extends DataEntity
      */
     public function getMerId()
     {
-        return $this->mer_id;
+        return $this->merId;
     }
 
     /**
-     * @param mixed $mer_id
+     * @param mixed $merId
      * @return UserBillEntity
      */
-    public function setMerId($mer_id): UserBillEntity
+    public function setMerId($merId): UserBillEntity
     {
-        $this->mer_id = $mer_id;
+        $this->merId = $merId;
         return $this;
     }
 
@@ -363,16 +363,16 @@ class UserBillEntity extends DataEntity
      */
     public function getOrderType()
     {
-        return $this->order_type;
+        return $this->orderType;
     }
 
     /**
-     * @param mixed $order_type
+     * @param mixed $orderType
      * @return UserBillEntity
      */
-    public function setOrderType($order_type): UserBillEntity
+    public function setOrderType($orderType): UserBillEntity
     {
-        $this->order_type = $order_type;
+        $this->orderType = $orderType;
         return $this;
     }
 
@@ -381,16 +381,16 @@ class UserBillEntity extends DataEntity
      */
     public function getIsRedBrokerage()
     {
-        return $this->is_red_brokerage;
+        return $this->isRedBrokerage;
     }
 
     /**
-     * @param mixed $is_red_brokerage
+     * @param mixed $isRedBrokerage
      * @return UserBillEntity
      */
-    public function setIsRedBrokerage($is_red_brokerage): UserBillEntity
+    public function setIsRedBrokerage($isRedBrokerage): UserBillEntity
     {
-        $this->is_red_brokerage = $is_red_brokerage;
+        $this->isRedBrokerage = $isRedBrokerage;
         return $this;
     }
 
@@ -417,16 +417,16 @@ class UserBillEntity extends DataEntity
      */
     public function getIsGzc()
     {
-        return $this->is_gzc;
+        return $this->isGzc;
     }
 
     /**
-     * @param mixed $is_gzc
+     * @param mixed $isGzc
      * @return UserBillEntity
      */
-    public function setIsGzc($is_gzc): UserBillEntity
+    public function setIsGzc($isGzc): UserBillEntity
     {
-        $this->is_gzc = $is_gzc;
+        $this->isGzc = $isGzc;
         return $this;
     }
 
@@ -435,16 +435,16 @@ class UserBillEntity extends DataEntity
      */
     public function getTakeTime()
     {
-        return $this->take_time;
+        return $this->takeTime;
     }
 
     /**
-     * @param mixed $take_time
+     * @param mixed $takeTime
      * @return UserBillEntity
      */
-    public function setTakeTime($take_time): UserBillEntity
+    public function setTakeTime($takeTime): UserBillEntity
     {
-        $this->take_time = $take_time;
+        $this->takeTime = $takeTime;
         return $this;
     }
 
@@ -453,16 +453,16 @@ class UserBillEntity extends DataEntity
      */
     public function getDistrictId()
     {
-        return $this->district_id;
+        return $this->districtId;
     }
 
     /**
-     * @param mixed $district_id
+     * @param mixed $districtId
      * @return UserBillEntity
      */
-    public function setDistrictId($district_id): UserBillEntity
+    public function setDistrictId($districtId): UserBillEntity
     {
-        $this->district_id = $district_id;
+        $this->districtId = $districtId;
         return $this;
     }
 
@@ -471,16 +471,16 @@ class UserBillEntity extends DataEntity
      */
     public function getStreetId()
     {
-        return $this->street_id;
+        return $this->streetId;
     }
 
     /**
-     * @param mixed $street_id
+     * @param mixed $streetId
      * @return UserBillEntity
      */
-    public function setStreetId($street_id): UserBillEntity
+    public function setStreetId($streetId): UserBillEntity
     {
-        $this->street_id = $street_id;
+        $this->streetId = $streetId;
         return $this;
     }
 

app/entity/request/api/store/order/CalculatePostageRequestEntity.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace app\entity\request\api\store\order;
+
+use app\entity\request\RequestCommonEntity;
+
+class CalculatePostageRequestEntity extends RequestCommonEntity
+{
+    // 收货地址 城市ID
+    public $cityId = 0;
+    // 商品ID
+    public $unique = '';
+    // 购买数量
+    public $num = 0;
+
+    /**
+     * @return int
+     */
+    public function getCityId(): int
+    {
+        return $this->cityId;
+    }
+
+    /**
+     * @param int $cityId
+     * @return CalculatePostageRequestEntity
+     */
+    public function setCityId(int $cityId): CalculatePostageRequestEntity
+    {
+        $this->cityId = $cityId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUnique(): string
+    {
+        return $this->unique;
+    }
+
+    /**
+     * @param string $unique
+     * @return CalculatePostageRequestEntity
+     */
+    public function setUnique(string $unique): CalculatePostageRequestEntity
+    {
+        $this->unique = $unique;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getNum(): int
+    {
+        return $this->num;
+    }
+
+    /**
+     * @param int $num
+     * @return CalculatePostageRequestEntity
+     */
+    public function setNum(int $num): CalculatePostageRequestEntity
+    {
+        $this->num = $num;
+        return $this;
+    }
+}

app/validate/api/store/order/CalculatePostageValidate.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace app\validate\api\store\order;
+
+use app\entity\request\api\store\order\CalculatePostageRequestEntity;
+use app\validate\CommonValidate;
+use think\facade\Log;
+
+class CalculatePostageValidate extends CommonValidate
+{
+
+    protected $rule = [
+        'cityId' => 'require|integer|egt:0',
+        'unique' => 'require',
+        'num' => 'require|integer|gt:0'
+    ];
+
+    protected $message = [
+        'cityId.require' => '城市ID不能为空！',
+        'cityId.integer' => '城市ID必须是整数！',
+        'cityId.egt' => '城市ID必须大于等于0！',
+        'unique.require' => '唯一标识不能为空！',
+        'num.require' => '购买数量不能为空！',
+        'num.integer' => '购买数量必须是整数！',
+        'num.gt' => '购买数量必须大于0！'
+    ];
+
+    /**
+     * 将Request参数获取与验证封装到验证类中
+     *
+     * @return array
+     */
+    public function validateRequest(): array
+    {
+        $data = $this->request->param();
+        Log::info('request-api-store-order-CalculatePostage-params：' . json_encode($data));
+        if (!$this->check($data)) {
+            return ['status' => 'error', 'message' => $this->getError()];
+        }
+        return ['status' => 'success', 'data' => CalculatePostageRequestEntity::newInstance($data)];
+    }
+}

route/admin.php

@@ -980,6 +980,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('dhm_list/lst', 'RefundOrder/dhm_list')->name('systemRefundOrderDhmLst');
             Route::get('dhm_status', 'RefundOrder/dhm_status')->name('systemRefundOrderDhmStatus');
             Route::get('excel', 'Order/Excel')->name('systemOrderExcel');
+            Route::post('killOrderRewards', 'Order/killOrderRewards');
         })->prefix('admin.order.');
 
         //第三方订单

route/api.php

@@ -85,6 +85,8 @@ Route::group('api/', function () {
             Route::post('tests/:order_sn', '/tests');
             Route::post('create', '/createOrder');//创建订单
             Route::post('createNew', '/createOrderNew');//创建订单
+            // 通过 商品ID 商品数量 ，使用商品选用的运费模板 计算邮费
+            Route::get('calculatePostage', '/calculatePostage');
             Route::post('delete', '/delete');//删除订单
             Route::post('create_annual_cost', '/create_annual_costorder');
             Route::post('create_activation_code_order', '/create_activation_code_order');
@@ -1328,6 +1330,11 @@ Route::get('test_external', 'api.store.merchant.Taskorderlianc/getUserPoints');
 Route::any('/share', function () {
     return view(app()->getRootPath() . 'public/share/register.html');
 });
+
+Route::any('/scrn', function () {
+    return view(app()->getRootPath() . 'public/scrn/index.html');
+});
+
 Route::any('/', function () {
     $DB = DIRECTORY_SEPARATOR;