Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
cms
Commits
27473b46
提交
27473b46
authored
9月 11, 2023
作者:
xiaowang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
根据订单编号获取合同信息
上级
cf20ed4d
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
134 行增加
和
1 行删除
+134
-1
ContractInfoDTO.java
...java/com/mmc/iuav/user/model/fdd/dto/ContractInfoDTO.java
+66
-0
UserFddDTO.java
...main/java/com/mmc/iuav/user/model/fdd/dto/UserFddDTO.java
+9
-0
ContractController.java
.../com/mmc/iuav/user/controller/fdd/ContractController.java
+8
-1
ContractDao.java
.../src/main/java/com/mmc/iuav/user/dao/fdd/ContractDao.java
+5
-0
ContractInfoDO.java
...ain/java/com/mmc/iuav/user/entity/fdd/ContractInfoDO.java
+7
-0
ContractService.java
...n/java/com/mmc/iuav/user/service/fdd/ContractService.java
+4
-0
ContractServiceImpl.java
...m/mmc/iuav/user/service/fdd/impl/ContractServiceImpl.java
+10
-0
ContractDao.xml
...ervice-user/src/main/resources/mapper/fdd/ContractDao.xml
+25
-0
没有找到文件。
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/dto/ContractInfoDTO.java
0 → 100644
浏览文件 @
27473b46
package
com
.
mmc
.
iuav
.
user
.
model
.
fdd
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* (ContractInfoDO)实体类
*
* @author makejava
* @since 2023-09-07 10:14:08
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public
class
ContractInfoDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
42558889792167148L
;
@ApiModelProperty
(
value
=
"id"
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"发起合同方用户唯一标识"
)
private
String
unionId
;
@ApiModelProperty
(
value
=
"订单号"
)
private
String
orderNo
;
@ApiModelProperty
(
value
=
"合同编号"
)
private
String
contractNo
;
@ApiModelProperty
(
value
=
"合同标题"
)
private
String
contractTitle
;
@ApiModelProperty
(
value
=
"状态: 0、等待平台签署1、平台签署失败 2、等待(买家/供应商)签署(平台签署成功) 3、(买家/供应商)签署失败 4、(买家/供应商)签署成功、5、归档"
)
private
Integer
signStatus
;
@ApiModelProperty
(
value
=
"签署完成日期"
)
private
Date
singerTime
;
@ApiModelProperty
(
value
=
"平台签署失败备注信息"
)
private
String
aRemark
;
@ApiModelProperty
(
value
=
"(买家/供应商)签署失败备注信息"
)
private
String
bRemark
;
@ApiModelProperty
(
value
=
"平台签署交易号"
)
private
String
aTransactionId
;
@ApiModelProperty
(
value
=
"(买家/供应商)签署交易号"
)
private
String
bTransactionId
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
@ApiModelProperty
(
value
=
"更新时间"
)
private
Date
updateTime
;
@ApiModelProperty
(
value
=
"归档日期"
)
private
Date
archiveDate
;
}
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/dto/UserFddDTO.java
浏览文件 @
27473b46
package
com
.
mmc
.
iuav
.
user
.
model
.
fdd
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
...
...
@@ -20,12 +21,20 @@ import java.util.Date;
public
class
UserFddDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
4952516407490131779L
;
@ApiModelProperty
(
value
=
"id"
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"用户唯一标识"
)
private
String
unionId
;
@ApiModelProperty
(
value
=
"客户id"
)
private
String
customerId
;
@ApiModelProperty
(
value
=
"个人实名认证状态"
)
private
Integer
personVerifyStatus
;
@ApiModelProperty
(
value
=
"企业实名认证状态"
)
private
Integer
entVerifyStatus
;
@ApiModelProperty
(
value
=
"账号类型 1个人 2企业"
)
private
Integer
accountType
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
@ApiModelProperty
(
value
=
"更新时间"
)
private
Date
updateTime
;
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/fdd/ContractController.java
浏览文件 @
27473b46
...
...
@@ -2,6 +2,7 @@ package com.mmc.iuav.user.controller.fdd;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.user.controller.BaseController
;
import
com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO
;
import
com.mmc.iuav.user.model.fdd.vo.ContractVO
;
import
com.mmc.iuav.user.service.fdd.ContractService
;
import
io.swagger.annotations.*
;
...
...
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
import
springfox.documentation.annotations.ApiIgnore
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
@@ -70,5 +72,10 @@ public class ContractController extends BaseController {
return
contractService
.
file
(
contractId
,
this
.
getUserLoginInfoFromRedis
(
request
),
port
);
}
@ApiOperation
(
value
=
"根据订单编号数组获取合同的信息"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ContractInfoDTO
.
class
)})
@PostMapping
(
"/listContractInfoByOrderNo"
)
public
ResultBody
<
ContractInfoDTO
>
getContractInfo
(
@ApiParam
(
value
=
"订单编号list"
)
@RequestBody
List
<
String
>
orderNos
)
{
return
contractService
.
listContractInfoByOrderNo
(
orderNos
);
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/fdd/ContractDao.java
浏览文件 @
27473b46
...
...
@@ -2,6 +2,9 @@ package com.mmc.iuav.user.dao.fdd;
import
com.mmc.iuav.user.entity.fdd.ContractInfoDO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
* @Author LW
...
...
@@ -23,4 +26,6 @@ public interface ContractDao {
void
deleteContractInfo
(
String
orderNo
);
void
updateContractInfo
(
ContractInfoDO
updateContract
);
List
<
ContractInfoDO
>
listContractInfoByOrderNo
(
@Param
(
value
=
"orderNo"
)
List
<
String
>
orderNo
);
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/fdd/ContractInfoDO.java
浏览文件 @
27473b46
package
com
.
mmc
.
iuav
.
user
.
entity
.
fdd
;
import
com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
...
...
@@ -68,5 +69,11 @@ public class ContractInfoDO implements Serializable {
* 归档日期
*/
private
Date
archiveDate
;
public
ContractInfoDTO
buildContractInfoDTO
()
{
return
ContractInfoDTO
.
builder
().
id
(
this
.
id
).
unionId
(
this
.
unionId
).
orderNo
(
this
.
orderNo
).
contractNo
(
this
.
contractNo
).
contractTitle
(
this
.
contractTitle
)
.
signStatus
(
this
.
signStatus
).
singerTime
(
this
.
singerTime
).
aRemark
(
this
.
aRemark
).
bRemark
(
this
.
bRemark
).
aTransactionId
(
this
.
aTransactionId
).
bTransactionId
(
this
.
bTransactionId
)
.
createTime
(
this
.
createTime
).
updateTime
(
this
.
updateTime
).
archiveDate
(
this
.
archiveDate
).
build
();
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/ContractService.java
浏览文件 @
27473b46
...
...
@@ -2,8 +2,10 @@ package com.mmc.iuav.user.service.fdd;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.user.model.dto.LoginSuccessDTO
;
import
com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO
;
import
com.mmc.iuav.user.model.fdd.vo.ContractVO
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
@@ -36,4 +38,6 @@ public interface ContractService {
ResultBody
notifyStamp
(
Map
<
String
,
String
>
map
);
ResultBody
file
(
String
contractId
,
LoginSuccessDTO
loginSuccessDTO
,
Integer
port
);
ResultBody
<
ContractInfoDTO
>
listContractInfoByOrderNo
(
List
<
String
>
orderNos
);
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/impl/ContractServiceImpl.java
浏览文件 @
27473b46
...
...
@@ -13,6 +13,7 @@ import com.mmc.iuav.user.dao.fdd.ContractDao;
import
com.mmc.iuav.user.entity.fdd.ContractInfoDO
;
import
com.mmc.iuav.user.entity.fdd.UserFddDO
;
import
com.mmc.iuav.user.model.dto.LoginSuccessDTO
;
import
com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO
;
import
com.mmc.iuav.user.model.fdd.vo.ContractVO
;
import
com.mmc.iuav.user.service.fdd.ContractService
;
import
com.mmc.iuav.user.service.fdd.SealManageService
;
...
...
@@ -22,8 +23,10 @@ import org.springframework.stereotype.Service;
import
javax.annotation.Resource
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
/**
* @Author LW
...
...
@@ -218,4 +221,11 @@ public class ContractServiceImpl implements ContractService {
contractDao
.
updateContractInfo
(
contractDetailDO
);
return
ResultBody
.
success
(
JSONObject
.
parseObject
(
result
));
}
@Override
public
ResultBody
<
ContractInfoDTO
>
listContractInfoByOrderNo
(
List
<
String
>
orderNos
)
{
// 根据订单编号获取合同信息
List
<
ContractInfoDO
>
contractInfoDOList
=
contractDao
.
listContractInfoByOrderNo
(
orderNos
);
return
ResultBody
.
success
(
contractInfoDOList
==
null
?
null
:
contractInfoDOList
.
stream
().
map
(
ContractInfoDO:
:
buildContractInfoDTO
).
collect
(
Collectors
.
toList
()));
}
}
csm-service/cms-service-user/src/main/resources/mapper/fdd/ContractDao.xml
浏览文件 @
27473b46
...
...
@@ -65,4 +65,28 @@
</if>
</where>
</select>
<select
id=
"listContractInfoByOrderNo"
resultType=
"com.mmc.iuav.user.entity.fdd.ContractInfoDO"
>
select id,
union_id,
order_no,
contract_no,
contract_title,
sign_status,
singer_time,
a_remark,
b_remark,
a_transaction_id,
b_transaction_id,
create_time,
update_time,
archive_date
from contract_info
<where>
<if
test=
"orderNo != null"
>
<foreach
collection=
"orderNo"
item=
"orderNo"
separator=
","
>
order_no = #{orderNo}
</foreach>
</if>
</where>
</select>
</mapper>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论