优化用户下单方法-进行中

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

@@ -14,6 +14,8 @@ namespace app\common\dao\store\order;
 use app\common\dao\BaseDao;
 use app\common\model\BaseModel;
 use app\common\model\store\order\StoreCart;
+use app\entity\CommonEntity;
+use app\entity\data\store\CartEntity;
 use think\Collection;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -155,4 +157,20 @@ class StoreCartDao extends BaseDao
         })->leftJoin('StoreOrderProduct B', 'A.cart_id = B.cart_id')
             ->field('sum(B.product_num) as pay_num,sum(B.product_price) as pay_price,A.source_id')->group('A.source_id')->select();
     }
+
+    /**
+     * @param int $cartId
+     * @return CommonEntity
+     */
+    public function getCartEntityByCartId(int $cartId): CommonEntity
+    {
+        $storeCartData = [];
+        try {
+            $storeCartData = Db::name('store_cart')
+                ->where('cart_id', $cartId)
+                ->find();
+        } catch (\Exception $e) {
+        }
+        return CartEntity::newInstance($storeCartData);
+    }
 }

app/common/dao/user/UserDao.php

@@ -12,9 +12,12 @@ namespace app\common\dao\user;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserEnum;
 use app\common\model\BaseModel;
 use app\common\model\user\User;
 use app\common\repositories\user\UserRepository;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserEntity;
 use think\db\BaseQuery;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -376,4 +379,22 @@ class UserDao extends BaseDao
     {
         return User::getDB()->where('phone', $phone)->field('uid,nickname,avatar,user_type')->select();
     }
+
+    /**
+     * @param $uid
+     * @return CommonEntity
+     */
+    public function getUserEntityByUid($uid): CommonEntity
+    {
+        $userData = [];
+        try {
+            $userData = User::getDB()
+                ->where('uid', $uid)
+                ->where('is_del', '=', UserEnum::IS_DEL['No']['code'])
+                ->where('status', '=', UserEnum::STATUS['Normal']['code'])
+                ->find();
+        } catch (\Exception $e) {
+        }
+        return UserEntity::newInstance($userData);
+    }
 }

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

@@ -16,6 +16,7 @@ use app\common\repositories\BaseRepository;
 use app\common\repositories\store\coupon\StoreCouponProductRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\product\ProductRepository;
+use app\entity\data\store\CartEntity;
 use think\facade\Db;
 
 /**
@@ -120,4 +121,16 @@ class StoreCartRepository extends BaseRepository
         ];
         return $this->dao->getWhereCount($where);
     }
+
+    /**
+     * 根据 购物车 ID 获取购物车实体
+     * @param int $cartId
+     * @return CartEntity
+     */
+    public function getCartEntityByCartId(int $cartId): CartEntity
+    {
+        /** @var CartEntity $cartEntity */
+        $cartEntity = $this->dao->getCartEntityByCartId($cartId);
+        return $cartEntity;
+    }
 }

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

@@ -38,6 +38,9 @@ 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\store\CartEntity;
+use app\entity\data\user\UserEntity;
+use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use app\model\common\JdOrderModel;
 use app\model\common\TbOrderModel;
 use app\traits\GongApiRequest;
@@ -1414,6 +1417,12 @@ class StoreOrderRepository extends BaseRepository
         return $group;
     }
 
+
+    public function createOrderNew(StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity, UserEntity $userEntity, CartEntity $cartEntity)
+    {
+
+    }
+
     /**
      * @remarks 年费订单创建
      * @author Tang

app/common/repositories/user/UserRepository.php

@@ -26,6 +26,7 @@ use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\controller\api\store\product\Jd;
 use app\controller\api\store\product\Vip;
 use app\controller\api\user\Im;
+use app\entity\data\user\UserEntity;
 use app\traits\GzcApiRequest;
 use crmeb\exceptions\AuthException;
 use crmeb\jobs\SendNewPeopleCouponJob;
@@ -4369,4 +4370,15 @@ class UserRepository extends BaseRepository
             Elm::number('pack','份数',$stock['pack'])->required()
         ])->setTitle('编辑');
     }
+
+    /**
+     * @param int $uid
+     * @return UserEntity
+     */
+    public function getUserEntityByUid(int $uid): UserEntity
+    {
+        /** @var UserEntity $userEntity */
+        $userEntity = $this->dao->getUserEntityByUid($uid);
+        return $userEntity;
+    }
 }

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

