Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xinrenli
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
郑云飞
xinrenli
Commits
dd2d1e62
Commit
dd2d1e62
authored
Apr 06, 2023
by
kaevom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
所有接口基本完成
parent
23f1b6b7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
98 additions
and
123 deletions
+98
-123
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
+35
-19
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbUserCommentController.java
+3
-0
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbUserCouponController.java
+6
-0
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbWxUserController.java
+3
-0
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
+15
-3
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderEditBo.java
+14
-3
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbWxUserBo.java
+6
-42
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java
+3
-3
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbWxUserVo.java
+8
-45
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbFileMapper.java
+3
-0
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
+0
-0
yongqi-xinrenli/src/main/resources/mapper/DbFileMapper.xml
+2
-0
yongqi-xinrenli/src/main/resources/mapper/DbWxUserMapper.xml
+0
-8
No files found.
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
View file @
dd2d1e62
...
@@ -5,6 +5,7 @@ import java.util.ArrayList;
...
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
com.baomidou.mybatisplus.core.toolkit.ObjectUtils
;
import
com.github.binarywang.wxpay.exception.WxPayException
;
import
com.github.binarywang.wxpay.exception.WxPayException
;
import
com.yongqi.common.core.domain.model.LoginUser
;
import
com.yongqi.common.core.domain.model.LoginUser
;
import
com.yongqi.common.helper.LoginHelper
;
import
com.yongqi.common.helper.LoginHelper
;
...
@@ -58,7 +59,16 @@ public class DbOrderController extends BaseController {
...
@@ -58,7 +59,16 @@ public class DbOrderController extends BaseController {
public
TableDataInfo
<
DbOrderVo
>
list
(
DbOrderBo
bo
,
PageQuery
pageQuery
)
{
public
TableDataInfo
<
DbOrderVo
>
list
(
DbOrderBo
bo
,
PageQuery
pageQuery
)
{
return
iDbOrderService
.
homeList
(
bo
,
pageQuery
);
return
iDbOrderService
.
homeList
(
bo
,
pageQuery
);
}
}
/**
* 查询订单列表
*/
@SaCheckPermission
(
"xinrenli:order:listUser"
)
@GetMapping
(
"/listUser"
)
public
TableDataInfo
<
DbOrderVo
>
listUser
(
DbOrderBo
bo
,
PageQuery
pageQuery
)
{
LoginUser
loginUser
=
getLoginUser
();
bo
.
setUserId
(
loginUser
.
getUserId
());
return
iDbOrderService
.
homeList
(
bo
,
pageQuery
);
}
/**
/**
* 用户需求广场
* 用户需求广场
*/
*/
...
@@ -74,9 +84,8 @@ public class DbOrderController extends BaseController {
...
@@ -74,9 +84,8 @@ public class DbOrderController extends BaseController {
@SaCheckPermission
(
"xinrenli:order:MyNeeds"
)
@SaCheckPermission
(
"xinrenli:order:MyNeeds"
)
@GetMapping
(
"/MyNeeds"
)
@GetMapping
(
"/MyNeeds"
)
public
TableDataInfo
<
DbOrderVo
>
MyNeeds
(
DbOrderBo
bo
,
PageQuery
pageQuery
)
{
public
TableDataInfo
<
DbOrderVo
>
MyNeeds
(
DbOrderBo
bo
,
PageQuery
pageQuery
)
{
// LoginUser loginUser = getLoginUser();
LoginUser
loginUser
=
getLoginUser
();
LoginUser
loginUser
=
new
LoginUser
();
bo
.
setUserId
(
loginUser
.
getUserId
());
loginUser
.
setUserId
(
1L
);
return
iDbOrderService
.
myNeeds
(
bo
,
pageQuery
,
loginUser
);
return
iDbOrderService
.
myNeeds
(
bo
,
pageQuery
,
loginUser
);
}
}
...
@@ -119,10 +128,12 @@ public class DbOrderController extends BaseController {
...
@@ -119,10 +128,12 @@ public class DbOrderController extends BaseController {
@RepeatSubmit
()
@RepeatSubmit
()
@PostMapping
(
"/add"
)
@PostMapping
(
"/add"
)
public
R
<
Void
>
add
(
@Validated
(
AddGroup
.
class
)
@RequestBody
DbOrderBo
bo
)
{
public
R
<
Void
>
add
(
@Validated
(
AddGroup
.
class
)
@RequestBody
DbOrderBo
bo
)
{
LoginUser
loginUser
=
getLoginUser
();
LoginUser
loginUser
=
getLoginUser
();
LoginUser
user
=
new
LoginUser
();
bo
.
setUserId
(
loginUser
.
getUserId
());
user
.
setUserId
(
bo
.
getUserId
());
if
(
ObjectUtils
.
isEmpty
(
bo
.
getPictureList
())
&&
ObjectUtils
.
isEmpty
(
bo
.
getVideoList
())
&&
ObjectUtils
.
isEmpty
(
bo
.
getVoiceList
()))
{
return
toAjax
(
iDbOrderService
.
insertByBo
(
bo
,
user
));
return
R
.
fail
(
"图片,视频,语音必须上传其中一个"
);
}
return
toAjax
(
iDbOrderService
.
insertByBo
(
bo
,
loginUser
));
}
}
/**
/**
...
@@ -132,10 +143,12 @@ public class DbOrderController extends BaseController {
...
@@ -132,10 +143,12 @@ public class DbOrderController extends BaseController {
@Log
(
title
=
"订单"
,
businessType
=
BusinessType
.
UPDATE
)
@Log
(
title
=
"订单"
,
businessType
=
BusinessType
.
UPDATE
)
@RepeatSubmit
()
@RepeatSubmit
()
@PostMapping
(
"/edit"
)
@PostMapping
(
"/edit"
)
public
R
<
Void
>
edit
(
@Validated
(
EditGroup
.
class
)
@RequestBody
DbOrderEditBo
bo
)
{
public
R
<
Void
>
edit
(
@Validated
(
EditGroup
.
class
)
@RequestBody
DbOrderEditBo
bo
)
{
// LoginUser loginUser = getLoginUser();
LoginUser
loginUser
=
getLoginUser
();
LoginUser
loginUser
=
new
LoginUser
();
bo
.
setUserId
(
loginUser
.
getUserId
());
loginUser
.
setUserId
(
bo
.
getUserId
());
if
(
ObjectUtils
.
isEmpty
(
bo
.
getPictureList
())
&&
ObjectUtils
.
isEmpty
(
bo
.
getVideoList
())
&&
ObjectUtils
.
isEmpty
(
bo
.
getVoiceList
()))
{
return
R
.
fail
(
"图片,视频,语音必须上传其中一个"
);
}
return
toAjax
(
iDbOrderService
.
updateByBo
(
bo
,
loginUser
));
return
toAjax
(
iDbOrderService
.
updateByBo
(
bo
,
loginUser
));
}
}
...
@@ -149,14 +162,15 @@ public class DbOrderController extends BaseController {
...
@@ -149,14 +162,15 @@ public class DbOrderController extends BaseController {
@GetMapping
(
"/remove"
)
@GetMapping
(
"/remove"
)
public
R
<
Void
>
remove
(
@NotNull
(
message
=
"主键不能为空"
)
public
R
<
Void
>
remove
(
@NotNull
(
message
=
"主键不能为空"
)
@RequestParam
(
"id"
)
Long
id
)
{
@RequestParam
(
"id"
)
Long
id
)
{
LoginUser
loginUser
=
new
LoginUser
();
LoginUser
loginUser
=
get
LoginUser
();
return
toAjax
(
iDbOrderService
.
deleteWithValidByIds
(
id
,
loginUser
));
return
toAjax
(
iDbOrderService
.
deleteWithValidByIds
(
id
,
loginUser
));
}
}
/**
/**
* 下单
* 下单
* @param orderId 订单id
*
* @param couponId 优惠券id
* @param orderId 订单id
* @param couponId 优惠券id
* @param request
* @param request
* @return
* @return
*/
*/
...
@@ -183,15 +197,16 @@ public class DbOrderController extends BaseController {
...
@@ -183,15 +197,16 @@ public class DbOrderController extends BaseController {
/**
/**
* 退款
* 退款
* @param orderId 订单id
*
* @param refundAmount 退款金额
* @param orderId 订单id
* @param refundAmount 退款金额
* @return
* @return
*/
*/
@SaCheckPermission
(
"xinrenli:order:refund"
)
@SaCheckPermission
(
"xinrenli:order:refund"
)
@Log
(
title
=
"退款"
,
businessType
=
BusinessType
.
OTHER
)
@Log
(
title
=
"退款"
,
businessType
=
BusinessType
.
OTHER
)
@GetMapping
(
"/refund"
)
@GetMapping
(
"/refund"
)
public
R
refund
(
@NotNull
(
message
=
"订单id不能为空"
)
@RequestParam
(
"orderId"
)
Long
orderId
,
public
R
refund
(
@NotNull
(
message
=
"订单id不能为空"
)
@RequestParam
(
"orderId"
)
Long
orderId
,
@NotNull
(
message
=
"退款金额不能为空"
)
@RequestParam
(
"refundeAmount"
)
BigDecimal
refundAmount
)
{
@NotNull
(
message
=
"退款金额不能为空"
)
@RequestParam
(
"refundeAmount"
)
BigDecimal
refundAmount
)
{
LoginUser
loginUser
=
LoginHelper
.
getLoginUser
();
LoginUser
loginUser
=
LoginHelper
.
getLoginUser
();
return
iDbOrderService
.
refund
(
orderId
,
refundAmount
,
loginUser
);
return
iDbOrderService
.
refund
(
orderId
,
refundAmount
,
loginUser
);
}
}
...
@@ -215,6 +230,7 @@ public class DbOrderController extends BaseController {
...
@@ -215,6 +230,7 @@ public class DbOrderController extends BaseController {
public
R
<
ReportFormsVo
>
reportForms
()
{
public
R
<
ReportFormsVo
>
reportForms
()
{
return
R
.
ok
(
iDbOrderService
.
reportForms
());
return
R
.
ok
(
iDbOrderService
.
reportForms
());
}
}
/**
/**
* 导出报表
* 导出报表
*/
*/
...
@@ -231,9 +247,9 @@ public class DbOrderController extends BaseController {
...
@@ -231,9 +247,9 @@ public class DbOrderController extends BaseController {
return
toAjax
(
false
);
return
toAjax
(
false
);
}
}
return
toAjax
(
true
);
return
toAjax
(
true
);
}
}
/**
/**
* 生成支付订单和发起退款接口,驳回接口
* 生成支付订单和发起退款接口,驳回接口
*/
*/
...
...
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbUserCommentController.java
View file @
dd2d1e62
...
@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
...
@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
import
java.util.List
;
import
java.util.List
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
com.yongqi.common.core.domain.model.LoginUser
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
...
@@ -79,6 +80,8 @@ public class DbUserCommentController extends BaseController {
...
@@ -79,6 +80,8 @@ public class DbUserCommentController extends BaseController {
@RepeatSubmit
()
@RepeatSubmit
()
@PostMapping
()
@PostMapping
()
public
R
<
Void
>
add
(
@Validated
(
AddGroup
.
class
)
@RequestBody
DbUserCommentBo
bo
)
{
public
R
<
Void
>
add
(
@Validated
(
AddGroup
.
class
)
@RequestBody
DbUserCommentBo
bo
)
{
LoginUser
loginUser
=
getLoginUser
();
bo
.
setUserId
(
loginUser
.
getUserId
());
return
toAjax
(
iDbUserCommentService
.
insertByBo
(
bo
));
return
toAjax
(
iDbUserCommentService
.
insertByBo
(
bo
));
}
}
...
...
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbUserCouponController.java
View file @
dd2d1e62
...
@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
...
@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
import
java.util.List
;
import
java.util.List
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
com.yongqi.common.core.domain.model.LoginUser
;
import
com.yongqi.xinrenli.domain.DbCoupon
;
import
com.yongqi.xinrenli.domain.DbCoupon
;
import
com.yongqi.xinrenli.domain.bo.DbCouponBo
;
import
com.yongqi.xinrenli.domain.bo.DbCouponBo
;
import
com.yongqi.xinrenli.domain.vo.DbCouponVo
;
import
com.yongqi.xinrenli.domain.vo.DbCouponVo
;
...
@@ -48,6 +49,8 @@ public class DbUserCouponController extends BaseController {
...
@@ -48,6 +49,8 @@ public class DbUserCouponController extends BaseController {
@SaCheckPermission
(
"xinrenli:userCoupon:list"
)
@SaCheckPermission
(
"xinrenli:userCoupon:list"
)
@GetMapping
(
"/list"
)
@GetMapping
(
"/list"
)
public
TableDataInfo
<
DbCouponVo
>
list
(
DbUserCouponBo
bo
,
PageQuery
pageQuery
)
{
public
TableDataInfo
<
DbCouponVo
>
list
(
DbUserCouponBo
bo
,
PageQuery
pageQuery
)
{
LoginUser
loginUser
=
getLoginUser
();
bo
.
setUserId
(
loginUser
.
getUserId
());
return
iDbUserCouponService
.
queryPageList
(
bo
,
pageQuery
);
return
iDbUserCouponService
.
queryPageList
(
bo
,
pageQuery
);
}
}
/**
/**
...
@@ -56,6 +59,8 @@ public class DbUserCouponController extends BaseController {
...
@@ -56,6 +59,8 @@ public class DbUserCouponController extends BaseController {
@SaCheckPermission
(
"xinrenli:userCoupon:listLose"
)
@SaCheckPermission
(
"xinrenli:userCoupon:listLose"
)
@GetMapping
(
"/listLose"
)
@GetMapping
(
"/listLose"
)
public
TableDataInfo
<
DbCouponVo
>
listLose
(
DbUserCouponBo
bo
,
PageQuery
pageQuery
)
{
public
TableDataInfo
<
DbCouponVo
>
listLose
(
DbUserCouponBo
bo
,
PageQuery
pageQuery
)
{
LoginUser
loginUser
=
getLoginUser
();
bo
.
setUserId
(
loginUser
.
getUserId
());
return
iDbUserCouponService
.
queryPageListLose
(
bo
,
pageQuery
);
return
iDbUserCouponService
.
queryPageListLose
(
bo
,
pageQuery
);
}
}
...
@@ -79,6 +84,7 @@ public class DbUserCouponController extends BaseController {
...
@@ -79,6 +84,7 @@ public class DbUserCouponController extends BaseController {
@GetMapping
(
"/{id}"
)
@GetMapping
(
"/{id}"
)
public
R
<
DbUserCouponVo
>
getInfo
(
@NotNull
(
message
=
"主键不能为空"
)
public
R
<
DbUserCouponVo
>
getInfo
(
@NotNull
(
message
=
"主键不能为空"
)
@PathVariable
Long
id
)
{
@PathVariable
Long
id
)
{
return
R
.
ok
(
iDbUserCouponService
.
queryById
(
id
));
return
R
.
ok
(
iDbUserCouponService
.
queryById
(
id
));
}
}
...
...
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbWxUserController.java
View file @
dd2d1e62
...
@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
...
@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
import
java.util.List
;
import
java.util.List
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
com.yongqi.common.core.domain.model.LoginUser
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
...
@@ -90,6 +91,8 @@ public class DbWxUserController extends BaseController {
...
@@ -90,6 +91,8 @@ public class DbWxUserController extends BaseController {
@RepeatSubmit
()
@RepeatSubmit
()
@PutMapping
()
@PutMapping
()
public
R
<
Void
>
edit
(
@Validated
(
EditGroup
.
class
)
@RequestBody
DbWxUserBo
bo
)
{
public
R
<
Void
>
edit
(
@Validated
(
EditGroup
.
class
)
@RequestBody
DbWxUserBo
bo
)
{
LoginUser
loginUser
=
getLoginUser
();
bo
.
setId
(
loginUser
.
getUserId
());
return
toAjax
(
iDbWxUserService
.
updateByBo
(
bo
));
return
toAjax
(
iDbWxUserService
.
updateByBo
(
bo
));
}
}
...
...
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
View file @
dd2d1e62
...
@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.domain.bo;
...
@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.domain.bo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.yongqi.common.core.validate.AddGroup
;
import
com.yongqi.common.core.validate.AddGroup
;
import
com.yongqi.common.core.validate.EditGroup
;
import
com.yongqi.common.core.validate.EditGroup
;
import
com.yongqi.xinrenli.domain.vo.DbFileVo
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -82,7 +83,7 @@ public class DbOrderBo extends BaseEntity {
...
@@ -82,7 +83,7 @@ public class DbOrderBo extends BaseEntity {
/**
/**
* 备注说明
* 备注说明
*/
*/
@NotBlank
(
message
=
"备注说明不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
//
@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
private
String
remark
;
private
String
remark
;
/**
/**
...
@@ -118,8 +119,19 @@ public class DbOrderBo extends BaseEntity {
...
@@ -118,8 +119,19 @@ public class DbOrderBo extends BaseEntity {
/**
/**
* 文件列表
* 文件列表
*/
*/
@NotNull
(
message
=
"图片,视频,语音必须上传其中一个"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
@NotNull
(
message
=
"图片,视频,语音必须上传其中一个"
,
groups
=
{
EditGroup
.
class
})
private
List
<
DbFileBo
>
fileVos
;
private
List
<
DbFileBo
>
fileVos
;
/**
* 图片列表
*/
private
List
<
DbFileBo
>
pictureList
;
/**
* 视频列表
*/
private
List
<
DbFileBo
>
videoList
;
/**
* 语言列表
*/
private
List
<
DbFileBo
>
voiceList
;
}
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderEditBo.java
View file @
dd2d1e62
...
@@ -78,7 +78,7 @@ public class DbOrderEditBo extends BaseEntity {
...
@@ -78,7 +78,7 @@ public class DbOrderEditBo extends BaseEntity {
/**
/**
* 备注说明
* 备注说明
*/
*/
@NotBlank
(
message
=
"备注说明不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
//
@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
private
String
remark
;
private
String
remark
;
/**
/**
...
@@ -114,8 +114,19 @@ public class DbOrderEditBo extends BaseEntity {
...
@@ -114,8 +114,19 @@ public class DbOrderEditBo extends BaseEntity {
/**
/**
* 文件列表
* 文件列表
*/
*/
@NotNull
(
message
=
"图片,视频,语音必须上传其中一个"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
//
@NotNull(message = "图片,视频,语音必须上传其中一个", groups = {AddGroup.class, EditGroup.class})
private
List
<
DbFileBo
>
fileBoList
;
private
List
<
DbFileBo
>
fileBoList
;
/**
* 图片列表
*/
private
List
<
DbFileBo
>
pictureList
;
/**
* 视频列表
*/
private
List
<
DbFileBo
>
videoList
;
/**
* 语言列表
*/
private
List
<
DbFileBo
>
voiceList
;
}
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbWxUserBo.java
View file @
dd2d1e62
...
@@ -27,7 +27,7 @@ public class DbWxUserBo extends BaseEntity {
...
@@ -27,7 +27,7 @@ public class DbWxUserBo extends BaseEntity {
/**
/**
* 主键标识
* 主键标识
*/
*/
@NotNull
(
message
=
"主键标识不能为空"
,
groups
=
{
EditGroup
.
class
})
@NotNull
(
message
=
"主键标识不能为空"
,
groups
=
{})
private
Long
id
;
private
Long
id
;
/**
/**
...
@@ -36,11 +36,7 @@ public class DbWxUserBo extends BaseEntity {
...
@@ -36,11 +36,7 @@ public class DbWxUserBo extends BaseEntity {
@NotBlank
(
message
=
"微信用户的唯一标识不能为空"
,
groups
=
{
AddGroup
.
class
})
@NotBlank
(
message
=
"微信用户的唯一标识不能为空"
,
groups
=
{
AddGroup
.
class
})
private
String
openId
;
private
String
openId
;
/**
* 是否是团长:1:是,2:否
*/
@NotNull
(
message
=
"是否是团长:1:是,2:否不能为空"
,
groups
=
{
AddGroup
.
class
})
private
Integer
headOrNot
;
/**
/**
* 用户昵称
* 用户昵称
...
@@ -96,17 +92,6 @@ public class DbWxUserBo extends BaseEntity {
...
@@ -96,17 +92,6 @@ public class DbWxUserBo extends BaseEntity {
@NotBlank
(
message
=
"授权手机号不能为空"
,
groups
=
{
AddGroup
.
class
})
@NotBlank
(
message
=
"授权手机号不能为空"
,
groups
=
{
AddGroup
.
class
})
private
String
authMobile
;
private
String
authMobile
;
/**
* 商场编码
*/
@NotBlank
(
message
=
"商场编码不能为空"
,
groups
=
{
AddGroup
.
class
})
private
String
mallCode
;
/**
* 会员卡号
*/
@NotBlank
(
message
=
"会员卡号不能为空"
,
groups
=
{
AddGroup
.
class
})
private
String
userCode
;
/**
/**
*
*
...
@@ -132,29 +117,13 @@ public class DbWxUserBo extends BaseEntity {
...
@@ -132,29 +117,13 @@ public class DbWxUserBo extends BaseEntity {
@NotBlank
(
message
=
"微信原始ID不能为空"
,
groups
=
{
AddGroup
.
class
})
@NotBlank
(
message
=
"微信原始ID不能为空"
,
groups
=
{
AddGroup
.
class
})
private
String
wechatOriginalId
;
private
String
wechatOriginalId
;
/**
* 下单次数
*/
@NotNull
(
message
=
"下单次数不能为空"
,
groups
=
{
AddGroup
.
class
})
private
Long
orderNum
;
/**
* 累计消费
*/
@NotNull
(
message
=
"累计消费不能为空"
,
groups
=
{
AddGroup
.
class
})
private
BigDecimal
cumulativeConsumption
;
/**
* 最近消费时间
*/
@NotNull
(
message
=
"最近消费时间不能为空"
,
groups
=
{
AddGroup
.
class
})
private
Date
lastConsumptionTime
;
/**
* 创建人Code
*/
@NotBlank
(
message
=
"创建人Code不能为空"
,
groups
=
{
AddGroup
.
class
})
private
String
createCode
;
/**
/**
* 更新时间
* 更新时间
...
@@ -168,11 +137,6 @@ public class DbWxUserBo extends BaseEntity {
...
@@ -168,11 +137,6 @@ public class DbWxUserBo extends BaseEntity {
@NotBlank
(
message
=
"更新者不能为空"
,
groups
=
{
AddGroup
.
class
})
@NotBlank
(
message
=
"更新者不能为空"
,
groups
=
{
AddGroup
.
class
})
private
String
modifyBy
;
private
String
modifyBy
;
/**
* 更新者code
*/
@NotBlank
(
message
=
"更新者code不能为空"
,
groups
=
{
AddGroup
.
class
})
private
String
modifyCode
;
/**
/**
* 删除状态 0:未删除 1:删除
* 删除状态 0:未删除 1:删除
...
...
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java
View file @
dd2d1e62
...
@@ -119,14 +119,14 @@ public class DbOrderVo {
...
@@ -119,14 +119,14 @@ public class DbOrderVo {
/**
/**
* 图片列表
* 图片列表
*/
*/
private
List
<
DbFileVo
>
picture
;
private
List
<
DbFileVo
>
picture
List
;
/**
/**
* 视频列表
* 视频列表
*/
*/
private
List
<
DbFileVo
>
video
;
private
List
<
DbFileVo
>
video
List
;
/**
/**
* 语言列表
* 语言列表
*/
*/
private
List
<
DbFileVo
>
voice
;
private
List
<
DbFileVo
>
voice
List
;
}
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbWxUserVo.java
View file @
dd2d1e62
...
@@ -32,11 +32,6 @@ public class DbWxUserVo {
...
@@ -32,11 +32,6 @@ public class DbWxUserVo {
@ExcelProperty
(
value
=
"微信用户的唯一标识"
)
@ExcelProperty
(
value
=
"微信用户的唯一标识"
)
private
String
openId
;
private
String
openId
;
/**
* 是否是团长:1:是,2:否
*/
@ExcelProperty
(
value
=
"是否是团长:1:是,2:否"
)
private
Integer
headOrNot
;
/**
/**
* 用户昵称
* 用户昵称
...
@@ -93,18 +88,6 @@ public class DbWxUserVo {
...
@@ -93,18 +88,6 @@ public class DbWxUserVo {
private
String
authMobile
;
private
String
authMobile
;
/**
/**
* 商场编码
*/
@ExcelProperty
(
value
=
"商场编码"
)
private
String
mallCode
;
/**
* 会员卡号
*/
@ExcelProperty
(
value
=
"会员卡号"
)
private
String
userCode
;
/**
*
*
*/
*/
@ExcelProperty
(
value
=
""
)
@ExcelProperty
(
value
=
""
)
...
@@ -126,31 +109,15 @@ public class DbWxUserVo {
...
@@ -126,31 +109,15 @@ public class DbWxUserVo {
* 微信原始ID
* 微信原始ID
*/
*/
@ExcelProperty
(
value
=
"微信原始ID"
)
@ExcelProperty
(
value
=
"微信原始ID"
)
private
String
wechatOriginalId
;
private
String
wechatOriginalId
;
/**
* 微信原始ID
/**
* 下单次数
*/
@ExcelProperty
(
value
=
"下单次数"
)
private
Long
orderNum
;
/**
* 累计消费
*/
@ExcelProperty
(
value
=
"累计消费"
)
private
BigDecimal
cumulativeConsumption
;
/**
* 最近消费时间
*/
*/
@ExcelProperty
(
value
=
"最近消费时间"
)
@ExcelProperty
(
value
=
"创建时间"
)
private
Date
lastConsumptionTime
;
private
String
createTime
;
/**
* 微信原始ID
/**
* 创建人Code
*/
*/
@ExcelProperty
(
value
=
"创建人
Code
"
)
@ExcelProperty
(
value
=
"创建人"
)
private
String
create
Code
;
private
String
create
By
;
/**
/**
* 更新时间
* 更新时间
...
@@ -164,11 +131,7 @@ public class DbWxUserVo {
...
@@ -164,11 +131,7 @@ public class DbWxUserVo {
@ExcelProperty
(
value
=
"更新者"
)
@ExcelProperty
(
value
=
"更新者"
)
private
String
modifyBy
;
private
String
modifyBy
;
/**
* 更新者code
*/
@ExcelProperty
(
value
=
"更新者code"
)
private
String
modifyCode
;
/**
/**
* 删除状态 0:未删除 1:删除
* 删除状态 0:未删除 1:删除
...
...
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbFileMapper.java
View file @
dd2d1e62
...
@@ -4,6 +4,8 @@ import com.yongqi.xinrenli.domain.DbFile;
...
@@ -4,6 +4,8 @@ import com.yongqi.xinrenli.domain.DbFile;
import
com.yongqi.xinrenli.domain.vo.DbFileVo
;
import
com.yongqi.xinrenli.domain.vo.DbFileVo
;
import
com.yongqi.common.core.mapper.BaseMapperPlus
;
import
com.yongqi.common.core.mapper.BaseMapperPlus
;
import
java.util.List
;
/**
/**
* 文件Mapper接口
* 文件Mapper接口
*
*
...
@@ -12,4 +14,5 @@ import com.yongqi.common.core.mapper.BaseMapperPlus;
...
@@ -12,4 +14,5 @@ import com.yongqi.common.core.mapper.BaseMapperPlus;
*/
*/
public
interface
DbFileMapper
extends
BaseMapperPlus
<
DbFileMapper
,
DbFile
,
DbFileVo
>
{
public
interface
DbFileMapper
extends
BaseMapperPlus
<
DbFileMapper
,
DbFile
,
DbFileVo
>
{
List
<
DbFileVo
>
selectFileList
();
}
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
View file @
dd2d1e62
This diff is collapsed.
Click to expand it.
yongqi-xinrenli/src/main/resources/mapper/DbFileMapper.xml
View file @
dd2d1e62
...
@@ -16,6 +16,8 @@
...
@@ -16,6 +16,8 @@
<result
property=
"modifyTime"
column=
"modify_time"
/>
<result
property=
"modifyTime"
column=
"modify_time"
/>
<result
property=
"modifyName"
column=
"modify_name"
/>
<result
property=
"modifyName"
column=
"modify_name"
/>
</resultMap>
</resultMap>
<select
id=
""
>
</select>
</mapper>
</mapper>
yongqi-xinrenli/src/main/resources/mapper/DbWxUserMapper.xml
View file @
dd2d1e62
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
<resultMap
type=
"com.yongqi.xinrenli.domain.DbWxUser"
id=
"DbWxUserResult"
>
<resultMap
type=
"com.yongqi.xinrenli.domain.DbWxUser"
id=
"DbWxUserResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"id"
column=
"id"
/>
<result
property=
"openId"
column=
"open_id"
/>
<result
property=
"openId"
column=
"open_id"
/>
<result
property=
"headOrNot"
column=
"head_or_not"
/>
<result
property=
"nickname"
column=
"nickname"
/>
<result
property=
"nickname"
column=
"nickname"
/>
<result
property=
"sex"
column=
"sex"
/>
<result
property=
"sex"
column=
"sex"
/>
<result
property=
"province"
column=
"province"
/>
<result
property=
"province"
column=
"province"
/>
...
@@ -17,21 +16,14 @@
...
@@ -17,21 +16,14 @@
<result
property=
"unionId"
column=
"union_id"
/>
<result
property=
"unionId"
column=
"union_id"
/>
<result
property=
"mobile"
column=
"mobile"
/>
<result
property=
"mobile"
column=
"mobile"
/>
<result
property=
"authMobile"
column=
"auth_mobile"
/>
<result
property=
"authMobile"
column=
"auth_mobile"
/>
<result
property=
"mallCode"
column=
"mall_code"
/>
<result
property=
"userCode"
column=
"user_code"
/>
<result
property=
"sessionKey"
column=
"session_key"
/>
<result
property=
"sessionKey"
column=
"session_key"
/>
<result
property=
"wechatSubscribe"
column=
"wechat_subscribe"
/>
<result
property=
"wechatSubscribe"
column=
"wechat_subscribe"
/>
<result
property=
"cancelSubscribe"
column=
"cancel_subscribe"
/>
<result
property=
"cancelSubscribe"
column=
"cancel_subscribe"
/>
<result
property=
"wechatOriginalId"
column=
"wechat_original_id"
/>
<result
property=
"wechatOriginalId"
column=
"wechat_original_id"
/>
<result
property=
"orderNum"
column=
"order_num"
/>
<result
property=
"cumulativeConsumption"
column=
"cumulative_consumption"
/>
<result
property=
"lastConsumptionTime"
column=
"last_consumption_time"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createCode"
column=
"create_code"
/>
<result
property=
"modifyTime"
column=
"modify_time"
/>
<result
property=
"modifyTime"
column=
"modify_time"
/>
<result
property=
"modifyBy"
column=
"modify_by"
/>
<result
property=
"modifyBy"
column=
"modify_by"
/>
<result
property=
"modifyCode"
column=
"modify_code"
/>
<result
property=
"deleteFlag"
column=
"delete_flag"
/>
<result
property=
"deleteFlag"
column=
"delete_flag"
/>
</resultMap>
</resultMap>
...
...
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