Commit e68e76b6 authored by xyt's avatar xyt

交易服务--代码重构

parent 10180f01
......@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
public class PlatformInquiryController extends BaseController {
@Resource
IPlatformInquiryService platformInquiryListService;
IPlatformInquiryService platformInquiryService;
/**
*询价单管理-询价单列表查询
......@@ -34,7 +34,7 @@ public class PlatformInquiryController extends BaseController {
@GetMapping("/platform/inquiry/list")
public Wrapper<PageData<InquiryListResponse>> inquiryList(InquiryListRequest request, HttpServletRequest httpServletRequest) {
UserLoginCacheDTO sysUser = this.getSysUser(httpServletRequest);
return platformInquiryListService.inquiryList(request,sysUser);
return platformInquiryService.inquiryList(request,sysUser);
}
/**
......@@ -42,6 +42,6 @@ public class PlatformInquiryController extends BaseController {
*/
@GetMapping("/platform/inquiry/list/details")
public Wrapper<InquiryListDetailsResponse> inquiryListDetails(InquiryListDetailsRequest request) {
return platformInquiryListService.inquiryListDetails(request);
return platformInquiryService.inquiryListDetails(request);
}
}
......@@ -24,8 +24,9 @@ import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("/transaction")
public class PlatformQuoteController extends BaseController {
@Resource
IPlatformQuoteService platformProductQuotationService;
IPlatformQuoteService platformQuoteService;
/**
* 询价报价-报价单列表查询
......@@ -33,7 +34,7 @@ public class PlatformQuoteController extends BaseController {
@GetMapping("/platform/product/quotation/list")
public Wrapper<PageData<ProductQuotationListResponse>> productQuotationList(ProductQuotationListRequest request, HttpServletRequest httpServletRequest) {
UserLoginCacheDTO sysUser = this.getSysUser(httpServletRequest);
return platformProductQuotationService.productQuotationList(request,sysUser);
return platformQuoteService.productQuotationList(request,sysUser);
}
/**
......@@ -42,6 +43,6 @@ public class PlatformQuoteController extends BaseController {
@GetMapping("/platform/product/quotation/details")
public Wrapper<ProductQuotationDetailsResponse> productQuotationDetails(ProductQuotationDetailsRequest request, HttpServletRequest httpServletRequest) {
UserLoginCacheDTO sysUser = this.getSysUser(httpServletRequest);
return platformProductQuotationService.productQuotationDetails(request,sysUser);
return platformQuoteService.productQuotationDetails(request,sysUser);
}
}
......@@ -22,13 +22,11 @@ import javax.servlet.http.HttpServletRequest;
*/
@RestController
@RequestMapping("/transaction/mobile")
public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
public class MobileConfirmQuoteController extends BaseController {
@Resource
IConfirmQuoteService notarizeEnquiryQuotedPriceService;
/**
* 确认询价报价-报价单列表查询
*/
......@@ -47,9 +45,6 @@ public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
return notarizeEnquiryQuotedPriceService.productQuotationDetails(request,sysUser);
}
/**
* 询价报价-待提交报价单列表查询
*/
......@@ -86,7 +81,6 @@ public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
return notarizeEnquiryQuotedPriceService.notarizeEnquiryQuotedPriceSubmitAll(request,sysUser);
}
/**
* 确认询价报价-待审核报价单查询
*/
......@@ -96,7 +90,6 @@ public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
return notarizeEnquiryQuotedPriceService.notarizeEnquiryQuotedPriceAuditList(request,sysUser);
}
/**
* 确认询价报价-提交审核(一级)
*/
......@@ -115,7 +108,6 @@ public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
return notarizeEnquiryQuotedPriceService.notarizeEnquiryQuotedPriceAuditAll(request,sysUser);
}
/**
* 确认询价报价-待审核报价单列表(二级)
*/
......@@ -125,7 +117,6 @@ public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
return notarizeEnquiryQuotedPriceService.notarizeEnquiryQuotedPriceAuditListTwo(request,sysUser);
}
/**
* 确认询价报价-提交审核(二级)
*/
......@@ -144,7 +135,6 @@ public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
return notarizeEnquiryQuotedPriceService.notarizeEnquiryQuotedPriceAuditAllTwo(request,sysUser);
}
/**
* 确认询价报价-待审核报价单列表
*/
......@@ -154,7 +144,6 @@ public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
return notarizeEnquiryQuotedPriceService.notarizeEnquiryQuotedPriceAffirmList(request,sysUser);
}
/**
* 确认询价报价-提交审核
*/
......@@ -172,6 +161,4 @@ public class MobileNotarizeEnquiryQuotedPriceController extends BaseController {
UserLoginCacheDTO sysUser = this.getSysUser(httpServletRequest);
return notarizeEnquiryQuotedPriceService.notarizeEnquiryQuotedPriceAffirmAll(request,sysUser);
}
}
......@@ -26,14 +26,11 @@ import java.util.List;
*/
@RestController
@RequestMapping("/transaction/mobile")
public class MobileInquiryListController extends BaseController {
public class MobileInquiryController extends BaseController {
@Resource
IInquiryService inquiryListService;
/**
* 询价报价-商品询价记录
*/
......@@ -61,7 +58,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryListDetails(request,sysUser);
}
/**
* 商品询价-待新增询价单添加
*/
......@@ -71,7 +67,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryListAdd(request, sysUser);
}
/**
* 商品询价-询价单删除
*/
......@@ -88,7 +83,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryListDeleteAll(request);
}
/**
* 商品询价-询价单修改
*/
......@@ -98,7 +92,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryListUpdate(request, sysUser);
}
/**
* 商品询价-询价商品列表查询
*/
......@@ -133,7 +126,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryListSubmitAll(request, sysUser);
}
/**
* 商品询价-待审核询价单一级列表
*/
......@@ -152,7 +144,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryDocumentsReview(request, sysUser);
}
/**
* 商品询价-批量审核询价单审核(一级)
*/
......@@ -162,7 +153,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryDocumentsReviewAll(request, sysUser);
}
/**
* 商品询价-待审核询价单二级列表
*/
......@@ -172,7 +162,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryToAuditListTwo(request, sysUser);
}
/**
* 商品询价-审核询价单(二级)
*/
......@@ -182,7 +171,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquiryDocumentsReviewTwo(request, sysUser);
}
/**
* 商品询价-批量审核询价单(二级)
*/
......@@ -201,7 +189,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.submitInquirySheetList(request, sysUser);
}
/**
* 商品询价-提交询价单
*/
......@@ -211,7 +198,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquirySubmit(request, sysUser);
}
/**
* 商品询价-批量提交询价单
*/
......@@ -221,7 +207,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.inquirySubmitAll(request, sysUser);
}
/**
* 商品询价-内部工作流程枚举
*/
......@@ -230,7 +215,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.getProductInquiryInteriorEnum(request);
}
/**
* 商品询价-外部工作流程枚举
*/
......@@ -239,7 +223,6 @@ public class MobileInquiryListController extends BaseController {
return inquiryListService.getProductexternalInteriorEnum();
}
/**
* 商品询价-用户积分数据同步处理内部接口
*/
......@@ -247,5 +230,4 @@ public class MobileInquiryListController extends BaseController {
private Wrapper memberInquiryIntegralUpdate(@Valid @RequestBody MemberInquiryIntegralUpdateRequest request) {
return inquiryListService.memberInquiryIntegralUpdate(request);
}
}
......@@ -23,12 +23,11 @@ import javax.servlet.http.HttpServletRequest;
*/
@RestController
@RequestMapping("/transaction/mobile")
public class MobilePlatformInquiryListController extends BaseController {
public class MobilePlatformInquiryController extends BaseController {
@Resource
IPlatformInquiryService platformInquiryListService;
/**
*询价单管理-询价单列表查询
*/
......@@ -38,9 +37,6 @@ public class MobilePlatformInquiryListController extends BaseController {
return platformInquiryListService.inquiryList(request,sysUser);
}
/**
* 询价单管理-询价单详情
*/
......@@ -48,5 +44,4 @@ public class MobilePlatformInquiryListController extends BaseController {
public Wrapper<InquiryListDetailsResponse> inquiryListDetails(InquiryListDetailsRequest request) {
return platformInquiryListService.inquiryListDetails(request);
}
}
......@@ -21,11 +21,10 @@ import javax.servlet.http.HttpServletRequest;
*/
@RestController
@RequestMapping("/transaction/mobile")
public class MobilePlatformProductQuotationController extends BaseController {
public class MobilePlatformQuoteController extends BaseController {
@Resource
IPlatformQuoteService platformProductQuotationService;
/**
* 询价报价-报价单列表查询
*/
......
......@@ -22,8 +22,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/transaction/mobile")
public class MobileProductQuotationController extends BaseController {
public class MobileQuoteController extends BaseController {
@Resource
IQuoteService productQuotationService;
......@@ -40,8 +39,6 @@ public class MobileProductQuotationController extends BaseController {
return inquiryListService.productInquiryList(request,sysUser);
}
/**
*询价报价-询价单详情
*/
......@@ -51,7 +48,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.inquiryListDetails(request,sysUser);
}
/**
*询价报价-报价单商品列表查询-分页
*/
......@@ -60,8 +56,6 @@ public class MobileProductQuotationController extends BaseController {
return inquiryListService.inquiryDetails(request);
}
/**
* 询价报价-报价单列表查询
*/
......@@ -80,7 +74,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.productQuotationDetails(request,sysUser);
}
/**
* 询价报价-新增询价报价单
*/
......@@ -90,7 +83,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.productQuotationAdd(request,sysUser);
}
/**
* 询价报价-修改询价报价单
*/
......@@ -109,7 +101,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.productQuotationDelete(request,sysUser);
}
/**
* 询价报价-批量删除询价报价单
*/
......@@ -155,7 +146,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.stayProductQuotationList(request,sysUser);
}
/**
* 询价报价-待审核报价单
*/
......@@ -174,7 +164,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.productQuotationAuditSubmitAll(request,sysUser);
}
/**
* 询价报价-待新增报价单列表查询
*/
......@@ -184,7 +173,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.auditProductQuotationListTwo(request,sysUser);
}
/**
* 询价报价-待审核报价单(二级)
*/
......@@ -203,7 +191,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.productQuotationAuditSubmitAllTwo(request,sysUser);
}
/**
* 询价报价-待提交报价单列表
*/
......@@ -213,7 +200,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.toSubmitProductQuotationListTwo(request,sysUser);
}
/**
* 商品询价-提交报价单
*/
......@@ -232,7 +218,6 @@ public class MobileProductQuotationController extends BaseController {
return productQuotationService.productQuotationToSubmitAll(request,sysUser);
}
/**
* 询价报价-查询对应询价单号
*/
......@@ -258,5 +243,4 @@ public class MobileProductQuotationController extends BaseController {
private Wrapper<List<QuotationExternalStateEnumResponse>> getQuotationtInquiryInteriorStateEnum() {
return productQuotationService.getQuotationtInquiryInteriorStateEnum();
}
}
......@@ -8,7 +8,7 @@ import com.ssy.lingxi.transaction.api.common.OrderConstant;
import com.ssy.lingxi.transaction.api.dto.request.InquiryListDetailsRequest;
import com.ssy.lingxi.transaction.api.dto.request.InquiryListRequest;
import com.ssy.lingxi.transaction.api.dto.response.*;
import com.ssy.lingxi.transaction.api.enums.ProductInquiryExternalStateEnum;
import com.ssy.lingxi.transaction.api.enums.InquiryExternalStateEnum;
import com.ssy.lingxi.transaction.entity.record.InquiryExternalRecord;
import com.ssy.lingxi.transaction.entity.Inquiry;
import com.ssy.lingxi.transaction.repository.InquiryExternalRecordRepository;
......@@ -38,16 +38,16 @@ public class PlatformInquiryServiceImpl implements IPlatformInquiryService {
JdbcTemplate jdbcTemplate;
@Resource
InquiryRepository inquiryListRepository;
InquiryRepository inquiryRepository;
@Resource
InquiryProductRepository inquiryListProductRepository;
InquiryProductRepository inquiryProductRepository;
@Resource
InquiryExternalRecordRepository externalInquiryListLogRepository;
InquiryExternalRecordRepository inquiryExternalRecordRepository;
@Resource
ProcessFeign taskExecuteControllerFeign;
ProcessFeign processFeign;
/**
* 交易中心-商品询价-询价单详情
......@@ -55,12 +55,12 @@ public class PlatformInquiryServiceImpl implements IPlatformInquiryService {
@Override
public Wrapper<InquiryListDetailsResponse> inquiryListDetails(InquiryListDetailsRequest request) {
InquiryListDetailsResponse inquiryListDetailsResponse=new InquiryListDetailsResponse();
Inquiry inquiryList = inquiryListRepository.findById(request.getId()).orElse(null);
Inquiry inquiryList = inquiryRepository.findById(request.getId()).orElse(null);
if(null==inquiryList){
return Wrapper.fail(ResponseCode.RECORDS_DON_T_EXIST);
}
BeanUtils.copyProperties(inquiryList,inquiryListDetailsResponse);
List<InquiryListProductResponse> collect = inquiryListProductRepository.findAllByInquiryListIdEquals(request.getId()).stream().map(inquiryListProduct -> {
List<InquiryListProductResponse> collect = inquiryProductRepository.findAllByInquiryListIdEquals(request.getId()).stream().map(inquiryListProduct -> {
InquiryListProductResponse inquiryListResponse = new InquiryListProductResponse();
BeanUtils.copyProperties(inquiryListProduct,inquiryListResponse);
return inquiryListResponse;
......@@ -68,7 +68,7 @@ public class PlatformInquiryServiceImpl implements IPlatformInquiryService {
inquiryListDetailsResponse.setInquiryListProductRequests(collect);
inquiryListDetailsResponse.setInquiryListMemberName(inquiryList.getCreateMemberName());
getExternalLog(inquiryListDetailsResponse, inquiryList.getId());
inquiryListDetailsResponse.setExternalStateName(ProductInquiryExternalStateEnum.getName(inquiryListDetailsResponse.getExternalState()));
inquiryListDetailsResponse.setExternalStateName(InquiryExternalStateEnum.getName(inquiryListDetailsResponse.getExternalState()));
return Wrapper.success(inquiryListDetailsResponse);
}
......@@ -82,7 +82,7 @@ public class PlatformInquiryServiceImpl implements IPlatformInquiryService {
List<InquiryListResponse> countryAreaListResponse = jdbcTemplate.query(sqlJointList(request, condition), new BeanPropertyRowMapper(InquiryListResponse.class));
if(!CollectionUtils.isEmpty(countryAreaListResponse)){
countryAreaListResponse.forEach(response->{
response.setExternalStateName(ProductInquiryExternalStateEnum.getName(response.getExternalState()));
response.setExternalStateName(InquiryExternalStateEnum.getName(response.getExternalState()));
});
}
return Wrapper.success(new PageData<>(count, countryAreaListResponse));
......@@ -173,12 +173,12 @@ public class PlatformInquiryServiceImpl implements IPlatformInquiryService {
* 获取询价单外部操作流程
*/
private void getExternalLog(InquiryListDetailsResponse response, Long id) {
List<InquiryExternalRecord> externalRequisitionForms = externalInquiryListLogRepository.findAllByInquiryListIdEquals(id);
List<InquiryExternalRecord> externalRequisitionForms = inquiryExternalRecordRepository.findAllByInquiryListIdEquals(id);
//查询外部流转
ExternalProcessQueryVO taskStepVO = new ExternalProcessQueryVO();
taskStepVO.setRoleId(response.getCreateRoleId());
taskStepVO.setProcessKey(ProcessEnum.PRODUCT_PRICING_OUTER_ORDER.getProcessKey());
Wrapper<SimpleProcessDefVO> wrapper = taskExecuteControllerFeign.findSimpleExternalTaskDefinitions(taskStepVO);
taskStepVO.setProcessKey(ProcessEnum.TRADE_INQUIRY_EXTERNAL.getProcessKey());
Wrapper<SimpleProcessDefVO> wrapper = processFeign.findSimpleExternalTaskDefinitions(taskStepVO);
List<LogStateResponse> externalList = new ArrayList<>();
if (ResponseCode.SUCCESS.getCode() != wrapper.getCode()) {
throw new RuntimeException(wrapper.getMessage());
......@@ -208,7 +208,7 @@ public class PlatformInquiryServiceImpl implements IPlatformInquiryService {
List<ExternalInquiryListLogResponse> externalInquiryListLogResponseList = externalRequisitionForms.stream().map(externalInquiryListLog -> {
ExternalInquiryListLogResponse externalInquiryListLogResponse = new ExternalInquiryListLogResponse();
BeanUtils.copyProperties(externalInquiryListLog, externalInquiryListLogResponse);
externalInquiryListLogResponse.setStateName(ProductInquiryExternalStateEnum.getName(externalInquiryListLogResponse.getState()));
externalInquiryListLogResponse.setStateName(InquiryExternalStateEnum.getName(externalInquiryListLogResponse.getState()));
return externalInquiryListLogResponse;
}).collect(Collectors.toList());
response.setExternalInquiryListLogResponses(externalInquiryListLogResponseList);
......
......@@ -11,7 +11,7 @@ import com.ssy.lingxi.transaction.api.dto.response.ExternalInquiryListLogRespons
import com.ssy.lingxi.transaction.api.dto.response.LogStateResponse;
import com.ssy.lingxi.transaction.api.dto.response.ProductQuotationDetailsResponse;
import com.ssy.lingxi.transaction.api.dto.response.ProductQuotationListResponse;
import com.ssy.lingxi.transaction.api.enums.ProductInquiryExternalStateEnum;
import com.ssy.lingxi.transaction.api.enums.InquiryExternalStateEnum;
import com.ssy.lingxi.transaction.entity.Quote;
import com.ssy.lingxi.transaction.entity.record.InquiryExternalRecord;
import com.ssy.lingxi.transaction.repository.InquiryExternalRecordRepository;
......@@ -50,10 +50,10 @@ public class PlatformQuoteServiceImpl implements IPlatformQuoteService {
QuoteRepository productQuotationRepository;
@Resource
ProcessFeign taskExecuteControllerFeign;
ProcessFeign processFeign;
@Resource
InquiryExternalRecordRepository externalInquiryListLogRepository;
InquiryExternalRecordRepository inquiryExternalRecordRepository;
/**
* 平台后台-询价报价-报价单列表查询
......@@ -68,7 +68,7 @@ public class PlatformQuoteServiceImpl implements IPlatformQuoteService {
List<ProductQuotationListResponse> countryAreaListResponse = jdbcTemplate.query(sqlJointList(request, condition), new BeanPropertyRowMapper(ProductQuotationListResponse.class));
if(!CollectionUtils.isEmpty(countryAreaListResponse)){
countryAreaListResponse.forEach(response->{
response.setExternalStateName(ProductInquiryExternalStateEnum.getName(response.getExternalState()));
response.setExternalStateName(InquiryExternalStateEnum.getName(response.getExternalState()));
});
}
return Wrapper.success(new PageData<>(count, countryAreaListResponse));
......@@ -89,7 +89,7 @@ public class PlatformQuoteServiceImpl implements IPlatformQuoteService {
}
BeanUtils.copyProperties(productQuotation, productQuotationDetailsResponse);
getExternalLog(productQuotationDetailsResponse, productQuotation);
productQuotationDetailsResponse.setExternalStateName(ProductInquiryExternalStateEnum.getName(productQuotationDetailsResponse.getExternalState()));
productQuotationDetailsResponse.setExternalStateName(InquiryExternalStateEnum.getName(productQuotationDetailsResponse.getExternalState()));
return Wrapper.success(productQuotationDetailsResponse);
}
......@@ -182,12 +182,12 @@ public class PlatformQuoteServiceImpl implements IPlatformQuoteService {
*/
private void getExternalLog(ProductQuotationDetailsResponse productQuotationDetailsResponse, Quote productQuotation) {
//获取外部流转记录
List<InquiryExternalRecord> logs = externalInquiryListLogRepository.findAllByInquiryListIdEquals(productQuotation.getInquiryListId());
List<InquiryExternalRecord> logs = inquiryExternalRecordRepository.findAllByInquiryListIdEquals(productQuotation.getInquiryListId());
List<LogStateResponse> externalQuotationStateResponses = new ArrayList<>();
ExternalProcessQueryVO taskStepVO = new ExternalProcessQueryVO();
taskStepVO.setProcessKey(ProcessEnum.PRODUCT_PRICING_OUTER_ORDER.getProcessKey());
taskStepVO.setProcessKey(ProcessEnum.TRADE_INQUIRY_EXTERNAL.getProcessKey());
taskStepVO.setRoleId(productQuotation.getMemberRoleId());
Wrapper<SimpleProcessDefVO> listWrapper = taskExecuteControllerFeign.findSimpleExternalTaskDefinitions(taskStepVO);
Wrapper<SimpleProcessDefVO> listWrapper = processFeign.findSimpleExternalTaskDefinitions(taskStepVO);
if (ResponseCode.SUCCESS.getCode() != listWrapper.getCode()) {
return;
}
......@@ -215,7 +215,7 @@ public class PlatformQuoteServiceImpl implements IPlatformQuoteService {
List<ExternalInquiryListLogResponse> externalInquiryListLogResponses = logs.stream().map(temp -> {
ExternalInquiryListLogResponse response = new ExternalInquiryListLogResponse();
BeanUtils.copyProperties(temp, response);
response.setStateName(ProductInquiryExternalStateEnum.getName(response.getState()));
response.setStateName(InquiryExternalStateEnum.getName(response.getState()));
return response;
}).collect(Collectors.toList());
productQuotationDetailsResponse.setExternalRequisitionFormResponses(externalInquiryListLogResponses);
......
......@@ -18,7 +18,6 @@ public class OrderConstant {
Integer AFTER_SALE_EXCHANGE_PROCESS = 2;
Integer AFTER_SALES_RETURN_PROCESS = 3;
Integer AFTER_SALES_MAINTENANCE_PROCESS = 4;
}
/**
......@@ -79,10 +78,8 @@ public class OrderConstant {
public interface State {
int STOP = 0;
Integer START = 1;
}
/**
* 物流单审核:0-不接受 1-接受 2-待确认
* @author wrc
......@@ -103,7 +100,6 @@ public class OrderConstant {
public interface TaskType {
int ORDINARY = 0;
int PAY = 1;
}
/**
......@@ -120,11 +116,6 @@ public class OrderConstant {
int THREE = 3;
}
/**
* 内部状态:1.待提交审核 2.待审核(一级) 3.待审核(二级) 6.审核不通过 7.审核通过 8.审核不通过
*
......@@ -154,8 +145,6 @@ public class OrderConstant {
int STATE_DEFAULT = -1;
}
/**
* 报价单内部流转: 1.新增报价单 2.审核报价单 3.审核报价单 4.提交报价单 5.审核不通过
*
......@@ -170,7 +159,6 @@ public class OrderConstant {
int NOT_APPROVED = 5;
}
/**
* 配送方式
*
......@@ -184,7 +172,6 @@ public class OrderConstant {
Integer PICK_UP_ADDRESS = 2;
//无配送
Integer NO_DELIVERY = 3;
}
/**
......@@ -202,18 +189,18 @@ public class OrderConstant {
int THE_REQUIREMENT_SHEET_IS_NOT_APPROVED = 6;
int NO_OFFER_ACCEPTED = 7;
int WAITING_FOR_CONFIRMATION_OFFER = 8;
}
/**
* 订单内部支付状态
*/
public interface PayState {
//待确认电子合同
Integer ELECTRONIC_CONTRACT_TO_BE_CONFIRMED = 5;
//确认电子合同
Integer CONFIRMATION_ELECTRONIC_CONTRACT = 8;
//取消电子合同
Integer CANCEL_ELECTRONIC_CONTRACT = 9;
......@@ -232,15 +219,12 @@ public class OrderConstant {
//订单入库
Integer ORDER_WAREHOUSING = 14;
//订单归档
Integer ORDER_FILING = 15;
//支付确认
Integer PAYMENT_CONFIRMATION = 16;
//支付取消
Integer PAYMENT_FILING = 17;
......@@ -250,18 +234,15 @@ public class OrderConstant {
//新增物流单
Integer NEW_LOGISTICS_ORDER = 19;
//订单发货确认
Integer ORDER_DELIVERY_CONFIRMATION = 20;
//新增采购入库单
Integer ADD_PURCHASE_STOCK_DOCUMENT = 21;
//订单收货确认
Integer ORDER_RECEIPT_CONFIRMATION = 22;
//确认回单
Integer CONFIRM_COME_ORDER = 23;
......@@ -269,28 +250,6 @@ public class OrderConstant {
Integer ORDER_FILING_SUPPLIER = 23;
}
/**
*是否使用地市
*/
public interface IsArea{
boolean YES=true;
boolean NOT=false;
}
public interface IsMergeOrder{
Boolean YES=true;
Boolean NOT=false;
}
/**
*列表按钮类型
*/
......
......@@ -8,7 +8,7 @@ import java.util.Arrays;
* @author wrc
* @date 2020/11/18
*/
public enum NotarizeEnquiryQuotedPriceInteriorEnum {
public enum ConfirmQuoteInteriorEnum {
TO_BE_SUBMITTED_FOR_REVIEW(1, "待提交审核报价单"),
TO_BE_REVIEWED(2, "待审核报价单(一级)"),
......@@ -18,25 +18,19 @@ public enum NotarizeEnquiryQuotedPriceInteriorEnum {
FAILED_TO_PASS_THE_AUDIT(6, "审核不通过"),
FAILED_TO_PASS_THE_AUDIT1(7, "审核不通过(一级)"),
FAILED_TO_PASS_THE_AUDIT2(8, "审核不通过(二级)"),
NOT_REPORT_PRICE(9, "不接受报价"),
NOT_REPORT_PRICE(9, "不接受报价");
;
/**
* 状态
*/
private Integer state;
/**
* 描述
*/
private String name;
NotarizeEnquiryQuotedPriceInteriorEnum() {
}
NotarizeEnquiryQuotedPriceInteriorEnum(Integer state, String name) {
ConfirmQuoteInteriorEnum(Integer state, String name) {
this.state = state;
this.name = name;
}
......@@ -57,7 +51,7 @@ public enum NotarizeEnquiryQuotedPriceInteriorEnum {
this.name = name;
}
public static String getName(Integer state){
NotarizeEnquiryQuotedPriceInteriorEnum workEnum = Arrays.stream(NotarizeEnquiryQuotedPriceInteriorEnum.values()).filter(v -> v.getState().equals(state)).findAny().orElse(null);
ConfirmQuoteInteriorEnum workEnum = Arrays.stream(ConfirmQuoteInteriorEnum.values()).filter(v -> v.getState().equals(state)).findAny().orElse(null);
return null == workEnum ? "" : workEnum.name;
}
}
......@@ -7,36 +7,30 @@ import java.util.Arrays;
* @author wrc
* @date 2020/11/18
*/
public enum ProductInquiryExternalStateEnum {
public enum InquiryExternalStateEnum {
INQUIRY_SHEET_TO_BE_SUBMITTED(1,"待提交询价单"),
QUOTATION_TO_BE_SUBMITTED(2,"待提交报价单"),
QUOTATION_TO_BE_CONFIRMED(3,"待确认报价单"),
ACCEPT_OFFER(4,"接受报价"),
OFFER_NOT_ACCEPTED(5,"不接受报价"),
;
OFFER_NOT_ACCEPTED(5,"不接受报价");
/**
*状态
*/
private Integer state;
/**
*描述
*/
private String name;
public static String getName(Integer state){
ProductInquiryExternalStateEnum workEnum = Arrays.stream(ProductInquiryExternalStateEnum.values()).filter(v -> v.getState().equals(state)).findAny().orElse(null);
InquiryExternalStateEnum workEnum = Arrays.stream(InquiryExternalStateEnum.values()).filter(v -> v.getState().equals(state)).findAny().orElse(null);
return null == workEnum ? "" : workEnum.name;
}
ProductInquiryExternalStateEnum() {
}
ProductInquiryExternalStateEnum(Integer state, String name) {
InquiryExternalStateEnum(Integer state, String name) {
this.state = state;
this.name = name;
}
......
......@@ -8,7 +8,7 @@ import java.util.Arrays;
* @author wrc
* @date 2020/11/18
*/
public enum ProductInquiryInteriorEnum {
public enum InquiryInteriorEnum {
TO_BE_SUBMITTED_FOR_REVIEW(1, "待提交审核"),
TO_BE_REVIEWED(2, "待审核(一级)"),
......@@ -30,13 +30,13 @@ public enum ProductInquiryInteriorEnum {
private String name;
public static String getName(Integer state){
ProductInquiryInteriorEnum workEnum = Arrays.stream(ProductInquiryInteriorEnum.values()).filter(v -> v.getState().equals(state)).findAny().orElse(null);
InquiryInteriorEnum workEnum = Arrays.stream(InquiryInteriorEnum.values()).filter(v -> v.getState().equals(state)).findAny().orElse(null);
return null == workEnum ? "" : workEnum.name;
}
ProductInquiryInteriorEnum() {
InquiryInteriorEnum() {
}
ProductInquiryInteriorEnum(Integer state, String name) {
InquiryInteriorEnum(Integer state, String name) {
this.state = state;
this.name = name;
}
......
......@@ -7,35 +7,31 @@ import java.util.Arrays;
* @author wrc
* @date 2020/11/18
*/
public enum ProductInquiryInteriorStateEnum {
public enum QuoteInteriorStateEnum {
TO_BE_SUBMITTED_FOR_REVIEW(1,"待提交审核"),
TO_BE_REVIEWED(2,"待审核(一级)"),
TO_BE_REVIEWED_two(3,"待审核(二级)"),
APPROVED(4,"待提交报价单)"),
APPROVED_TWO(5,"已完成"),
FAILED_TO_PASS_THE_AUDIT(6,"审核不通过(一级)"),
FAILED_TO_PASS_THE_AUDIT2(7,"审核不通过(二级)"),
;
FAILED_TO_PASS_THE_AUDIT2(7,"审核不通过(二级)");
/**
*状态
*/
private Integer state;
/**
*描述
*/
private String name;
public static String getName(Integer state){
ProductInquiryInteriorStateEnum workEnum = Arrays.stream(ProductInquiryInteriorStateEnum.values()).filter(v -> v.getState().equals(state)).findAny().orElse(null);
QuoteInteriorStateEnum workEnum = Arrays.stream(QuoteInteriorStateEnum.values()).filter(v -> v.getState().equals(state)).findAny().orElse(null);
return null == workEnum ? "" : workEnum.name;
}
ProductInquiryInteriorStateEnum() {
}
ProductInquiryInteriorStateEnum(Integer state, String name) {
QuoteInteriorStateEnum(Integer state, String name) {
this.state = state;
this.name = name;
}
......
......@@ -64,16 +64,20 @@ public class ProcessConfig {
"after_sale_return_goods_contract_manual_delivery_ext",
"after_sale_return_goods_outer_verify_ext",
"after_sale_return_goods_manual_delivery_ext",
"trade_inquiry_inner",
"trade_external_inner_ext",
"trade_quote_inner",
"trade_confirm_quote_inner",
// "trade_offer_inner_procedure",
"purchase_order_inner_verify",
"purchase_order_sale_inner_verify",
"purchase_order_purchase_add_order_ext",
"purchase_order_outer_verify_repeat_pay_delivery_ext",
"purchase_order_outer_verify_one_ext",
"purchase_order_outer_verify_two_ext",
"product_pricing_outer_order_ext",
"trade_offer_inner_procedure",
"product_pricing_inner_order",
"product_confirm_pricing_inner_order",
// "product_pricing_outer_order_ext",
// "product_pricing_inner_order",
// "product_confirm_pricing_inner_order",
"purchase_offer_inner_verify",
"purchase_confirm_offer_inner_verify",
"purchase_inquiry_inner_verify",
......
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0ykt2kq" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.1.1">
<bpmn:process id="trade_offer_inner_procedure" name="商品询价报价单内部工作流" isExecutable="true" camunda:versionTag="2.0.0">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0ykt2kq" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.5.0">
<bpmn:process id="trade_quote_inner" name="商品询价报价单内部工作流" isExecutable="true" camunda:versionTag="2.0.0">
<bpmn:startEvent id="StartEvent_1">
<bpmn:extensionElements>
<camunda:properties>
......@@ -113,7 +113,7 @@
</bpmn:userTask>
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="trade_offer_inner_procedure">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="trade_quote_inner">
<bpmndi:BPMNEdge id="Flow_1rd5f6k_di" bpmnElement="Flow_1rd5f6k">
<di:waypoint x="590" y="145" />
<di:waypoint x="590" y="100" />
......
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0rsjlr6" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.1.1">
<bpmn:process id="product_confirm_pricing_inner_order" name="商品询价确认报价单内部流转" isExecutable="true" camunda:versionTag="2.0.0">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0rsjlr6" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.5.0">
<bpmn:process id="trade_confirm_quote_inner" name="商品询价确认报价单内部流转" isExecutable="true" camunda:versionTag="2.0.0">
<bpmn:startEvent id="StartEvent_1">
<bpmn:extensionElements>
<camunda:properties>
......@@ -159,7 +159,7 @@
</bpmn:userTask>
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="product_confirm_pricing_inner_order">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="trade_confirm_quote_inner">
<bpmndi:BPMNEdge id="Flow_16psmfz_di" bpmnElement="Flow_16psmfz">
<di:waypoint x="1230" y="332" />
<di:waypoint x="1230" y="500" />
......
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1s5t3iu" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.1.1">
<bpmn:process id="product_pricing_inner_order" name="商品询价询价单内部工作流" isExecutable="true" camunda:versionTag="2.0.0">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1s5t3iu" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.5.0">
<bpmn:process id="trade_inquiry_inner" name="商品询价询价单内部工作流" isExecutable="true" camunda:versionTag="2.0.0">
<bpmn:startEvent id="StartEvent_1">
<bpmn:extensionElements>
<camunda:properties>
......@@ -113,7 +113,11 @@
</bpmn:sequenceFlow>
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="product_pricing_inner_order">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="trade_inquiry_inner">
<bpmndi:BPMNEdge id="Flow_0n002x9_di" bpmnElement="Flow_0n002x9">
<di:waypoint x="925" y="177" />
<di:waypoint x="990" y="177" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0rn4vn5_di" bpmnElement="Flow_0rn4vn5">
<di:waypoint x="620" y="152" />
<di:waypoint x="620" y="70" />
......@@ -156,10 +160,6 @@
<di:waypoint x="215" y="177" />
<di:waypoint x="270" y="177" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0n002x9_di" bpmnElement="Flow_0n002x9">
<di:waypoint x="925" y="177" />
<di:waypoint x="990" y="177" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
<dc:Bounds x="179" y="159" width="36" height="36" />
</bpmndi:BPMNShape>
......
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1u6csq9" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.1.1">
<bpmn:process id="product_pricing_outer_order_ext" name="商品询价询价单外部工作流" isExecutable="true">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1u6csq9" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.5.0">
<bpmn:process id="trade_inquiry_external_ext" name="商品询价询价单外部工作流" isExecutable="true">
<bpmn:startEvent id="StartEvent_1">
<bpmn:extensionElements>
<camunda:properties>
......@@ -77,7 +77,7 @@
</bpmn:userTask>
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="product_pricing_outer_order_ext">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="trade_inquiry_external_ext">
<bpmndi:BPMNEdge id="Flow_1kwgw9y_di" bpmnElement="Flow_1kwgw9y">
<di:waypoint x="780" y="142" />
<di:waypoint x="780" y="240" />
......
......@@ -42,30 +42,29 @@ public enum ProcessEnum {
TRADE_CONFIRM_INNER_VALIDATE(6, 0, "trade_confirm_inner_validate", "确认需求报价单内部审核流程", "tciv", "orderId", 1),
/**
* 商品询价 - 询价单内部工作流 - 7
* 交易能力 - 商品询价 - 询价单内部工作流 - 7
*/
PRODUCT_PRICING_INNER_ORDER(7, 0, "product_pricing_inner_order", "商品询价询价单内部工作流", "ppio", "orderId", 1),
TRADE_INQUIRY_INNER(7, 0, "trade_inquiry_inner", "商品询价询价单内部工作流", "tii", "orderId", 1),
/**
* 交易能力 - 询价报价 - 报价单内部流程
* 交易能力 - 商品询价 - 询价单外部工作流 - 8
*/
TRADE_OFFER_INNER_PROCEDURE(12, 0, "trade_offer_inner_procedure", "商品询价报价单内部工作流", "toip", "orderId", 1),
TRADE_INQUIRY_EXTERNAL(8, 1, "trade_inquiry_external_ext", "商品询价询价单外部工作流", "teie", "orderId", 1),
/**
* 商品询价 - 询价单外部工作流 - 8
* 交易能力 - 商品询价 - 确认报价单内部流转 - 9
*/
PRODUCT_PRICING_OUTER_ORDER(8, 1, "product_pricing_outer_order_ext", "商品询价询价单外部工作流", "ppoo", "orderId", 1),
/**
* 确认询价报价 - 报价单内部流转 - 9
*/
PRODUCT_CONFIRM_PRICING_INNER_ORDER(9, 0, "product_confirm_pricing_inner_order", "商品询价确认询价报价单内部流转", "pcpio", "orderId", 1),
TRADE_CONFIRM_QUOTE_INNER(9, 0, "trade_confirm_quote_inner", "商品询价确认询价报价单内部流转", "pcpio", "orderId", 1),
/**
* 物流服务 - 物流单外部流转 - 11
*/
LOGISTICS_OUTER_ORDER(11, 1, "logistics_outer_order", "物流服务物流单外部流转", "loo", "orderId", 1),
/**
* 交易能力 - 商品询价 - 报价单内部流程
*/
TRADE_QUOTE_INNER(12, 0, "trade_quote_inner", "商品询价报价单内部工作流", "toip", "orderId", 1),
/**
* 支付能力 - 授信申请审核流程 - 13
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment