Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
eea9ed32
authored
Apr 22, 2019
by
zhangchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.更改查询条件
parent
7b9fc89c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
src/main/java/com/ctrip/fun/golf/api/assemble/AsmCourseResourceController.java
src/main/java/com/ctrip/fun/golf/dao/assemble/AsmCourseResourceDao.java
src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java
src/main/java/com/ctrip/fun/golf/api/assemble/AsmCourseResourceController.java
View file @
eea9ed32
...
...
@@ -472,7 +472,6 @@ public class AsmCourseResourceController {
productTeePriceBean
.
setTeeTime
(
asmCourseresource
.
getTeeTime
());
responseList
.
add
(
productTeePriceBean
);
}
respose
.
setBody
(
responseList
);
return
respose
;
}
...
...
src/main/java/com/ctrip/fun/golf/dao/assemble/AsmCourseResourceDao.java
View file @
eea9ed32
package
com
.
ctrip
.
fun
.
golf
.
dao
.
assemble
;
import
java.lang.reflect.InvocationTargetException
;
import
java.math.BigInteger
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
...
...
@@ -43,6 +42,7 @@ import com.ctrip.fun.common.vo.product.CourseProductStatusEnum;
import
com.ctrip.fun.common.vo.product.CourseResourceStatusEnum
;
import
com.ctrip.fun.common.vo.product.CourseStatusEnum
;
import
com.ctrip.fun.common.vo.product.FlashSaleResourceQuery
;
import
com.ctrip.fun.common.vo.product.ProductTeePriceBean
;
import
com.ctrip.fun.common.vo.product.ProductTypeEnum
;
import
com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum
;
import
com.ctrip.fun.common.vo.product.ResourceRealTimeTeeTimeTypeEnum
;
...
...
@@ -2030,14 +2030,15 @@ public class AsmCourseResourceDao extends GenericHibernateDao<AsmCourseresource,
* @param priceDate
* @return
*/
public
List
<
AsmCourseresource
>
getProductPriceList
(
Integer
productId
,
Date
priceDate
)
{
Criteria
criteria
=
this
.
createCriteria
();
public
List
<
AsmCourseresource
>
getProductPriceList
(
Integer
courseID
,
Date
priceDate
)
{
StringBuilder
sb
=
new
StringBuilder
(
"SELECT *,min(SalePrice) SalePrice FROM asm_courseresource WHERE CourseID =:courseID AND PriceDate=:priceDate GROUP BY teeTime"
);
Session
session
=
this
.
getSession
();
Query
query
=
session
.
createSQLQuery
(
sb
.
toString
()).
addEntity
(
AsmCourseresource
.
class
);
query
.
setParameter
(
"courseID"
,
courseID
);
query
.
setParameter
(
"priceDate"
,
priceDate
);
criteria
.
add
(
Restrictions
.
eq
(
"productId"
,
productId
));
criteria
.
add
(
Restrictions
.
eq
(
"priceDate"
,
priceDate
));
return
criteria
.
list
();
return
query
.
list
();
}
}
src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java
View file @
eea9ed32
...
...
@@ -45,6 +45,7 @@ import com.ctrip.fun.common.vo.product.CourseProductStatusEnum;
import
com.ctrip.fun.common.vo.product.CourseResourceStatusEnum
;
import
com.ctrip.fun.common.vo.product.CourseTeeTimeQuery
;
import
com.ctrip.fun.common.vo.product.GetAsmResourcePriceResponseBean
;
import
com.ctrip.fun.common.vo.product.ProductTeePriceBean
;
import
com.ctrip.fun.common.vo.product.ResourceCategoryEnum
;
import
com.ctrip.fun.common.vo.product.ResourceInventoryTypeEnum
;
import
com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum
;
...
...
@@ -72,7 +73,6 @@ import com.ctrip.fun.golf.service.client.ClientConfigService;
import
com.ctrip.fun.golf.service.order.EventCustomerInfoService
;
import
com.ctrip.fun.golf.utils.DistrictUtil
;
import
com.ctrip.fun.golf.vo.PagedEntityBean
;
import
com.mysql.fabric.xmlrpc.base.Array
;
public
class
AsmCourseResourceService
{
...
...
@@ -1351,8 +1351,8 @@ public class AsmCourseResourceService {
return
map
;
}
public
List
<
AsmCourseresource
>
getProductPriceList
(
Integer
productId
,
Date
priceDate
)
{
List
<
AsmCourseresource
>
models
=
asmCourseResourceDao
.
getProductPriceList
(
productId
,
priceDate
);
public
List
<
AsmCourseresource
>
getProductPriceList
(
Integer
courseID
,
Date
priceDate
)
{
List
<
AsmCourseresource
>
models
=
asmCourseResourceDao
.
getProductPriceList
(
courseID
,
priceDate
);
return
models
;
}
...
...
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