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
3a415542
Commit
3a415542
authored
Jul 15, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改提交购车表单代码
parent
a05f1803
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
11 deletions
+38
-11
UserRestInterface.java
.../wxiaoqi/security/admin/feign/rest/UserRestInterface.java
+2
-2
BuyVehicleForm.java
...ain/java/com/xxfc/platform/app/entity/BuyVehicleForm.java
+6
-1
BuyVehicleFormController.java
.../com/xxfc/platform/app/rest/BuyVehicleFormController.java
+26
-3
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+2
-3
OrderRefundController.java
...a/com/xxfc/platform/order/rest/OrderRefundController.java
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/common/Common
Interface.java
→
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRest
Interface.java
View file @
3a415542
package
com
.
xxfc
.
platform
.
order
.
rest
.
common
;
package
com
.
github
.
wxiaoqi
.
security
.
admin
.
feign
.
rest
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
...
@@ -8,7 +8,7 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
...
@@ -8,7 +8,7 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
public
interface
Common
Interface
{
public
interface
UserRest
Interface
{
public
UserFeign
getUserFeign
();
public
UserFeign
getUserFeign
();
public
HttpServletRequest
getRequest
();
public
HttpServletRequest
getRequest
();
...
...
xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/BuyVehicleForm.java
View file @
3a415542
...
@@ -82,6 +82,11 @@ public class BuyVehicleForm implements Serializable {
...
@@ -82,6 +82,11 @@ public class BuyVehicleForm implements Serializable {
@Column
(
name
=
"remark"
)
@Column
(
name
=
"remark"
)
@ApiModelProperty
(
value
=
"备注"
)
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
private
String
remark
;
/**
* 用户id
*/
@Column
(
name
=
"user_id"
)
@ApiModelProperty
(
value
=
"用户id"
)
private
Integer
userId
;
}
}
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/BuyVehicleFormController.java
View file @
3a415542
package
com
.
xxfc
.
platform
.
app
.
rest
;
package
com
.
xxfc
.
platform
.
app
.
rest
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.xxfc.platform.app.biz.BuyVehicleFormBiz
;
import
com.xxfc.platform.app.biz.BuyVehicleFormBiz
;
import
com.xxfc.platform.app.entity.BuyVehicleForm
;
import
com.xxfc.platform.app.entity.BuyVehicleForm
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.RestController
;
@RestController
@RestController
@RequestMapping
(
"buyVehicleForm"
)
@RequestMapping
(
"buyVehicleForm"
)
public
class
BuyVehicleFormController
extends
BaseController
<
BuyVehicleFormBiz
,
BuyVehicleForm
>
{
public
class
BuyVehicleFormController
extends
BaseController
<
BuyVehicleFormBiz
,
BuyVehicleForm
>
implements
UserRestInterface
{
@Autowired
UserFeign
userFeign
;
@Override
public
UserFeign
getUserFeign
()
{
return
userFeign
;
}
@ApiOperation
(
"添加表单"
)
@RequestMapping
(
value
=
"form-add"
,
method
=
RequestMethod
.
POST
)
@IgnoreClientToken
@ResponseBody
public
ObjectRestResponse
<
BuyVehicleForm
>
formAdd
(
@RequestBody
BuyVehicleForm
entity
){
checkAppUser
();
entity
.
setUserId
(
getAppUser
().
getUserid
());
baseBiz
.
insertSelective
(
entity
);
return
ObjectRestResponse
.
succ
();
}
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
3a415542
...
@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
...
@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
import
com.github.wxiaoqi.security.admin.entity.AppUserLogin
;
import
com.github.wxiaoqi.security.admin.entity.AppUserLogin
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.dto.UserDTO
;
import
com.github.wxiaoqi.security.admin.feign.dto.UserDTO
;
import
com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
...
@@ -17,7 +18,6 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
...
@@ -17,7 +18,6 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
import
com.github.wxiaoqi.security.common.util.Query
;
import
com.github.wxiaoqi.security.common.util.Query
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageParam
;
import
com.xxfc.platform.order.biz.BaseOrderBiz
;
import
com.xxfc.platform.order.biz.BaseOrderBiz
;
import
com.xxfc.platform.order.biz.OrderMemberDetailBiz
;
import
com.xxfc.platform.order.biz.OrderMemberDetailBiz
;
import
com.xxfc.platform.order.contant.enumerate.OrderStatusEnum
;
import
com.xxfc.platform.order.contant.enumerate.OrderStatusEnum
;
...
@@ -25,7 +25,6 @@ import com.xxfc.platform.order.entity.BaseOrder;
...
@@ -25,7 +25,6 @@ import com.xxfc.platform.order.entity.BaseOrder;
import
com.xxfc.platform.order.mqhandler.RabbitProduct
;
import
com.xxfc.platform.order.mqhandler.RabbitProduct
;
import
com.xxfc.platform.order.pojo.order.*
;
import
com.xxfc.platform.order.pojo.order.*
;
import
com.xxfc.platform.order.pojo.pay.OrderPayDTO
;
import
com.xxfc.platform.order.pojo.pay.OrderPayDTO
;
import
com.xxfc.platform.order.rest.common.CommonInterface
;
import
com.xxfc.platform.universal.constant.DictionaryKey
;
import
com.xxfc.platform.universal.constant.DictionaryKey
;
import
com.xxfc.platform.universal.entity.Dictionary
;
import
com.xxfc.platform.universal.entity.Dictionary
;
import
com.xxfc.platform.universal.feign.ThirdFeign
;
import
com.xxfc.platform.universal.feign.ThirdFeign
;
...
@@ -58,7 +57,7 @@ import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
...
@@ -58,7 +57,7 @@ import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
@RequestMapping
(
"baseOrder"
)
@RequestMapping
(
"baseOrder"
)
@Api
(
value
=
"订单"
,
tags
=
{
"订单"
})
@Api
(
value
=
"订单"
,
tags
=
{
"订单"
})
@Slf4j
@Slf4j
public
class
BaseOrderController
extends
CommonBaseController
implements
Common
Interface
{
public
class
BaseOrderController
extends
CommonBaseController
implements
UserRest
Interface
{
public
static
final
Integer
STATUS_SUCCESS
=
1
;
public
static
final
Integer
STATUS_SUCCESS
=
1
;
@Autowired
@Autowired
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java
View file @
3a415542
package
com
.
xxfc
.
platform
.
order
.
rest
;
package
com
.
xxfc
.
platform
.
order
.
rest
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
...
@@ -11,7 +12,6 @@ import com.xxfc.platform.order.biz.OrderRefundBiz;
...
@@ -11,7 +12,6 @@ import com.xxfc.platform.order.biz.OrderRefundBiz;
import
com.xxfc.platform.order.contant.enumerate.OrderTypeEnum
;
import
com.xxfc.platform.order.contant.enumerate.OrderTypeEnum
;
import
com.xxfc.platform.order.entity.OrderRefund
;
import
com.xxfc.platform.order.entity.OrderRefund
;
import
com.xxfc.platform.order.pojo.order.OrderPageVO
;
import
com.xxfc.platform.order.pojo.order.OrderPageVO
;
import
com.xxfc.platform.order.rest.common.CommonInterface
;
import
com.xxfc.platform.universal.constant.DictionaryKey
;
import
com.xxfc.platform.universal.constant.DictionaryKey
;
import
lombok.Data
;
import
lombok.Data
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -27,7 +27,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FA
...
@@ -27,7 +27,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FA
@Controller
@Controller
@RequestMapping
(
"orderRefund"
)
@RequestMapping
(
"orderRefund"
)
public
class
OrderRefundController
extends
BaseController
<
OrderRefundBiz
,
OrderRefund
>
implements
Common
Interface
{
public
class
OrderRefundController
extends
BaseController
<
OrderRefundBiz
,
OrderRefund
>
implements
UserRest
Interface
{
@Autowired
@Autowired
BaseOrderBiz
baseOrderBiz
;
BaseOrderBiz
baseOrderBiz
;
...
...
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