@@ -18,8 +18,10 @@ use app\common\repositories\merchant\MerchantRepository;
 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\StoreOrderCreateRequestEntity;
 use app\traits\ShouxinyiApiRequest;
-use app\validate\api\store\order\CreateValidate;
+use app\validate\api\store\order\StoreOrderCreateValidate;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreCartRepository;
 use app\common\repositories\store\order\StoreGroupOrderRepository;
@@ -694,72 +696,95 @@ class StoreOrder extends BaseController
     }
 
     /**
-     * @param CreateValidate $createValidate
+     * @param StoreOrderCreateValidate $storeOrderCreateValidate
      * @return false|string|\think\response\Json
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
      * @throws \Throwable
      */
-    public function createOrderNew(CreateValidate $createValidate)
+    public function createOrderNew(StoreOrderCreateValidate $storeOrderCreateValidate)
     {
         // 1、接收参数
-        $validationResult = $createValidate->validateRequest();
+        $storeOrderCreateValidateResult = $storeOrderCreateValidate->validateRequest();
         // 如果验证失败，返回错误
-        if ($validationResult['status'] == 'error') {
-            return json($validationResult);
+        if ($storeOrderCreateValidateResult['status'] == 'error') {
+            return app('json')->fail($storeOrderCreateValidateResult['message']);
         }
         // 验证通过，继续处理数据
-        $allParams = $validationResult['data'];
+        /** @var StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity */
+        $storeOrderCreateRequestEntity = $storeOrderCreateValidateResult['data'];
+        // 根据用户ID 获取用户实体信息
+        $uid = $this->request->uid();
 
+        // 2、加锁，他之前加的锁好像在锁狗屎，毛线都没锁住, 而且为什么要锁用户
+        // 增加锁，防止同一用户重读点击
+        // $redisHandler = Cache::store('redis')->handler();
+        // $isSet = $redisHandler->set('createOrder' . $uid . '-' . $storeOrderCreateRequestEntity->getCartId(), 1, ['nx', 'ex' => 30]);
+        // if ($isSet) {
+        //     return app('json')->fail('请勿重复下单');
+        // }
 
-        $allParams = input();
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $userEntity = $userRepository->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            return app('json')->fail('获取当前用户信息失败');
+        }
 
-        $cartId = $allParams['cart_id'] ?? null;
-        if (is_null($cartId)) {
-            return app('json')->fail("缺少购物车ID参数!");
+        /** @var StoreCartRepository $storeCartRepository */
+        $storeCartRepository = app()->make(StoreCartRepository::class);
+        $cartEntity = $storeCartRepository->getCartEntityByCartId($storeOrderCreateRequestEntity->getCartId());
+        if (empty($cartEntity->getCartId())) {
+            return app('json')->fail('获取购物车内容失败');
         }
-        $fzonePayType = $allParams['fzone_paytype'] ?? '[]';
-        if (is_null($fzonePayType) || strstr($fzonePayType, "type") === false) {
-            return app('json')->fail("请选择支付方式!");
+        // 确认购物车内 微唯宝 的商品 是否满足发货
+        /** @var ProductAttrValueRepository $productAttrValueRepository */
+        $productAttrValueRepository = app()->make(ProductAttrValueRepository::class);
+        // 检查库存 查看 此商品已下架 此商品规格无货 此商品不支持该地区
+        // （按照代码中所写的逻辑来推理：从微唯宝拉取过来，从而上架到商品表的商品，都有SPUId，所以去走微唯宝提供的接口验证，而会员专区和商贸区的商品可能是商户自己加的，没有SPUId，所以也就不用走微唯宝的验证）
+        $checkGong = $productAttrValueRepository->checkGong($cartEntity->getProductId(), $cartEntity->getProductAttrUnique(), $cartEntity->getCartNum(), $uid, $storeOrderCreateRequestEntity->getAddressId());
+        if (isset($checkGong['code']) && $checkGong['code'] == -1) {
+            return app('json')->fail($checkGong['message']);
         }
-        $fzonePayTypeMap = json_decode($fzonePayType, true);
+
+
+        $this->repository->createOrderNew($storeOrderCreateRequestEntity, $userEntity, $cartEntity);
+        
+        
+        return app('json')->success('aaa', $storeOrderCreateRequestEntity);
+        $uid = $this->request->uid();
+
+        $this->repository->createOrderNew($uid, $allParams);
+
+
+        $allParams = input();
+
+        $cartId = $allParams['cart_id'];
+
+        $fzonePayType = $allParams['fzone_paytype'];
+        $fzonePayTypeMap = $allParams['fzone_paytype'];
         $addressId = (int)($allParams['address_id'] ?? 0); // 地址ID
 
         $payType = $this->request->param('pay_type');// 5积分 6京豆
         $share_id = $this->request->param('share_id', '');//分享id
         $mer_id = $this->request->param('mer_id', '');//分享id
-        $uid = $this->request->uid();
+        // 声明 引用
+
 
-        // 验证用户信息
-        try {
-            $userData = Db::name('user')
-                ->where('uid', $uid)
-                ->where('is_del', '=', UserEnum::IS_DEL['No']['code'])
-                ->find();
-        } catch (\Exception $e) {
-            return app('json')->fail('获取当前用户信息失败');
-        }
 
-        // 2、加锁，他之前加的锁好像在锁狗屎，毛线都没锁住, 而且为什么要锁用户
-        // 增加锁，防止同一用户重读点击
-        $redisHandler = Cache::store('redis')->handler();
-        $isSet = $redisHandler->set('createOrder' . $uid . '-' . $cartId, 1, ['nx', 'ex' => 30]);
-        if ($isSet) {
-            return app('json')->fail('请勿重复下单');
-        }
 
         // 3、验证购物车内商品 是否已下架，是否无货，是否支持发货 是否满足数量
         // 处理购物车 按照之前需求的意思，应该 每次下单 只能购买 一个SPU 的 一个SKU，而且只能买一件
         //在提交订单之前会产出购物车cartid，其中会产生购买的数量，现在默认会员专区是只让购买一个商品，需要修改值为1
-        try {
-            $storeCartDataList = Db::name('store_cart')
-                ->where('cart_id', $cartId)
-                ->select()
-                ->toArray();
-        } catch (\Exception $e) {
-            return app('json')->fail('获取购物车内容失败');
-        }
+        // try {
+        //     $storeCartDataList = Db::name('store_cart')
+        //         ->where('cart_id', $cartId)
+        //         ->select()
+        //         ->toArray();
+        // } catch (\Exception $e) {
+        //     return app('json')->fail('获取购物车内容失败');
+        // }
         // 这块 限制还 欠完善考虑
         if (count($storeCartDataList) > 1 || $storeCartDataList[0]['cart_num'] > 1) {
             return app('json')->fail('购买数量默认为一件，请修改购买数量!');

app/entity/CommonEntity.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace app\entity;
+
+use ReflectionClass;
+
+class CommonEntity
+{
+    /**
+     * 将 参数 实例化到 实体
+     * @param array $data
+     * @return CommonEntity
+     */
+    public static function newInstance(array $data = []): CommonEntity
+    {
+        if (empty($data)) {
+            return new static();
+        } else {
+            $instance = new static();
+            foreach ($instance as $ik => $iv) {
+                if (isset($data[$ik])) {
+                    $setFunctionName = 'set' . ucfirst($ik);
+                    $instance->$setFunctionName($data[$ik]);
+                }
+            }
+            return $instance;
+        }
+    }
+
+    /**
+     * 声明公共方法 将实体 转成数组
+     * @return array
+     */
+    public function toArray(): array
+    {
+        $data = [];
+        try {
+            $ref = new ReflectionClass(static::class);
+            foreach ($ref->getProperties() as $property) {
+                $p = $ref->getProperty($property->name);
+                $p->setAccessible(true);
+                $data[$property->name] = $p->getValue($this);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $data;
+    }
+}

app/entity/data/DataEntity.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\entity\data;
+
+use app\entity\CommonEntity;
+
+class DataEntity extends CommonEntity
+{
+
+}

app/entity/data/store/CartEntity.php

@@ -0,0 +1,184 @@
+<?php
+
+namespace app\entity\data\store;
+
+use app\entity\data\DataEntity;
+
+class CartEntity extends DataEntity
+{
+    public $cartId = 0;  // 购物车表ID
+    public $uid = 0;  // 用户ID
+    public $merId = 0;  // 商户ID
+    public $productType = 0;  // 类型 0=普通产品
+    public $productId = 0;  // 商品ID
+    public $productAttrUnique = '';  // 商品属性
+    public $cartNum = 0;  // 商品数量
+    public $createTime = null;  // 添加时间
+    public $source = 0;  // 来源 1=直播间
+    public $sourceId = 0;  // 来源关联ID
+    public $isPay = 0;  // 0 = 未购买 1 = 已购买
+    public $isDel = 0;  // 是否删除
+    public $isNew = 0;  // 是否为立即购买
+    public $isFail = 0;  // 是否失效
+
+    public function getCartId(): int
+    {
+        return $this->cartId;
+    }
+
+    public function setCartId(int $cartId): CartEntity
+    {
+        $this->cartId = $cartId;
+        return $this;
+    }
+
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    public function setUid(int $uid): CartEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    public function getMerId(): int
+    {
+        return $this->merId;
+    }
+
+    public function setMerId(int $merId): CartEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+
+    public function getProductType(): int
+    {
+        return $this->productType;
+    }
+
+    public function setProductType(int $productType): CartEntity
+    {
+        $this->productType = $productType;
+        return $this;
+    }
+
+    public function getProductId(): int
+    {
+        return $this->productId;
+    }
+
+    public function setProductId(int $productId): CartEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    public function getProductAttrUnique(): string
+    {
+        return $this->productAttrUnique;
+    }
+
+    public function setProductAttrUnique(string $productAttrUnique): CartEntity
+    {
+        $this->productAttrUnique = $productAttrUnique;
+        return $this;
+    }
+
+    public function getCartNum(): int
+    {
+        return $this->cartNum;
+    }
+
+    public function setCartNum(int $cartNum): CartEntity
+    {
+        $this->cartNum = $cartNum;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param null $createTime
+     * @return CartEntity
+     */
+    public function setCreateTime($createTime)
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    public function getSource(): int
+    {
+        return $this->source;
+    }
+
+    public function setSource(int $source): CartEntity
+    {
+        $this->source = $source;
+        return $this;
+    }
+
+    public function getSourceId(): int
+    {
+        return $this->sourceId;
+    }
+
+    public function setSourceId(int $sourceId): CartEntity
+    {
+        $this->sourceId = $sourceId;
+        return $this;
+    }
+
+    public function getIsPay(): int
+    {
+        return $this->isPay;
+    }
+
+    public function setIsPay(int $isPay): CartEntity
+    {
+        $this->isPay = $isPay;
+        return $this;
+    }
+
+    public function getIsDel(): int
+    {
+        return $this->isDel;
+    }
+
+    public function setIsDel(int $isDel): CartEntity
+    {
+        $this->isDel = $isDel;
+        return $this;
+    }
+
+    public function getIsNew(): int
+    {
+        return $this->isNew;
+    }
+
+    public function setIsNew(int $isNew): CartEntity
+    {
+        $this->isNew = $isNew;
+        return $this;
+    }
+
+    public function getIsFail(): int
+    {
+        return $this->isFail;
+    }
+
+    public function setIsFail(int $isFail): CartEntity
+    {
+        $this->isFail = $isFail;
+        return $this;
+    }
+}

app/entity/request/RequestCommonEntity.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\entity\request;
+
+use app\entity\CommonEntity;
+
+class RequestCommonEntity extends CommonEntity
+{
+
+}

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

@@ -0,0 +1,93 @@
+<?php
+
+namespace app\entity\request\api\store\order;
+
+use app\entity\request\RequestCommonEntity;
+
+class StoreOrderCreateRequestEntity extends RequestCommonEntity
+{
+    public $cartId = 0;
+    public $addressId = 0;
+    public $payType = 0;
+    public $mark = '';
+    public $distributionMode = 0;
+    public $fzonePayType = [];
+    public $shareId = 0;
+
+    public function getCartId(): int
+    {
+        return $this->cartId;
+    }
+
+    public function setCartId(int $cartId): StoreOrderCreateRequestEntity
+    {
+        $this->cartId = $cartId;
+        return $this;
+    }
+
+    public function getAddressId(): int
+    {
+        return $this->addressId;
+    }
+
+    public function setAddressId(int $addressId): StoreOrderCreateRequestEntity
+    {
+        $this->addressId = $addressId;
+        return $this;
+    }
+
+    public function getPayType(): int
+    {
+        return $this->payType;
+    }
+
+    public function setPayType(int $payType): StoreOrderCreateRequestEntity
+    {
+        $this->payType = $payType;
+        return $this;
+    }
+
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    public function setMark(string $mark): StoreOrderCreateRequestEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    public function getDistributionMode(): int
+    {
+        return $this->distributionMode;
+    }
+
+    public function setDistributionMode(int $distributionMode): StoreOrderCreateRequestEntity
+    {
+        $this->distributionMode = $distributionMode;
+        return $this;
+    }
+
+    public function getFzonePayType(): array
+    {
+        return $this->fzonePayType;
+    }
+
+    public function setFzonePayType(array $fzonePayType): StoreOrderCreateRequestEntity
+    {
+        $this->fzonePayType = $fzonePayType;
+        return $this;
+    }
+
+    public function getShareId(): int
+    {
+        return $this->shareId;
+    }
+
+    public function setShareId(int $shareId): StoreOrderCreateRequestEntity
+    {
+        $this->shareId = $shareId;
+        return $this;
+    }
+}

app/utils/ArrayUtil.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace app\utils;
+
+class ArrayUtil
+{
+    /**
+     * 将数组内的 keys下划线转驼峰
+     *
+     * @param array $arr
+     * @param string $separator
+     *
+     * @return array
+     */
+    public static function underline2CamelArr(array $arr, string $separator = '_'): array
+    {
+        $result = [];
+        if (!empty($arr)) {
+            foreach ($arr as $words => $value) {
+                if (strpos($words, $separator) !== false) {
+                    $words = $separator . str_replace($separator, " ", strtolower($words));
+                    $result[ltrim(str_replace(" ", "", ucwords($words)), $separator)] = $value;
+                } else {
+                    $result[$words] = $value;
+                }
+            }
+        }
+        return $result;
+    }
+}

app/utils/StringUtil.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\utils;
+class StringUtil
+{
+
+    /**
+     * 下划线转驼峰
+     *
+     * @param $words
+     * @param string $separator
+     *
+     * @return string
+     */
+    public static function underline2Camel($words, string $separator = '_'): string
+    {
+        if (strpos($words, $separator) !== false) {
+            $words = $separator . str_replace($separator, " ", strtolower($words));
+            return ltrim(str_replace(" ", "", ucwords($words)), $separator);
+        } else {
+            return $words;
+        }
+    }
+
+    /**
+     * 驼峰命名转下划线命名
+     *
+     * @param $camelCaps
+     * @param string $separator
+     *
+     * @return string
+     */
+    public static function camel2Underline($camelCaps, string $separator = '_'): string
+    {
+        return strtolower(preg_replace('/([a-z])([A-Z])/', "$1" . $separator . "$2", $camelCaps));
+    }
+}

app/validate/CommonValidate.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\validate;
+
+use app\Request;
+use think\Validate;
+
+class CommonValidate extends Validate
+{
+    protected $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+        parent::__construct();
+    }
+
+    // 自定义验证规则：验证是否为有效的JSON格式
+    protected function isJson($value): bool
+    {
+        json_decode($value);
+        return (json_last_error() == JSON_ERROR_NONE);
+    }
+}

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

@@ -2,42 +2,37 @@
 
 namespace app\validate\api\store\order;
 
-use app\Request;
+use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
+use app\utils\ArrayUtil;
+use app\validate\CommonValidate;
 use think\facade\Log;
-use think\Validate;
 
-class CreateValidate extends Validate
+class StoreOrderCreateValidate extends CommonValidate
 {
-    protected $request;
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-        parent::__construct();
-    }
 
     protected $rule = [
         'cart_id' => 'require|integer',
-        'fzone_paytype' => 'require|json',
+        'fzone_paytype' => 'require',
         'address_id' => 'require|integer|gt:0',
         'pay_type' => 'require|integer',
-        'share_id' => 'integer',  // share_id 变为非必填项
+        'share_id' => 'integer',
+        'mark' => 'string'
     ];
 
     protected $message = [
-        'cart_id.require' => '购物车ID不能为空！',
+        'cart_id.require' => '缺少购物车ID参数!',
         'cart_id.integer' => '购物车ID必须是整数！',
         'fzone_paytype.require' => '支付方式不能为空！',
-        'fzone_paytype.json' => '支付方式必须是有效的JSON格式！',
+        // 'fzone_paytype.string' => '支付方式必须是字符串！',
         'address_id.require' => '地址ID不能为空！',
         'address_id.integer' => '地址ID必须是整数！',
         'address_id.gt' => '地址ID必须大于0！',
         'pay_type.require' => '支付方式不能为空！',
         'pay_type.integer' => '支付方式类型错误！',
-        'share_id.integer' => 'share_id 必须是整数！',  // 错误信息，适用于share_id
+        'share_id.integer' => 'share_id 必须是整数！',
+        'mark.string' => '备注类型错误'
     ];
 
-
     /**
      * 将Request参数获取与验证封装到验证类中
      *
@@ -50,6 +45,13 @@ class CreateValidate extends Validate
         if (!$this->check($data)) {
             return ['status' => 'error', 'message' => $this->getError()];
         }
-        return ['status' => 'success', 'data' => $data];
+        var_dump($data);
+
+        $data['fzonePayType'] = json_decode($data['fzone_paytype'], true);
+        if (empty($data['fzonePayType']['type'] ?? null)) {
+            return ['status' => 'error', 'message' => '请选择支付方式!'];
+        }
+        $data = ArrayUtil::underline2CamelArr($data);
+        return ['status' => 'success', 'data' => StoreOrderCreateRequestEntity::newInstance($data)];
     }
 }

route/api.php

@@ -82,6 +82,7 @@ Route::group('api/', function () {
             Route::post('check', '/checkOrder');
             Route::post('tests/:order_sn', '/tests');
             Route::post('create', '/createOrder');//创建订单
+            Route::post('createNew', '/createOrderNew');//创建订单
             Route::post('delete', '/delete');//删除订单
             Route::post('create_annual_cost', '/create_annual_costorder');
             Route::post('create_activation_code_order', '/create_activation_code_order');
@@ -1304,9 +1305,9 @@ Route::group('api/', function () {
     ->middleware(\app\common\middleware\InstallMiddleware::class)
     ->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_guquan', 'api.store.merchant.Taskorderguquan/lst6');
-//Route::get('test_lianchuang', 'api.store.merchant.Taskorderlianc/lst2');
+Route::get('test_hehuoren', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
+Route::get('test_guquan', 'api.store.merchant.Taskorderguquan/lst6');
+Route::get('test_lianchuang', 'api.store.merchant.Taskorderlianc/lst2');
 Route::any('/share', function () {
     return view(app()->getRootPath() . 'public/share/register.html');
 });