|
|
@@ -868,21 +868,24 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
@Override
|
|
|
public int updateSignServiceOrder(String orderNo,String contractNo, String signFirstPayment, String signTotalAmount,
|
|
|
- String approval,String orderRemarks) {
|
|
|
+ String approval,String orderRemarks,String signTime) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
checkOrder(tOrder);
|
|
|
if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()) {
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo, ""));
|
|
|
} else {
|
|
|
- Date signTime = new Date();
|
|
|
tOrder.setSignFirstPayment(new BigDecimal(signFirstPayment));
|
|
|
tOrder.setSignTotalAmount(new BigDecimal(signTotalAmount));
|
|
|
tOrder.setOrderStage(OrderStage.SIGNED.getCode());
|
|
|
tOrder.setOrderStatus(OrderState.ALREADY_SIGN.getCode());
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
tOrder.setApproval(Integer.valueOf(approval));
|
|
|
- tOrder.setUpdateTime(signTime);
|
|
|
- tOrder.setSignTime(signTime);
|
|
|
+ tOrder.setUpdateTime(new Date());
|
|
|
+ try {
|
|
|
+ tOrder.setSignTime(DateUtils.parseDate(signTime, AFTConstants.YYYYMMDD));
|
|
|
+ } catch (ParseException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
tOrder.setOrderRemarks(orderRemarks);
|
|
|
tOrder.setContractNo(contractNo);
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
@@ -1361,6 +1364,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
@Transactional
|
|
|
public int updateSetUpProject(String orderNo, String signComment) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
+ Date createTime = new Date();
|
|
|
checkOrder(tOrder);
|
|
|
boolean flag = false;
|
|
|
if(tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode()){
|
|
|
@@ -1374,13 +1378,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(!flag)
|
|
|
throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
|
|
|
tOrder.setProjectStage(ProjectStage.ALREADY_SET_UP.getCode());
|
|
|
- tOrder.setUpdateTime(new Date());
|
|
|
+ tOrder.setUpdateTime(createTime);
|
|
|
+ tOrder.setSetUpTime(createTime);
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
//-------------- 查询订单详情 --------------------------
|
|
|
List<TOrderDetail> detailList = tOrderMapper.selectOrderCommodity(orderNo);
|
|
|
List<ContractTask> taskList = new ArrayList<>();
|
|
|
ContractTask task = null;
|
|
|
- Date createTime = new Date();
|
|
|
Contract contract = new Contract();
|
|
|
String contractId = UUID.randomUUID().toString().replace("-", "");
|
|
|
contract.setId(contractId);
|