Browse Source

修改订单逻辑

wanghui 8 years ago
parent
commit
5603cb4f82

+ 3 - 5
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -147,11 +147,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setFirstPayment(commodityFirstPayment);
 		tOrder.setSignTotalAmount(discountPrice);
 		tOrder.setSignFirstPayment(discountFirstPayment);
-		tOrder.setOrderRemarks(remarks);
+		tOrder.setSignBrokerageAmount(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION)));
+		tOrder.setSignWithdrawAmount(discountPrice.subtract(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION))));
 		tOrder.setDeleteSign(DeleteStatus.UNDELETE.getCode());
 		tOrder.setOrderChannel(OrderChannel.APP.getCode());
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
 		tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
+		tOrder.setOrderRemarks(remarks);
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		
 		TOrderDetail tOrderDetail = new TOrderDetail();
@@ -191,13 +193,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			tOrder.setOrderStage(OrderStage.INTENTION.getCode());
 			tOrder.setProjectStage(ProjectStage.NOT_SATISFY_CONDITION.getCode());
 			tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode());
-			tOrder.setSignFirstPayment(initial);
 			tOrder.setActuallyFirstPayment(initial);
-			tOrder.setSignBrokerageAmount(initial);
 			tOrder.setActuallyBrokerageAmount(initial);
-			tOrder.setSignTotalAmount(initial);
 			tOrder.setActuallyTotalAmount(initial);
-			tOrder.setSignWithdrawAmount(initial);
 			tOrder.setActuallyWithdrawAmount(initial);
 		}else if(orderAction == OrderAction.CONFIRM_INTENTION){ //确认意向订单 (用户确认)
 			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()){

+ 16 - 13
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -352,19 +352,22 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	@Override
 	public int addProjectTask(String contractId,String commodityId,String commodityName, Integer commodityQuantity, 
 			String commodityMode, String taskComment) {
-		ContractTask task = new ContractTask();
-		task.setId(UUID.randomUUID().toString().replace("-", ""));
-		task.setCommodityId(commodityId);
-		task.setCommodityMode(StringUtils.isBlank(commodityMode)?"NO_MODE":commodityMode);
-		task.setCommodityName(commodityName);
-		task.setCommodityType(CommodityType.SERVICE.getTypeCode());
-		task.setCommodityQuantity(1);
-		task.setCreateTime(new Date());
-		task.setContractId(contractId);
-		task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
-		task.setDeleteSign(DeleteStatus.LOCKING.getCode());
-		task.setTaskComment(taskComment);
-		return contractTaskMapper.insert(task);
+		for(int i=0;i<commodityQuantity;i++){
+			ContractTask task = new ContractTask();
+			task.setId(UUID.randomUUID().toString().replace("-", ""));
+			task.setCommodityId(commodityId);
+			task.setCommodityMode(StringUtils.isBlank(commodityMode)?"NO_MODE":commodityMode);
+			task.setCommodityName(commodityName);
+			task.setCommodityType(CommodityType.SERVICE.getTypeCode());
+			task.setCommodityQuantity(1);
+			task.setCreateTime(new Date());
+			task.setContractId(contractId);
+			task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
+			task.setDeleteSign(DeleteStatus.LOCKING.getCode());
+			task.setTaskComment(taskComment);
+			contractTaskMapper.insert(task);
+		}
+		return 1;
 	}
 
 	@Override