Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
290918de
Commit
290918de
authored
Jun 27, 2023
by
jinxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
应用订单购买接口
parent
e1ce4de9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
962 additions
and
51 deletions
+962
-51
AppOrderCheckDTO.java
...m/gic/haoban/manage/api/dto/licence/AppOrderCheckDTO.java
+89
-0
AppOrderNoticeDTO.java
.../gic/haoban/manage/api/dto/licence/AppOrderNoticeDTO.java
+77
-0
AppOrderPageDTO.java
...om/gic/haoban/manage/api/dto/licence/AppOrderPageDTO.java
+245
-0
AppOrderPageQDTO.java
.../haoban/manage/api/dto/qdto/licence/AppOrderPageQDTO.java
+55
-0
AppOrderQDTO.java
.../gic/haoban/manage/api/dto/qdto/licence/AppOrderQDTO.java
+113
-0
AppOrderApiService.java
...haoban/manage/api/service/licence/AppOrderApiService.java
+51
-0
Config.java
...ain/java/com/gic/haoban/manage/service/config/Config.java
+20
-0
TabHaobanAppOrderMapper.java
...an/manage/service/dao/mapper/TabHaobanAppOrderMapper.java
+3
-0
TabHaobanAppOrder.java
...m/gic/haoban/manage/service/entity/TabHaobanAppOrder.java
+3
-3
TabHaobanAppOrderService.java
...oban/manage/service/service/TabHaobanAppOrderService.java
+5
-11
TabHaobanAppOrderServiceImpl.java
...ge/service/service/impl/TabHaobanAppOrderServiceImpl.java
+18
-14
AppOrderApiServiceImpl.java
...vice/service/out/impl/licence/AppOrderApiServiceImpl.java
+215
-0
TabHaobanAppOrderMapper.xml
...ice/src/main/resources/mapper/TabHaobanAppOrderMapper.xml
+17
-2
AppOrderController.java
...ban/manage/web/controller/licence/AppOrderController.java
+44
-19
AppOrderPageQO.java
.../com/gic/haoban/manage/web/qo/licence/AppOrderPageQO.java
+1
-1
AppOrderNoticeVO.java
...om/gic/haoban/manage/web/vo/licence/AppOrderNoticeVO.java
+5
-1
dubbo-haoban-manage-web.xml
...3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
+1
-0
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/AppOrderCheckDTO.java
0 → 100644
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
.
licence
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public
class
AppOrderCheckDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 弹窗类型 0 正常 1新购 2 续期
*/
private
Integer
type
;
/**
* 已购买人数
*/
private
Integer
userNum
;
/**
* 购买生效期的开始时间
*/
private
Date
beginTime
;
/**
* 购买生效期的结束时间
*/
private
Date
endTime
;
/**
* 合同到期天数
*/
private
Integer
contractDay
;
/**
* 当前时间
*/
private
Date
now
;
public
Integer
getType
()
{
return
type
;
}
public
void
setType
(
Integer
type
)
{
this
.
type
=
type
;
}
public
Integer
getUserNum
()
{
return
userNum
;
}
public
void
setUserNum
(
Integer
userNum
)
{
this
.
userNum
=
userNum
;
}
public
Date
getBeginTime
()
{
return
beginTime
;
}
public
void
setBeginTime
(
Date
beginTime
)
{
this
.
beginTime
=
beginTime
;
}
public
Date
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
Date
endTime
)
{
this
.
endTime
=
endTime
;
}
public
Integer
getContractDay
()
{
return
contractDay
;
}
public
void
setContractDay
(
Integer
contractDay
)
{
this
.
contractDay
=
contractDay
;
}
public
Date
getNow
()
{
return
now
;
}
public
void
setNow
(
Date
now
)
{
this
.
now
=
now
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/AppOrderNoticeDTO.java
0 → 100644
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
.
licence
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public
class
AppOrderNoticeDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 弹窗类型 0 无需弹窗 1 未购买付费应用弹窗 2付费应用已过期弹窗 3 查询购买许可账号是否存在未支付订单
*/
private
Integer
type
;
/**
* 是否支付 0否 1是
*/
private
Integer
payFlag
;
/**
* 未支付订单id
*/
private
String
orderId
;
/**
* 支付的url
*/
private
String
orderUrl
;
/**
* 到期时间
*/
private
Date
endTime
;
public
Integer
getType
()
{
return
type
;
}
public
void
setType
(
Integer
type
)
{
this
.
type
=
type
;
}
public
Integer
getPayFlag
()
{
return
payFlag
;
}
public
void
setPayFlag
(
Integer
payFlag
)
{
this
.
payFlag
=
payFlag
;
}
public
String
getOrderId
()
{
return
orderId
;
}
public
void
setOrderId
(
String
orderId
)
{
this
.
orderId
=
orderId
;
}
public
String
getOrderUrl
()
{
return
orderUrl
;
}
public
void
setOrderUrl
(
String
orderUrl
)
{
this
.
orderUrl
=
orderUrl
;
}
public
Date
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
Date
endTime
)
{
this
.
endTime
=
endTime
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/AppOrderPageDTO.java
0 → 100644
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
.
licence
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public
class
AppOrderPageDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键id
*/
private
Long
id
;
/**
* wx企业Id
*/
private
String
wxEnterpriseId
;
/**
* 企业微信订单id
*/
private
String
orderId
;
/**
* 订单状态1 - 待支付2 - 已支付3 - 订单取消4 - 支付过期5 - 退款申请中6 - 已退款7 - 交易完成8 - 待企业确认9 - 已部分退款
*/
private
Integer
orderStatus
;
/**
* 订单类型 0 新购、1 扩容、2 续期
*/
private
Integer
orderType
;
/**
* 购买人数
*/
private
Integer
userNum
;
/**
* 购买时长
*/
private
Integer
duration
;
/**
* 购买生效期的开始时间
*/
private
Date
beginTime
;
/**
* 购买生效期的结束时间
*/
private
Date
endTime
;
/**
* 支付时间
*/
private
Date
payTime
;
/**
* 原价,单位分
*/
private
Integer
originPrice
;
/**
* 折后价,单位分
*/
private
Integer
paidPrice
;
/**
* 收款订单链接
*/
private
String
orderUrl
;
/**
* 创建时间
*/
private
Date
createTime
;
/**
* 更新时间
*/
private
Date
updateTime
;
/**
* 创建人
*/
private
String
creatorId
;
/**
* 创建人名称
*/
private
String
creatorName
;
/**
* 订单支付到期时间
*/
private
Date
expireTime
;
/**
* 有效状态 0 -- 1待生效 2生效中 3已失效
*/
private
Integer
effectiveState
;
public
Long
getId
()
{
return
id
;
}
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
public
String
getOrderId
()
{
return
orderId
;
}
public
void
setOrderId
(
String
orderId
)
{
this
.
orderId
=
orderId
;
}
public
Integer
getOrderStatus
()
{
return
orderStatus
;
}
public
void
setOrderStatus
(
Integer
orderStatus
)
{
this
.
orderStatus
=
orderStatus
;
}
public
Integer
getOrderType
()
{
return
orderType
;
}
public
void
setOrderType
(
Integer
orderType
)
{
this
.
orderType
=
orderType
;
}
public
Integer
getUserNum
()
{
return
userNum
;
}
public
void
setUserNum
(
Integer
userNum
)
{
this
.
userNum
=
userNum
;
}
public
Integer
getDuration
()
{
return
duration
;
}
public
void
setDuration
(
Integer
duration
)
{
this
.
duration
=
duration
;
}
public
Date
getBeginTime
()
{
return
beginTime
;
}
public
void
setBeginTime
(
Date
beginTime
)
{
this
.
beginTime
=
beginTime
;
}
public
Date
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
Date
endTime
)
{
this
.
endTime
=
endTime
;
}
public
Date
getPayTime
()
{
return
payTime
;
}
public
void
setPayTime
(
Date
payTime
)
{
this
.
payTime
=
payTime
;
}
public
Integer
getOriginPrice
()
{
return
originPrice
;
}
public
void
setOriginPrice
(
Integer
originPrice
)
{
this
.
originPrice
=
originPrice
;
}
public
Integer
getPaidPrice
()
{
return
paidPrice
;
}
public
void
setPaidPrice
(
Integer
paidPrice
)
{
this
.
paidPrice
=
paidPrice
;
}
public
String
getOrderUrl
()
{
return
orderUrl
;
}
public
void
setOrderUrl
(
String
orderUrl
)
{
this
.
orderUrl
=
orderUrl
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
String
getCreatorId
()
{
return
creatorId
;
}
public
void
setCreatorId
(
String
creatorId
)
{
this
.
creatorId
=
creatorId
;
}
public
String
getCreatorName
()
{
return
creatorName
;
}
public
void
setCreatorName
(
String
creatorName
)
{
this
.
creatorName
=
creatorName
;
}
public
Date
getExpireTime
()
{
return
expireTime
;
}
public
void
setExpireTime
(
Date
expireTime
)
{
this
.
expireTime
=
expireTime
;
}
public
Integer
getEffectiveState
()
{
return
effectiveState
;
}
public
void
setEffectiveState
(
Integer
effectiveState
)
{
this
.
effectiveState
=
effectiveState
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/AppOrderPageQDTO.java
0 → 100644
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
.
qdto
.
licence
;
import
com.gic.api.base.commons.BasePageInfo
;
import
java.io.Serializable
;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public
class
AppOrderPageQDTO
extends
BasePageInfo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 订单状态1 - 待支付2 - 已支付3 - 订单取消4 - 支付过期5 - 退款申请中6 - 已退款7 - 交易完成8 - 待企业确认9 - 已部分退款
*/
private
Integer
orderStatus
;
/**
* 企业微信订单id
*/
private
String
orderId
;
/**
* wx企业Id
*/
private
String
wxEnterpriseId
;
public
Integer
getOrderStatus
()
{
return
orderStatus
;
}
public
void
setOrderStatus
(
Integer
orderStatus
)
{
this
.
orderStatus
=
orderStatus
;
}
public
String
getOrderId
()
{
return
orderId
;
}
public
void
setOrderId
(
String
orderId
)
{
this
.
orderId
=
orderId
;
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/AppOrderQDTO.java
0 → 100644
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
.
qdto
.
licence
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public
class
AppOrderQDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 订单类型 0 新购、1 扩容、2 续期
*/
private
Integer
orderType
;
/**
* 购买人数
*/
private
Integer
userNum
;
/**
* 购买时长
*/
private
Integer
duration
;
/**
* 购买生效期的开始时间
*/
private
Date
beginTime
;
/**
* 购买生效期的结束时间
*/
private
Date
endTime
;
/**
* wx企业Id
*/
private
String
wxEnterpriseId
;
/**
* 创建人
*/
private
String
creatorId
;
/**
* 创建人名称
*/
private
String
creatorName
;
public
Integer
getOrderType
()
{
return
orderType
;
}
public
void
setOrderType
(
Integer
orderType
)
{
this
.
orderType
=
orderType
;
}
public
Integer
getUserNum
()
{
return
userNum
;
}
public
void
setUserNum
(
Integer
userNum
)
{
this
.
userNum
=
userNum
;
}
public
Integer
getDuration
()
{
return
duration
;
}
public
void
setDuration
(
Integer
duration
)
{
this
.
duration
=
duration
;
}
public
Date
getBeginTime
()
{
return
beginTime
;
}
public
void
setBeginTime
(
Date
beginTime
)
{
this
.
beginTime
=
beginTime
;
}
public
Date
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
Date
endTime
)
{
this
.
endTime
=
endTime
;
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
public
String
getCreatorId
()
{
return
creatorId
;
}
public
void
setCreatorId
(
String
creatorId
)
{
this
.
creatorId
=
creatorId
;
}
public
String
getCreatorName
()
{
return
creatorName
;
}
public
void
setCreatorName
(
String
creatorName
)
{
this
.
creatorName
=
creatorName
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/licence/AppOrderApiService.java
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
api
.
service
.
licence
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.haoban.manage.api.dto.licence.AppOrderCheckDTO
;
import
com.gic.haoban.manage.api.dto.licence.AppOrderNoticeDTO
;
import
com.gic.haoban.manage.api.dto.licence.AppOrderPageDTO
;
import
com.gic.haoban.manage.api.dto.qdto.licence.AppOrderPageQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.licence.AppOrderQDTO
;
/**
* @description: 订单应用购买
* @Author: wenhua
...
...
@@ -7,5 +15,48 @@ package com.gic.haoban.manage.api.service.licence;
*/
public
interface
AppOrderApiService
{
/**
* 分页查询企业付费应用
*
* @param qdto
* @return
*/
ServiceResponse
<
Page
<
AppOrderPageDTO
>>
getAppOrderPage
(
AppOrderPageQDTO
qdto
);
/**
* 新增订单
* @param qdto
* @return
*/
ServiceResponse
<
Boolean
>
saveAppOrder
(
AppOrderQDTO
qdto
);
/**
* 取消订单
* @param orderId 应用订单主键id
* @return
*/
ServiceResponse
<
Boolean
>
cancelAppOrder
(
Long
orderId
);
/**
* 购买弹窗校验
* @param wxEnterpriseId
* @return
*/
ServiceResponse
<
AppOrderCheckDTO
>
checkAppOrder
(
String
wxEnterpriseId
);
/**
* 登录好办弹窗校验
* @param wxEnterpriseId
* @return
*/
ServiceResponse
<
AppOrderNoticeDTO
>
noticeAppOrder
(
String
wxEnterpriseId
);
/**
* 企业微信通知回调
* @param param 回调参数
* @return
*/
ServiceResponse
<
Boolean
>
qywxCallBack
(
String
param
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/config/Config.java
View file @
290918de
...
...
@@ -53,6 +53,26 @@ public class Config {
private
String
promotionCaseId
;
@Value
(
"${promotionCaseName}"
)
private
String
promotionCaseName
;
@Value
(
"${buySuiteId}"
)
private
String
buySuiteId
;
@Value
(
"${suiteid}"
)
private
String
suiteid
;
public
String
getSuiteid
()
{
return
suiteid
;
}
public
void
setSuiteid
(
String
suiteid
)
{
this
.
suiteid
=
suiteid
;
}
public
String
getBuySuiteId
()
{
return
buySuiteId
;
}
public
void
setBuySuiteId
(
String
buySuiteId
)
{
this
.
buySuiteId
=
buySuiteId
;
}
public
String
getQywxCashierSecret
()
{
return
qywxCashierSecret
;
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAppOrderMapper.java
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
service
.
dao
.
mapper
;
import
com.gic.haoban.manage.api.dto.qdto.licence.AppOrderPageQDTO
;
import
com.gic.haoban.manage.service.entity.TabHaobanAppOrder
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.data.domain.Pageable
;
...
...
@@ -79,5 +80,7 @@ public interface TabHaobanAppOrderMapper {
*/
List
<
String
>
getQywxOrderId
(
@Param
(
"qywxOrderId"
)
String
qywxOrderId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
List
<
TabHaobanAppOrder
>
getAppOrderPage
(
AppOrderPageQDTO
qdto
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanAppOrder.java
View file @
290918de
...
...
@@ -22,7 +22,7 @@ public class TabHaobanAppOrder implements Serializable {
/**
* 企业微信订单id
*/
private
Lo
ng
orderId
;
private
Stri
ng
orderId
;
/**
* 订单状态1 - 待支付2 - 已支付3 - 订单取消4 - 支付过期5 - 退款申请中6 - 已退款7 - 交易完成8 - 待企业确认9 - 已部分退款
*/
...
...
@@ -112,11 +112,11 @@ public class TabHaobanAppOrder implements Serializable {
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
public
Lo
ng
getOrderId
()
{
public
Stri
ng
getOrderId
()
{
return
orderId
;
}
public
void
setOrderId
(
Lo
ng
orderId
)
{
public
void
setOrderId
(
Stri
ng
orderId
)
{
this
.
orderId
=
orderId
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/TabHaobanAppOrderService.java
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
service
.
service
;
import
com.gic.api.base.commons.Page
;
import
com.gic.haoban.manage.api.dto.licence.AppOrderPageDTO
;
import
com.gic.haoban.manage.api.dto.qdto.licence.AppOrderPageQDTO
;
import
com.gic.haoban.manage.service.entity.TabHaobanAppOrder
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.PageRequest
;
/**
* (TabHaobanAppOrder)表服务接口
...
...
@@ -21,15 +22,6 @@ public interface TabHaobanAppOrderService {
TabHaobanAppOrder
queryById
(
Long
id
);
/**
* 分页查询
*
* @param tabHaobanAppOrder 筛选条件
* @param pageRequest 分页对象
* @return 查询结果
*/
Page
<
TabHaobanAppOrder
>
queryByPage
(
TabHaobanAppOrder
tabHaobanAppOrder
,
PageRequest
pageRequest
);
/**
* 新增数据
*
* @param tabHaobanAppOrder 实例对象
...
...
@@ -53,4 +45,6 @@ public interface TabHaobanAppOrderService {
*/
boolean
deleteById
(
Long
id
);
Page
<
AppOrderPageDTO
>
getAppOrderPage
(
AppOrderPageQDTO
qdto
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/TabHaobanAppOrderServiceImpl.java
View file @
290918de
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
impl
;
import
com.gic.api.base.commons.Page
;
import
com.gic.commons.util.PageHelperUtils
;
import
com.gic.haoban.manage.api.dto.licence.AppOrderPageDTO
;
import
com.gic.haoban.manage.api.dto.licence.RenewalUserDTO
;
import
com.gic.haoban.manage.api.dto.qdto.licence.AppOrderPageQDTO
;
import
com.gic.haoban.manage.service.entity.TabHaobanAppOrder
;
import
com.gic.haoban.manage.service.dao.mapper.TabHaobanAppOrderMapper
;
import
com.gic.haoban.manage.service.entity.TabHaobanRenewalUser
;
import
com.gic.haoban.manage.service.service.TabHaobanAppOrderService
;
import
com.github.pagehelper.PageHelper
;
import
org.springframework.stereotype.Service
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.PageImpl
;
import
org.springframework.data.domain.PageRequest
;
import
javax.annotation.Resource
;
import
java.util.List
;
/**
* (TabHaobanAppOrder)表服务实现类
...
...
@@ -33,19 +40,6 @@ public class TabHaobanAppOrderServiceImpl implements TabHaobanAppOrderService {
}
/**
* 分页查询
*
* @param tabHaobanAppOrder 筛选条件
* @param pageRequest 分页对象
* @return 查询结果
*/
@Override
public
Page
<
TabHaobanAppOrder
>
queryByPage
(
TabHaobanAppOrder
tabHaobanAppOrder
,
PageRequest
pageRequest
)
{
long
total
=
this
.
tabHaobanAppOrderMapper
.
count
(
tabHaobanAppOrder
);
return
new
PageImpl
<>(
this
.
tabHaobanAppOrderMapper
.
queryAllByLimit
(
tabHaobanAppOrder
,
pageRequest
),
pageRequest
,
total
);
}
/**
* 新增数据
*
* @param tabHaobanAppOrder 实例对象
...
...
@@ -79,4 +73,14 @@ public class TabHaobanAppOrderServiceImpl implements TabHaobanAppOrderService {
public
boolean
deleteById
(
Long
id
)
{
return
this
.
tabHaobanAppOrderMapper
.
deleteById
(
id
)
>
0
;
}
@Override
public
Page
<
AppOrderPageDTO
>
getAppOrderPage
(
AppOrderPageQDTO
qdto
)
{
if
(
qdto
==
null
){
return
null
;
}
PageHelper
.
startPage
(
qdto
);
List
<
TabHaobanAppOrder
>
page
=
tabHaobanAppOrderMapper
.
getAppOrderPage
(
qdto
);
return
PageHelperUtils
.
changePageHelperToCurrentPage
(
page
,
AppOrderPageDTO
.
class
);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/AppOrderApiServiceImpl.java
View file @
290918de
This diff is collapsed.
Click to expand it.
haoban-manage3-service/src/main/resources/mapper/TabHaobanAppOrderMapper.xml
View file @
290918de
...
...
@@ -5,7 +5,7 @@
<resultMap
type=
"com.gic.haoban.manage.service.entity.TabHaobanAppOrder"
id=
"TabHaobanAppOrderMap"
>
<result
property=
"id"
column=
"id"
jdbcType=
"INTEGER"
/>
<result
property=
"wxEnterpriseId"
column=
"wx_enterprise_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"orderId"
column=
"order_id"
jdbcType=
"
INTEGE
R"
/>
<result
property=
"orderId"
column=
"order_id"
jdbcType=
"
VARCHA
R"
/>
<result
property=
"orderStatus"
column=
"order_status"
jdbcType=
"INTEGER"
/>
<result
property=
"orderType"
column=
"order_type"
jdbcType=
"INTEGER"
/>
<result
property=
"userNum"
column=
"user_num"
jdbcType=
"INTEGER"
/>
...
...
@@ -240,7 +240,6 @@
set delete_flag = 1,update_time = now()
where id = #{id}
</update>
<select
id=
"getQywxOrderId"
resultType=
"string"
>
SELECT
order_id
...
...
@@ -250,5 +249,21 @@
</if>
</select>
<select
id=
"getAppOrderPage"
resultMap=
"TabHaobanAppOrderMap"
>
select
id, wx_enterprise_id, order_id, order_status, order_type, user_num, duration, begin_time, end_time, pay_time, origin_price, paid_price, order_url, delete_flag, create_time, update_time, creator_id, creator_name,expire_time
from tab_haoban_app_order
where delete_flag = 0
<if
test=
"wxEnterpriseId != null and wxEnterpriseId != ''"
>
and wx_enterprise_id = #{wxEnterpriseId}
</if>
<if
test=
"orderId != null"
>
and order_id = #{orderId}
</if>
<if
test=
"orderStatus != null"
>
and order_status = #{orderStatus}
</if>
</select>
</mapper>
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/AppOrderController.java
View file @
290918de
...
...
@@ -3,10 +3,17 @@ package com.gic.haoban.manage.web.controller.licence;
import
cn.hutool.core.convert.Convert
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.PageHelperUtils
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.api.service.EnterpriseService
;
import
com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.common.utils.AuthWebRequestUtil
;
import
com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderPageQDTO
;
import
com.gic.haoban.manage.api.dto.licence.AppOrderPageDTO
;
import
com.gic.haoban.manage.api.dto.qdto.licence.AppOrderPageQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.licence.AppOrderQDTO
;
import
com.gic.haoban.manage.api.service.WxEnterpriseApiService
;
import
com.gic.haoban.manage.api.service.licence.AppOrderApiService
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.qo.licence.AppOrderPageQO
;
import
com.gic.haoban.manage.web.qo.licence.AppOrderQO
;
...
...
@@ -16,6 +23,7 @@ import com.gic.haoban.manage.web.vo.licence.AppOrderPageVO;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
...
...
@@ -32,6 +40,13 @@ public class AppOrderController {
private
static
Logger
logger
=
LogManager
.
getLogger
(
AppOrderController
.
class
);
@Autowired
private
EnterpriseService
enterpriseService
;
@Autowired
private
WxEnterpriseApiService
wxEnterpriseApiService
;
@Autowired
private
AppOrderApiService
appOrderApiService
;
/**
* 分页查询应用订单列表
*/
...
...
@@ -41,29 +56,36 @@ public class AppOrderController {
if
(
loginUser
==
null
||
StringUtils
.
isBlank
(
loginUser
.
getEnterpriseId
()))
{
return
RestResponse
.
failure
(
Convert
.
toStr
(
HaoBanErrCode
.
ERR_4
.
getCode
()),
HaoBanErrCode
.
ERR_4
.
getMsg
());
}
String
enterpriseId
=
loginUser
.
getEnterpriseId
();
String
wxEnterpriseId
=
loginUser
.
getWxEnterpriseId
();
String
clerkName
=
loginUser
.
getClerkName
();
LicenceOrderPageQDTO
qdto
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
qo
),
LicenceOrderPageQDTO
.
class
);
qdto
.
setEnterpriseId
(
enterpriseId
);
qdto
.
setWxEnterpriseId
(
wxEnterpriseId
);
qdto
.
setCreatorName
(
clerkName
);
qdto
.
setType
(
1
);
return
RestResponse
.
successResult
(
null
);
AppOrderPageQDTO
qdto
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
qo
),
AppOrderPageQDTO
.
class
);
qdto
.
setWxEnterpriseId
(
loginUser
.
getWxEnterpriseId
());
Page
<
AppOrderPageDTO
>
page
=
appOrderApiService
.
getAppOrderPage
(
qdto
).
getResult
();
Page
<
AppOrderPageVO
>
result
=
PageHelperUtils
.
changePageToCurrentPage
(
page
,
AppOrderPageVO
.
class
);
return
RestResponse
.
successResult
(
result
);
}
/**
* 新增订单
*/
@RequestMapping
(
"app-order-save"
)
public
RestResponse
<
JSONObject
>
saveAppOrder
(
@RequestBody
AppOrderQO
qo
)
{
public
RestResponse
<
Boolean
>
saveAppOrder
(
@RequestBody
AppOrderQO
qo
)
{
WebLoginDTO
loginUser
=
AuthWebRequestUtil
.
getLoginUser
();
if
(
loginUser
==
null
||
StringUtils
.
isBlank
(
loginUser
.
getEnterpriseId
()))
{
return
RestResponse
.
failure
(
Convert
.
toStr
(
HaoBanErrCode
.
ERR_4
.
getCode
()),
HaoBanErrCode
.
ERR_4
.
getMsg
());
}
return
RestResponse
.
successResult
(
null
);
String
wxEnterpriseId
=
loginUser
.
getWxEnterpriseId
();
String
clerkName
=
loginUser
.
getClerkName
();
String
clerkId
=
loginUser
.
getClerkId
();
AppOrderQDTO
qdto
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
qo
),
AppOrderQDTO
.
class
);
qdto
.
setWxEnterpriseId
(
wxEnterpriseId
);
qdto
.
setCreatorName
(
clerkName
);
qdto
.
setCreatorId
(
clerkId
);
ServiceResponse
<
Boolean
>
response
=
appOrderApiService
.
saveAppOrder
(
qdto
);
if
(
response
.
isSuccess
())
{
return
RestResponse
.
successResult
(
true
);
}
return
RestResponse
.
failure
(
response
.
getCode
(),
response
.
getMessage
());
}
/**
...
...
@@ -75,8 +97,13 @@ public class AppOrderController {
if
(
loginUser
==
null
||
StringUtils
.
isBlank
(
loginUser
.
getEnterpriseId
()))
{
return
RestResponse
.
failure
(
Convert
.
toStr
(
HaoBanErrCode
.
ERR_4
.
getCode
()),
HaoBanErrCode
.
ERR_4
.
getMsg
());
}
return
RestResponse
.
successResult
(
null
);
ServiceResponse
<
Boolean
>
response
=
appOrderApiService
.
cancelAppOrder
(
orderId
);
if
(
response
.
isSuccess
())
{
return
RestResponse
.
successResult
(
true
);
}
return
RestResponse
.
failure
(
response
.
getCode
(),
response
.
getMessage
());
}
/**
* 购买弹窗校验
*/
...
...
@@ -86,8 +113,10 @@ public class AppOrderController {
if
(
loginUser
==
null
||
StringUtils
.
isBlank
(
loginUser
.
getEnterpriseId
()))
{
return
RestResponse
.
failure
(
Convert
.
toStr
(
HaoBanErrCode
.
ERR_4
.
getCode
()),
HaoBanErrCode
.
ERR_4
.
getMsg
());
}
return
RestResponse
.
successResult
(
null
);
}
/**
* 登录好办弹窗校验
*/
...
...
@@ -97,12 +126,8 @@ public class AppOrderController {
if
(
loginUser
==
null
||
StringUtils
.
isBlank
(
loginUser
.
getEnterpriseId
()))
{
return
RestResponse
.
failure
(
Convert
.
toStr
(
HaoBanErrCode
.
ERR_4
.
getCode
()),
HaoBanErrCode
.
ERR_4
.
getMsg
());
}
return
RestResponse
.
successResult
(
null
);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/licence/AppOrderPageQO.java
View file @
290918de
...
...
@@ -26,6 +26,6 @@ public class AppOrderPageQO extends BasePageInfo implements Serializable {
/**
* 企业微信订单id
*/
private
Lo
ng
orderId
;
private
Stri
ng
orderId
;
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/AppOrderNoticeVO.java
View file @
290918de
...
...
@@ -30,11 +30,15 @@ public class AppOrderNoticeVO implements Serializable {
/**
* 未支付订单id
*/
private
Lo
ng
orderId
;
private
Stri
ng
orderId
;
/**
* 支付的url
*/
private
String
orderUrl
;
/**
* 到期时间
*/
private
Date
endTime
;
}
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
View file @
290918de
...
...
@@ -134,5 +134,6 @@
<dubbo:reference
interface=
"com.gic.marketing.api.service.MemberTagMarketingApiService"
id=
"memberTagMarketingApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.licence.LicenceOrderApiService"
id=
"licenceOrderApiService"
/>
<dubbo:reference
id=
"pay4WXService"
interface=
"com.gic.thirdparty.api.service.Pay4WXService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"appOrderApiService"
interface=
"com.gic.haoban.manage.api.service.licence.AppOrderApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
</beans>
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