订单管理相关
This commit is contained in:
@@ -39,4 +39,19 @@ public class OnlyOfficeCallbackController {
|
|||||||
response.put("error", 0);
|
response.put("error", 0);
|
||||||
return new ResponseEntity<>(response, HttpStatus.OK);
|
return new ResponseEntity<>(response, HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 处理OnlyOffice文档编辑服务发送的回调
|
||||||
|
*/
|
||||||
|
@PostMapping("/contract /callback/{id}")
|
||||||
|
@PermitAll
|
||||||
|
@TenantIgnore
|
||||||
|
public ResponseEntity<Map<String, Integer>> handleContractCallback(@RequestBody OnlyOfficeCallback callback, @PathVariable String id,@RequestParam("fileName") String fileName) {
|
||||||
|
// 处理回调逻辑
|
||||||
|
callbackService.processContractCallback(callback,id,fileName);
|
||||||
|
// 返回必须的响应,否则OnlyOffice会显示错误
|
||||||
|
Map<String, Integer> response = new HashMap<>();
|
||||||
|
response.put("error", 0);
|
||||||
|
return new ResponseEntity<>(response, HttpStatus.OK);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,4 +9,11 @@ public interface OnlyOfficeCallbackService {
|
|||||||
* @param callback 回调数据
|
* @param callback 回调数据
|
||||||
*/
|
*/
|
||||||
void processCallback(OnlyOfficeCallback callback,String id,String fileName);
|
void processCallback(OnlyOfficeCallback callback,String id,String fileName);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 处理OnlyOffice回调
|
||||||
|
* @param callback 回调数据
|
||||||
|
*/
|
||||||
|
void processContractCallback(OnlyOfficeCallback callback,String id,String fileName);
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -68,4 +68,11 @@ public interface TmplInscBsnRelService {
|
|||||||
* @param tmplInscBsnRelRespVO 类
|
* @param tmplInscBsnRelRespVO 类
|
||||||
*/
|
*/
|
||||||
void getTmplInscBsnRelDetails(TmplInscBsnRelRespVO tmplInscBsnRelRespVO);
|
void getTmplInscBsnRelDetails(TmplInscBsnRelRespVO tmplInscBsnRelRespVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 跟新cntt
|
||||||
|
*
|
||||||
|
* @param bsnId ,params
|
||||||
|
*/
|
||||||
|
void updateCntt(Long bsnId,String params);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -145,6 +145,20 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateCntt(Long bsnId, String params) {
|
||||||
|
List<TmplInscBsnRelDO> tmplInscBsnRelDOS = tmplInscBsnRelMapper.selectList(new LambdaQueryWrapper<TmplInscBsnRelDO>()
|
||||||
|
.eq(TmplInscBsnRelDO::getBsnId, bsnId).orderByDesc(TmplInscBsnRelDO::getVer)
|
||||||
|
);
|
||||||
|
if (tmplInscBsnRelDOS.isEmpty()) {
|
||||||
|
throw exception(TEMPLATE_INSTANCE_FILE_NOT_EXISTS);
|
||||||
|
}
|
||||||
|
TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelDOS.get(0);
|
||||||
|
tmplInscBsnRelDO.setCntt( params);
|
||||||
|
tmplInscBsnRelMapper.updateById(tmplInscBsnRelDO);
|
||||||
|
log.info("更新业务实例cntt字段值成功");
|
||||||
|
}
|
||||||
|
|
||||||
//业务条款
|
//业务条款
|
||||||
private List<TmplInscItmBsnRespVO> setTmplInscItmBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
|
private List<TmplInscItmBsnRespVO> setTmplInscItmBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
|
||||||
List<TmplInscItmBsnRespVO> tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscItmBsnDO>()
|
List<TmplInscItmBsnRespVO> tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscItmBsnDO>()
|
||||||
@@ -152,7 +166,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
|
|||||||
), TmplInscItmBsnRespVO.class);
|
), TmplInscItmBsnRespVO.class);
|
||||||
tmplInscItmBsnRespVOS.forEach(tmplInscItmBsnRespVO -> {
|
tmplInscItmBsnRespVOS.forEach(tmplInscItmBsnRespVO -> {
|
||||||
tmplInscBsnRelRespVO.getInstanceItemRespVOS().forEach(instanceItemRespVO -> {
|
tmplInscBsnRelRespVO.getInstanceItemRespVOS().forEach(instanceItemRespVO -> {
|
||||||
if (tmplInscItmBsnRespVO.getInscItmId().equals(instanceItemRespVO.getId())){
|
if (tmplInscItmBsnRespVO.getInscItmId().equals(instanceItemRespVO.getId())) {
|
||||||
tmplInscItmBsnRespVO.setItmName(instanceItemRespVO.getItmName());
|
tmplInscItmBsnRespVO.setItmName(instanceItemRespVO.getItmName());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -273,4 +287,6 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
|
|||||||
log.info("删除业务实例条款值【{}】", ids);
|
log.info("删除业务实例条款值【{}】", ids);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.zt.plat.module.contractorder.enums.salesorder;
|
||||||
|
|
||||||
|
import com.zt.plat.framework.common.exception.ErrorCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* contract-order 错误码枚举类
|
||||||
|
*
|
||||||
|
* contract-order 系统,使用 1-xxx-xxx-xxx 段
|
||||||
|
*
|
||||||
|
* @author ZT
|
||||||
|
*/
|
||||||
|
public interface ErrorCodeConstants {
|
||||||
|
|
||||||
|
// ========== 合同模块 1-027-000-000 ==========
|
||||||
|
ErrorCode SALES_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_008_00_600, "消费订单不存在");
|
||||||
|
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,19 @@
|
|||||||
|
package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
|
import lombok.Data;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Schema(description = "上下级订单 请求 VO")
|
||||||
|
@Validated
|
||||||
|
public class DownOrUpOrderReqVO {
|
||||||
|
@Schema(description = "订单id")
|
||||||
|
private Long orderId;
|
||||||
|
@Schema(description = "订单类型")
|
||||||
|
@NotEmpty(message = "订单类型不能为空(上游 up ,下游 down)")
|
||||||
|
private String orderType;
|
||||||
|
@Schema(description = "订单号")
|
||||||
|
private String orderNo;
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Schema(description = "上下游订单 响应 VO")
|
||||||
|
public class DownOrUpOrderRespVO {
|
||||||
|
/**
|
||||||
|
* 订单编号
|
||||||
|
*/
|
||||||
|
@Schema(description = "订单编号")
|
||||||
|
private String orderNo;
|
||||||
|
/**
|
||||||
|
* 订单ID
|
||||||
|
*/
|
||||||
|
@Schema(description = "订单ID")
|
||||||
|
private String orderId;
|
||||||
|
/**
|
||||||
|
* 订单类型
|
||||||
|
*/
|
||||||
|
@Schema(description = "订单类型")
|
||||||
|
private String orderType;
|
||||||
|
/**
|
||||||
|
* 合同名称
|
||||||
|
*/
|
||||||
|
@Schema(description = "合同名称")
|
||||||
|
private String contractName;
|
||||||
|
/**
|
||||||
|
* 合同id
|
||||||
|
*/
|
||||||
|
@Schema(description = "合同id")
|
||||||
|
private String contractId;
|
||||||
|
/**
|
||||||
|
* 合同号
|
||||||
|
*/
|
||||||
|
@Schema(description = "合同号")
|
||||||
|
private String contractNumber;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -156,4 +156,6 @@ public class PrchOrdDtlPageReqVO extends PageParam {
|
|||||||
@Schema(description = "金属元素编码")
|
@Schema(description = "金属元素编码")
|
||||||
private String elemCdg;
|
private String elemCdg;
|
||||||
|
|
||||||
|
@Schema(description = "订单类型")
|
||||||
|
private String splyBsnTp;
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user