提交 27473b46 作者: xiaowang

根据订单编号获取合同信息

上级 cf20ed4d
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;
}
package com.mmc.iuav.user.model.fdd.dto; package com.mmc.iuav.user.model.fdd.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -20,12 +21,20 @@ import java.util.Date; ...@@ -20,12 +21,20 @@ import java.util.Date;
public class UserFddDTO implements Serializable { public class UserFddDTO implements Serializable {
private static final long serialVersionUID = -4952516407490131779L; private static final long serialVersionUID = -4952516407490131779L;
@ApiModelProperty(value = "id")
private Integer id; private Integer id;
@ApiModelProperty(value = "用户唯一标识")
private String unionId; private String unionId;
@ApiModelProperty(value = "客户id")
private String customerId; private String customerId;
@ApiModelProperty(value = "个人实名认证状态")
private Integer personVerifyStatus; private Integer personVerifyStatus;
@ApiModelProperty(value = "企业实名认证状态")
private Integer entVerifyStatus; private Integer entVerifyStatus;
@ApiModelProperty(value = "账号类型 1个人 2企业")
private Integer accountType; private Integer accountType;
@ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "更新时间")
private Date updateTime; private Date updateTime;
} }
...@@ -2,6 +2,7 @@ package com.mmc.iuav.user.controller.fdd; ...@@ -2,6 +2,7 @@ package com.mmc.iuav.user.controller.fdd;
import com.mmc.iuav.response.ResultBody; import com.mmc.iuav.response.ResultBody;
import com.mmc.iuav.user.controller.BaseController; 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.model.fdd.vo.ContractVO;
import com.mmc.iuav.user.service.fdd.ContractService; import com.mmc.iuav.user.service.fdd.ContractService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
...@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -70,5 +72,10 @@ public class ContractController extends BaseController { ...@@ -70,5 +72,10 @@ public class ContractController extends BaseController {
return contractService.file(contractId, this.getUserLoginInfoFromRedis(request), port); 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);
}
} }
...@@ -2,6 +2,9 @@ package com.mmc.iuav.user.dao.fdd; ...@@ -2,6 +2,9 @@ package com.mmc.iuav.user.dao.fdd;
import com.mmc.iuav.user.entity.fdd.ContractInfoDO; import com.mmc.iuav.user.entity.fdd.ContractInfoDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* @Author LW * @Author LW
...@@ -23,4 +26,6 @@ public interface ContractDao { ...@@ -23,4 +26,6 @@ public interface ContractDao {
void deleteContractInfo(String orderNo); void deleteContractInfo(String orderNo);
void updateContractInfo(ContractInfoDO updateContract); void updateContractInfo(ContractInfoDO updateContract);
List<ContractInfoDO> listContractInfoByOrderNo(@Param(value = "orderNo") List<String> orderNo);
} }
package com.mmc.iuav.user.entity.fdd; package com.mmc.iuav.user.entity.fdd;
import com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -68,5 +69,11 @@ public class ContractInfoDO implements Serializable { ...@@ -68,5 +69,11 @@ public class ContractInfoDO implements Serializable {
* 归档日期 * 归档日期
*/ */
private Date archiveDate; 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();
}
} }
...@@ -2,8 +2,10 @@ package com.mmc.iuav.user.service.fdd; ...@@ -2,8 +2,10 @@ package com.mmc.iuav.user.service.fdd;
import com.mmc.iuav.response.ResultBody; import com.mmc.iuav.response.ResultBody;
import com.mmc.iuav.user.model.dto.LoginSuccessDTO; 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.model.fdd.vo.ContractVO;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -36,4 +38,6 @@ public interface ContractService { ...@@ -36,4 +38,6 @@ public interface ContractService {
ResultBody notifyStamp(Map<String, String> map); ResultBody notifyStamp(Map<String, String> map);
ResultBody file(String contractId, LoginSuccessDTO loginSuccessDTO, Integer port); ResultBody file(String contractId, LoginSuccessDTO loginSuccessDTO, Integer port);
ResultBody<ContractInfoDTO> listContractInfoByOrderNo(List<String> orderNos);
} }
...@@ -13,6 +13,7 @@ import com.mmc.iuav.user.dao.fdd.ContractDao; ...@@ -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.ContractInfoDO;
import com.mmc.iuav.user.entity.fdd.UserFddDO; import com.mmc.iuav.user.entity.fdd.UserFddDO;
import com.mmc.iuav.user.model.dto.LoginSuccessDTO; 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.model.fdd.vo.ContractVO;
import com.mmc.iuav.user.service.fdd.ContractService; import com.mmc.iuav.user.service.fdd.ContractService;
import com.mmc.iuav.user.service.fdd.SealManageService; import com.mmc.iuav.user.service.fdd.SealManageService;
...@@ -22,8 +23,10 @@ import org.springframework.stereotype.Service; ...@@ -22,8 +23,10 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
/** /**
* @Author LW * @Author LW
...@@ -218,4 +221,11 @@ public class ContractServiceImpl implements ContractService { ...@@ -218,4 +221,11 @@ public class ContractServiceImpl implements ContractService {
contractDao.updateContractInfo(contractDetailDO); contractDao.updateContractInfo(contractDetailDO);
return ResultBody.success(JSONObject.parseObject(result)); 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()));
}
} }
...@@ -65,4 +65,28 @@ ...@@ -65,4 +65,28 @@
</if> </if>
</where> </where>
</select> </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> </mapper>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论