Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
goods
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
goods
Commits
fad58ae0
Commit
fad58ae0
authored
Jul 17, 2021
by
jianghaiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:Set
parent
e966d555
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
GoodsAddValidate.php
application/library/Validate/GoodsAddValidate.php
+2
-2
GoodsService.php
application/services/goods/GoodsService.php
+2
-2
DistributorService.php
application/services/marketing/DistributorService.php
+2
-3
No files found.
application/library/Validate/GoodsAddValidate.php
View file @
fad58ae0
...
@@ -22,7 +22,7 @@ class GoodsAddValidate extends BaseValidate
...
@@ -22,7 +22,7 @@ class GoodsAddValidate extends BaseValidate
'sub_shop_ids'
=>
'require'
,
'sub_shop_ids'
=>
'require'
,
'rule_refund'
=>
'require'
,
'rule_refund'
=>
'require'
,
'introduce'
=>
'length:0,200'
,
'introduce'
=>
'length:0,200'
,
'inventory'
=>
'require'
,
'inventory
_add
'
=>
'require'
,
];
];
protected
$message
=
[
protected
$message
=
[
...
@@ -36,6 +36,6 @@ class GoodsAddValidate extends BaseValidate
...
@@ -36,6 +36,6 @@ class GoodsAddValidate extends BaseValidate
'sub_shop_ids'
=>
'门店id不能为空'
,
'sub_shop_ids'
=>
'门店id不能为空'
,
'rule_refund'
=>
'请选择退款规则'
,
'rule_refund'
=>
'请选择退款规则'
,
'introduce'
=>
'商品介绍内容不能过长'
,
'introduce'
=>
'商品介绍内容不能过长'
,
'inventory'
=>
'请填写库存'
,
'inventory
_add
'
=>
'请填写库存'
,
];
];
}
}
\ No newline at end of file
application/services/goods/GoodsService.php
View file @
fad58ae0
...
@@ -220,8 +220,8 @@ class GoodsService
...
@@ -220,8 +220,8 @@ class GoodsService
"rule_date_type"
=>
empty
(
$skuData
[
"rule_date_type"
])
?
GoodsSku
::
RULE_DATE_TYPE_1
:
$skuData
[
"rule_date_type"
],
"rule_date_type"
=>
empty
(
$skuData
[
"rule_date_type"
])
?
GoodsSku
::
RULE_DATE_TYPE_1
:
$skuData
[
"rule_date_type"
],
"rule_start_time"
=>
empty
(
$skuData
[
"rule_start_time"
])
?
""
:
$skuData
[
"rule_start_time"
],
"rule_start_time"
=>
empty
(
$skuData
[
"rule_start_time"
])
?
""
:
$skuData
[
"rule_start_time"
],
"rule_end_time"
=>
empty
(
$skuData
[
"rule_end_time"
])
?
""
:
$skuData
[
"rule_end_time"
],
"rule_end_time"
=>
empty
(
$skuData
[
"rule_end_time"
])
?
""
:
$skuData
[
"rule_end_time"
],
"inventory_total"
=>
$skuData
[
"inventory"
],
"inventory_total"
=>
$skuData
[
"inventory
_add
"
],
"inventory_rest"
=>
$skuData
[
"inventory"
],
"inventory_rest"
=>
$skuData
[
"inventory
_add
"
],
"original_price"
=>
empty
(
$skuData
[
"original_price"
])
?
0
:
$skuData
[
"original_price"
]
*
100
,
"original_price"
=>
empty
(
$skuData
[
"original_price"
])
?
0
:
$skuData
[
"original_price"
]
*
100
,
"price"
=>
$skuData
[
"price"
]
*
100
,
"price"
=>
$skuData
[
"price"
]
*
100
,
];
];
...
...
application/services/marketing/DistributorService.php
View file @
fad58ae0
...
@@ -333,7 +333,7 @@ class DistributorService
...
@@ -333,7 +333,7 @@ class DistributorService
}
}
/**
/**
*
获取二维码
*
是否是团长
*
*
*/
*/
public
static
function
distributor
(
$params
)
public
static
function
distributor
(
$params
)
...
@@ -350,8 +350,7 @@ class DistributorService
...
@@ -350,8 +350,7 @@ class DistributorService
$data
=
[];
$data
=
[];
$info
=
Distributor
::
getRecord
(
$where
);
$info
=
Distributor
::
getRecord
(
$where
);
$data
=
$info
;
$param
=
[
$param
=
[
'user_id'
=>
!
empty
(
$where
[
'user_id'
])
?
$where
[
'user_id'
]
:
''
,
'user_id'
=>
!
empty
(
$where
[
'user_id'
])
?
$where
[
'user_id'
]
:
''
,
];
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment