Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
d24feb1f
Commit
d24feb1f
authored
Oct 17, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://113.105.137.151:22280/youjj/cloud-platform
into dev
parents
c8186e05
f6c872ec
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
105 additions
and
6 deletions
+105
-6
AppUserAlipayBiz.java
...m/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java
+1
-1
BaseOrder.java
...c/main/java/com/xxfc/platform/order/entity/BaseOrder.java
+14
-0
OrderDetail.java
...ava/com/xxfc/platform/order/entity/inter/OrderDetail.java
+8
-0
MemberBO.java
...ain/java/com/xxfc/platform/order/pojo/order/MemberBO.java
+7
-0
RentVehicleBO.java
...ava/com/xxfc/platform/order/pojo/order/RentVehicleBO.java
+6
-0
TourBO.java
.../main/java/com/xxfc/platform/order/pojo/order/TourBO.java
+6
-0
AddOrderCommonDTO.java
...xxfc/platform/order/pojo/order/add/AddOrderCommonDTO.java
+14
-0
AbstractOrderHandle.java
.../com/xxfc/platform/order/service/AbstractOrderHandle.java
+9
-2
GwTourController.java
...in/java/com/xxfc/platform/uccn/rest/GwTourController.java
+8
-2
MemberLevelController.java
...va/com/xxfc/platform/uccn/rest/MemberLevelController.java
+31
-0
BranchCompanyMapper.xml
...-server/src/main/resources/mapper/BranchCompanyMapper.xml
+1
-1
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java
View file @
d24feb1f
...
...
@@ -105,7 +105,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
AppUserAlipay
wxAppUser
=
new
AppUserAlipay
();
wxAppUser
.
setType
(
2
);
wxAppUser
.
setUserId
(
userId
);
wxAppUser
.
setNickname
(
appUserDetail
.
getWxNickname
());
wxAppUser
.
setNickname
(
StringUtils
.
isEmpty
(
appUserDetail
.
getWxNickname
())?
appUserDetail
.
getNickname
():
appUserDetail
.
getWxNickname
());
wxAppUser
.
setTxAlipay
(
appUserLogin
.
getWxOpenid
());
appUserAlipays
.
add
(
wxAppUser
);
}
...
...
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java
View file @
d24feb1f
...
...
@@ -279,4 +279,18 @@ public class BaseOrder implements Serializable {
@ApiModelProperty
(
value
=
"返回的优惠券"
)
@Column
(
name
=
"back_coupon"
)
String
backCoupon
;
/**
* 促成人后台管理系统用户id
*/
@ApiModelProperty
(
value
=
"促成人后台管理系统用户id"
)
@Column
(
name
=
"facilitate_id"
)
Integer
facilitateId
;
/**
* 促成人联系方式
*/
@ApiModelProperty
(
value
=
"促成人联系方式"
)
@Column
(
name
=
"facilitate_phone"
)
String
facilitatePhone
;
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/inter/OrderDetail.java
View file @
d24feb1f
...
...
@@ -33,4 +33,12 @@ public interface OrderDetail extends OrderItemInter {
public
void
setAppUserDTO
(
AppUserDTO
appUserDTO
);
// public Integer getFacilitateId();
//
// public void setFacilitateId(Integer facilitateId);
public
String
getFacilitatePhone
();
public
void
setFacilitatePhone
(
String
facilitatePhone
);
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/MemberBO.java
View file @
d24feb1f
...
...
@@ -11,6 +11,7 @@ import com.xxfc.platform.order.entity.OrderTourDetail;
import
com.xxfc.platform.order.entity.inter.OrderDetail
;
import
com.xxfc.platform.tour.entity.TourGood
;
import
com.xxfc.platform.tour.entity.TourUser
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
...
...
@@ -20,6 +21,12 @@ public class MemberBO extends OrderMemberDetail implements OrderDetail {
private
BaseOrder
order
;
private
BaseUserMemberLevel
baseUserMemberLevel
;
AppUserDTO
appUserDTO
;
/**
* 促成人联系方式
*/
@ApiModelProperty
(
value
=
"促成人联系方式"
)
String
facilitatePhone
;
/**
* 下单来源,1--app;2--小程序
*/
...
...
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java
View file @
d24feb1f
...
...
@@ -25,6 +25,12 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
private
Integer
rentFreeDay
;
private
AppUserDTO
appUserDTO
;
/**
* 促成人联系方式
*/
@ApiModelProperty
(
value
=
"促成人联系方式"
)
String
facilitatePhone
;
/**
* 下单来源,1--app;2--小程序
*/
...
...
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/TourBO.java
View file @
d24feb1f
...
...
@@ -11,6 +11,7 @@ import com.xxfc.platform.order.entity.inter.OrderDetail;
import
com.xxfc.platform.tour.entity.TourGood
;
import
com.xxfc.platform.tour.entity.TourUser
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
...
...
@@ -21,6 +22,11 @@ public class TourBO extends OrderTourDetail implements OrderDetail {
TourGood
tourGood
;
List
<
TourUser
>
tourUsers
;
AppUserDTO
appUserDTO
;
/**
* 促成人联系方式
*/
@ApiModelProperty
(
value
=
"促成人联系方式"
)
String
facilitatePhone
;
/**
* 下单来源,1--app;2--小程序
...
...
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddOrderCommonDTO.java
View file @
d24feb1f
...
...
@@ -3,6 +3,8 @@ package com.xxfc.platform.order.pojo.order.add;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.persistence.Column
;
@Data
public
class
AddOrderCommonDTO
{
/**
...
...
@@ -17,4 +19,16 @@ public class AddOrderCommonDTO {
*/
@ApiModelProperty
(
value
=
"优惠券ids"
)
private
String
couponIds
;
// /**
// * 促成人后台管理系统用户id
// */
// @ApiModelProperty(value = "促成人后台管理系统用户id")
// Integer facilitateId;
/**
* 促成人联系方式
*/
@ApiModelProperty
(
value
=
"促成人联系方式"
)
String
facilitatePhone
;
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java
View file @
d24feb1f
...
...
@@ -66,12 +66,18 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
* 创建基础订单
* @return
*/
public
BaseOrder
createBaseOrder
(
Integer
orderOrigin
,
AppUserDTO
appUserDTO
)
{
public
BaseOrder
createBaseOrder
(
Integer
orderOrigin
,
String
facilitatePhone
,
AppUserDTO
appUserDTO
)
{
BaseOrder
baseOrder
=
new
BaseOrder
();
//设置下单来源
baseOrder
.
setOrderOrigin
(
orderOrigin
);
//根据facilitatePhone 查询后台管理系统人员 未完成
if
(
StrUtil
.
isNotBlank
(
facilitatePhone
))
{
baseOrder
.
setFacilitatePhone
(
facilitatePhone
);
userFeign
.
getOne
(
facilitatePhone
,
null
);
}
//设置订单号
baseOrder
.
setNo
(
OrderUtil
.
GetOrderNumber
(
""
,
OrderUtil
.
APP_MID
));
//设置订单类型
...
...
@@ -89,12 +95,13 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
//设置用户id
baseOrder
.
setUserId
(
appUserDTO
.
getUserid
());
baseOrder
.
setMemberLevel
(
appUserDTO
.
getMemberLevel
());
return
baseOrder
;
}
public
void
initDetail
(
Detail
detail
)
{
// Integer appUserId = (null == detail.getAppUserDTO())? Integer.valueOf(BaseContextHandler.getUserID()): detail.getAppUserDTO().getUserid();
BaseOrder
order
=
createBaseOrder
(
detail
.
getOrderOrigin
(),
detail
.
getAppUserDTO
());
BaseOrder
order
=
createBaseOrder
(
detail
.
getOrderOrigin
(),
detail
.
get
FacilitatePhone
(),
detail
.
get
AppUserDTO
());
detail
.
setOrder
(
order
);
}
...
...
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/GwTourController.java
View file @
d24feb1f
...
...
@@ -4,12 +4,17 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.CommonBaseController
;
import
com.xxfc.platform.tour.entity.TourTag
;
import
com.xxfc.platform.tour.feign.TourFeign
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.Comparator
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@RestController
@RequestMapping
(
"app/unauth/tour"
)
@Slf4j
...
...
@@ -47,8 +52,9 @@ public class GwTourController extends CommonBaseController {
@GetMapping
(
"/tagList"
)
@IgnoreUserToken
public
ObjectRestResponse
getTagList
(
@RequestParam
(
value
=
"isHot"
,
defaultValue
=
"0"
)
Integer
isHot
)
{
return
ObjectRestResponse
.
succ
(
tourFeign
.
tagList
(
isHot
));
List
<
TourTag
>
tourTags
=
tourFeign
.
tagList
(
isHot
);
tourTags
=
tourTags
.
stream
().
filter
(
x
->
!
x
.
getName
().
contains
(
"全部"
)).
sorted
(
Comparator
.
comparing
(
TourTag:
:
getRank
)).
collect
(
Collectors
.
toList
());
return
ObjectRestResponse
.
succ
(
tourTags
);
}
}
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/MemberLevelController.java
0 → 100644
View file @
d24feb1f
package
com
.
xxfc
.
platform
.
uccn
.
rest
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/10/17 9:37
*/
@RestController
@RequiredArgsConstructor
(
onConstructor
=
@__
(
@Autowired
))
@RequestMapping
(
"/member_level"
)
public
class
MemberLevelController
{
private
final
UserFeign
userFeign
;
@GetMapping
(
"/list"
)
public
ObjectRestResponse
<
BaseUserMemberLevel
>
listMemberLevels
(){
List
<
BaseUserMemberLevel
>
levels
=
userFeign
.
levels
();
return
ObjectRestResponse
.
succ
(
levels
);
}
}
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml
View file @
d24feb1f
...
...
@@ -91,6 +91,6 @@
<if
test=
"cityCode != null"
>
AND `addr_city`=#{cityCode}
</if>
) AS `cb` ON cb.id = bc.company_base_id
) AS `cb` ON cb.id = bc.company_base_id
ORDER BY `id`
</select>
</mapper>
\ No newline at end of file
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