|
|
@@ -6,6 +6,7 @@ use biz\shop\classes\ShopExtClass;
|
|
|
use biz\sj\services\MerchantExtendService;
|
|
|
use biz\sj\services\MerchantService;
|
|
|
use bizHd\custom\classes\CustomClass;
|
|
|
+use bizHd\goods\classes\GoodsClass;
|
|
|
use bizHd\merchant\services\ShopService;
|
|
|
use bizHd\order\classes\OrderClass;
|
|
|
use bizHd\order\classes\OrderSendClass;
|
|
|
@@ -381,15 +382,21 @@ class OrderController extends BaseController
|
|
|
$productJson = $post['product'] ?? '';
|
|
|
if (empty($productJson) && empty($groupId)) {
|
|
|
if (isset($post['lsGoodsPrice']) == false || $post['lsGoodsPrice'] <= 0) {
|
|
|
- util::fail('请选择商品');
|
|
|
+ util::fail('请填写金额或选商品');
|
|
|
}
|
|
|
}
|
|
|
$productList = json_decode($productJson, true);
|
|
|
if (empty($productList) && empty($groupId)) {
|
|
|
if (isset($post['lsGoodsPrice']) == false || $post['lsGoodsPrice'] <= 0) {
|
|
|
- util::fail('请选择商品');
|
|
|
+ util::fail('请填写金额或选商品');
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //商家上传图片开单并要求生成制作单
|
|
|
+ if (isset($post['cover']) && !empty($post['cover'])) {
|
|
|
+ $productList = GoodsClass::kdWorkGoods($post);
|
|
|
+ }
|
|
|
+
|
|
|
$connection = Yii::$app->db;
|
|
|
$transaction = $connection->beginTransaction();
|
|
|
try {
|