|
|
@@ -27,7 +27,7 @@ import com.goafanti.common.dao.TOrderMapper;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.Contract;
|
|
|
-import com.goafanti.common.model.ContractDetail;
|
|
|
+import com.goafanti.common.model.ContractTask;
|
|
|
import com.goafanti.common.model.OrganizationManagement;
|
|
|
import com.goafanti.common.model.TOrder;
|
|
|
import com.goafanti.common.model.TOrderBill;
|
|
|
@@ -183,8 +183,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setActuallyBrokerageAmount(new BigDecimal(0));
|
|
|
tOrder.setActuallyWithdrawAmount(new BigDecimal(0));
|
|
|
}else if(orderAction == OrderAction.CONFIRM_INTENTION){ //确认意向订单 (用户确认)
|
|
|
- if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()
|
|
|
- && tOrder.getOrderStage() == OrderStage.INTENTION.getCode()){
|
|
|
+ if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认意向订单"));
|
|
|
}
|
|
|
if (confrim) {
|
|
|
@@ -195,8 +194,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_FIRST){ // 支付首付(审核流水)
|
|
|
if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
- || tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()){
|
|
|
+ || tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,""));
|
|
|
}
|
|
|
int boundary = tOrder.getActuallyFirstPayment().add(changeAmount).compareTo(tOrder.getFirstPayment());
|
|
|
@@ -209,11 +207,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getActuallyFirstPayment().add(changeAmount));
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
|
|
|
+ tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_LAST){ //支付尾款 (审核流水)
|
|
|
if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
- || tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()){
|
|
|
+ || tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"支付尾款"));
|
|
|
}
|
|
|
int boundary = tOrder.getActuallyTotalAmount().add(changeAmount).compareTo(tOrder.getOrderAmount());
|
|
|
@@ -247,10 +245,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|| tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() != OrderStage.INTENTION.getCode()
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()){
|
|
|
- flag = false;
|
|
|
- }
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()){
|
|
|
@@ -285,8 +279,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() == OrderStage.INTENTION.getCode())
|
|
|
- flag = false;
|
|
|
if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.REFUSE_REFUND.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
|
|
|
@@ -305,8 +297,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() == OrderStage.INTENTION.getCode())
|
|
|
- flag = false;
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
@@ -326,8 +316,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() == OrderStage.INTENTION.getCode())
|
|
|
- flag = false;
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.AGREE_REFUND.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
@@ -362,8 +350,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setApplySign(false);
|
|
|
if (TokenManager.getUserId().equals(tOrder.getBuyerId())) { // 买方
|
|
|
active.setApplyForWithdraw(false);
|
|
|
- if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()
|
|
|
- && tOrder.getOrderStage() == OrderStage.INTENTION.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()) {
|
|
|
/** 需求订单 开始 **/
|
|
|
if (tOrder.getOrderType() == CommodityType.DEMAND.getTypeCode()) {
|
|
|
active.setConfirmIntention(true);
|
|
|
@@ -378,15 +365,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setRefuseIntention(false);
|
|
|
}
|
|
|
if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
- && tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
- && tOrder.getOrderStage() == OrderStage.FOLLOWING.getCode()) {
|
|
|
+ && tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
|
|
|
active.setPayForFirst(true); //支付首付
|
|
|
} else {
|
|
|
active.setPayForFirst(false); //支付首付
|
|
|
}
|
|
|
if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
- && tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
- && tOrder.getOrderStage() == OrderStage.FOLLOWING.getCode()) {
|
|
|
+ && tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()) {
|
|
|
active.setPayForLast(true); //支付尾款
|
|
|
} else {
|
|
|
active.setPayForLast(false); //支付尾款
|
|
|
@@ -396,10 +381,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|| tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() != OrderStage.INTENTION.getCode()
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()){
|
|
|
- flag = false;
|
|
|
- }
|
|
|
+
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()){
|
|
|
@@ -413,8 +395,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() == OrderStage.INTENTION.getCode())
|
|
|
- flag = false;
|
|
|
+
|
|
|
if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.REFUSE_REFUND.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
|
|
|
@@ -428,8 +409,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setPayForFirst(false);
|
|
|
active.setPayForLast(false);
|
|
|
active.setApplyForRefund(false);
|
|
|
- if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()
|
|
|
- && tOrder.getOrderStage() == OrderStage.INTENTION.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()) {
|
|
|
/** 需求订单 开始 **/
|
|
|
if (tOrder.getOrderType() == CommodityType.DEMAND.getTypeCode()) {
|
|
|
active.setConfirmIntention(false);
|
|
|
@@ -448,10 +428,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|| tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() != OrderStage.INTENTION.getCode()
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()){
|
|
|
- flag = false;
|
|
|
- }
|
|
|
+
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()){
|
|
|
@@ -465,8 +442,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() == OrderStage.INTENTION.getCode())
|
|
|
- flag = false;
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
@@ -498,8 +473,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setApplyForWithdraw(false);
|
|
|
active.setApplyForRefund(false);
|
|
|
if (tOrder.getSellerId().equals(DEFAULT_PLATFORM_ID)) { // 平台作为卖方
|
|
|
- if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()
|
|
|
- && tOrder.getOrderStage() == OrderStage.INTENTION.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()) {
|
|
|
active.setConfirmIntention(true);
|
|
|
active.setRefuseIntention(true);
|
|
|
} else {
|
|
|
@@ -511,11 +485,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()
|
|
|
|| tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
- }
|
|
|
- if(tOrder.getOrderStage() != OrderStage.INTENTION.getCode()
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()){
|
|
|
- flag = false;
|
|
|
- }
|
|
|
+ }
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()){
|
|
|
@@ -529,8 +499,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() == OrderStage.INTENTION.getCode())
|
|
|
- flag = false;
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
@@ -576,16 +544,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}else{
|
|
|
active.setApplyRevoke(false); //作废
|
|
|
}
|
|
|
- if(tOrder.getOrderStage() == OrderStage.INTENTION.getCode())
|
|
|
- flag = false;
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.AGREE_REFUND.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
flag = false;
|
|
|
active.setCompleteRefund(flag); //完成退款
|
|
|
flag = true;
|
|
|
- if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode())
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
&& tOrder.getApproval() != ApprovalState.AUDIT_PASS.getCode())
|
|
|
@@ -869,13 +834,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
String orderRemarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
checkOrder(tOrder);
|
|
|
- if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode() // 等待签单- 跟单中
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()) {
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo, ""));
|
|
|
} else {
|
|
|
- if (tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode() // 已经付款 or 特批
|
|
|
- && Integer.valueOf(approval) != ApprovalState.WAIT_AUDIT.getCode())
|
|
|
- throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo, ""));
|
|
|
tOrder.setSignFirstPayment(new BigDecimal(signFirstPayment));
|
|
|
tOrder.setSignTotalAmount(new BigDecimal(signTotalAmount));
|
|
|
tOrder.setOrderStage(OrderStage.SIGNED.getCode());
|
|
|
@@ -910,7 +871,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
public void checkOrder(TOrder tOrder){
|
|
|
if(tOrder == null)
|
|
|
- throw new BusinessException(new Error(ErrorConstants.ORDER_NOT_EXIST, tOrder.getOrderNo(),""));
|
|
|
+ throw new BusinessException(new Error(ErrorConstants.ORDER_NOT_EXIST, "" ,""));
|
|
|
if(tOrder.getDeleteSign() == ActiveState.ABOLISH.getCode())
|
|
|
throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_FREEZE, tOrder.getOrderNo(),""));
|
|
|
if(tOrder.getDeleteSign() == ActiveState.LOCKING.getCode())
|
|
|
@@ -923,8 +884,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
checkOrder(tOrder);
|
|
|
- if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode() //等待签单 + 跟单中
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()){
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo,""));
|
|
|
}else{
|
|
|
TOrderDetail detail = new TOrderDetail();
|
|
|
@@ -964,8 +924,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
TOrderDetail oldDetail = tOrderDetailMapper.selectByPrimaryKey(detailId);
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(oldDetail.getOrderNo());
|
|
|
checkOrder(tOrder);
|
|
|
- if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode() // 等待签单 - 跟单中
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()) {
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, oldDetail.getOrderNo(), ""));
|
|
|
} else {
|
|
|
TOrderDetail detail = new TOrderDetail();
|
|
|
@@ -1012,8 +971,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
TOrderDetail detail = tOrderDetailMapper.selectByPrimaryKey(detailId);
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(detail.getOrderNo());
|
|
|
checkOrder(tOrder);
|
|
|
- if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode() // 等待签单 - 跟单中
|
|
|
- || tOrder.getOrderStage() != OrderStage.FOLLOWING.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()) {
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, detail.getOrderNo(), ""));
|
|
|
} else {
|
|
|
BigDecimal totalAmountChange = detail.getCommodityPrice()
|
|
|
@@ -1273,8 +1231,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
public int approvalServiceOrder(String orderNo, Integer confirm) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
checkOrder(tOrder);
|
|
|
- if(tOrder.getProjectStage() != ProjectStage.NOT_SATISFY_CONDITION.getCode()
|
|
|
- || tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
|
|
|
|| tOrder.getOrderStage() != OrderStage.SIGNED.getCode()
|
|
|
|| tOrder.getApproval() != ApprovalState.WAIT_AUDIT.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo , ""));
|
|
|
@@ -1330,9 +1287,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setUpdateTime(new Date());
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
//-------------- 查询订单详情 --------------------------
|
|
|
- List<TOrderDetail> orderDetailList = tOrderMapper.selectOrderCommodity(orderNo);
|
|
|
- List<ContractDetail> contractDetailList = new ArrayList<>();
|
|
|
- ContractDetail contractDetail = null;
|
|
|
+ List<TOrderDetail> detailList = tOrderMapper.selectOrderCommodity(orderNo);
|
|
|
+ List<ContractTask> taskList = new ArrayList<>();
|
|
|
+ ContractTask task = null;
|
|
|
Date createTime = new Date();
|
|
|
String contractId = UUID.randomUUID().toString(); //合同ID
|
|
|
Contract contract = new Contract();
|
|
|
@@ -1344,21 +1301,21 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
contract.setStatus(ProjectStage.ALREADY_SET_UP.getCode());
|
|
|
contract.setUid(tOrder.getBuyerId());
|
|
|
contractMapper.insert(contract);
|
|
|
- for(TOrderDetail orderDetail: orderDetailList){
|
|
|
+ for(TOrderDetail orderDetail: detailList){
|
|
|
for(int i=0; i<orderDetail.getCommodityQuantity();i++){
|
|
|
- contractDetail = new ContractDetail();
|
|
|
- contractDetail.setId(UUID.randomUUID().toString());
|
|
|
- contractDetail.setCommodityId(orderDetail.getCommodityId());
|
|
|
- contractDetail.setCommodityMode(orderDetail.getCommodityMode());
|
|
|
- contractDetail.setCommodityName(orderDetail.getCommodityName());
|
|
|
- contractDetail.setCommodityType(orderDetail.getCommodityType());
|
|
|
- contractDetail.setCommodityQuantity(1);
|
|
|
- contractDetail.setCreateTime(createTime);
|
|
|
- contractDetail.setContractId(contractId);
|
|
|
- contractDetailList.add(contractDetail);
|
|
|
+ task = new ContractTask();
|
|
|
+ task.setId(UUID.randomUUID().toString());
|
|
|
+ task.setCommodityId(orderDetail.getCommodityId());
|
|
|
+ task.setCommodityMode(orderDetail.getCommodityMode());
|
|
|
+ task.setCommodityName(orderDetail.getCommodityName());
|
|
|
+ task.setCommodityType(orderDetail.getCommodityType());
|
|
|
+ task.setCommodityQuantity(1);
|
|
|
+ task.setCreateTime(createTime);
|
|
|
+ task.setContractId(contractId);
|
|
|
+ taskList.add(task);
|
|
|
}
|
|
|
}
|
|
|
- contractMapper.batchInsertContractDetail(contractDetailList);
|
|
|
+ contractMapper.batchInsertContractTask(taskList);
|
|
|
return 1;
|
|
|
}
|
|
|
|