Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 7 years ago
parent
commit
c83511baf8

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -906,7 +906,7 @@
   <select id="selectCommodityDetail" resultType="com.goafanti.order.bo.CommodityDetailBo">
   	<choose>
   		<when test="commodityType == 0">
-  			select id as commodityId,bname as commodityName,ifnull(price,0) as commodityPrice,ifnull(first_payment,0) as commodityFirstPayment from business_project where id = #{commodityId,jdbcType=VARCHAR}
+  			select id as commodityId,bname as commodityName,,cid as commodityClassify,ifnull(price,0) as commodityPrice,ifnull(first_payment,0) as commodityFirstPayment from business_project where id = #{commodityId,jdbcType=VARCHAR}
   		</when>
   		<when test="commodityType == 1">
   			select id as commodityId,name as commodityName,introduction,ifnull(transfer_price,0) as commodityPrice,owner_id as sellerId from achievement where id = #{commodityId,jdbcType=VARCHAR}

+ 9 - 8
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -571,10 +571,11 @@
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as projectTime,
 		a.uid,
 		a.status as projectStatus,
-		a.deleted_sign as deleteSign,
+		a.deleted_sign as deletedSign,
 		a.order_no as orderNo,
 		a.type as projectType,
 		b.nickname as buyerName,
+		b.type as buyerType,
 		f.cname as buyerType,
 		c.create_time as orderTime,
 		c.order_status as orderStatus,
@@ -591,7 +592,7 @@
 		a.type = f.id
 	where 1=1
 	<if test="deleteSign != null">
-		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
+		and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
 	</if>
 	<if test="orderNo != null and orderNo != ''">
 		and a.order_no = #{orderNo,jdbcType=VARCHAR}
@@ -635,8 +636,8 @@
 		d.department_id = e.id left join business_varieties f on
 		a.type = f.id
 	where 1=1
-	<if test="deleteSign != null">
-		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
+	<if test="deletedSign != null">
+		and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
 	</if>
 	<if test="orderNo != null and orderNo != ''">
 		and a.order_no = #{orderNo,jdbcType=VARCHAR}
@@ -679,7 +680,7 @@
 				a.complete_comment as completeComment,
 				a.uid,
 				a.status as projectStatus,
-				a.deleted_sign as deleteSign,
+				a.deleted_sign as deletedSign,
 				a.order_no as orderNo,
 				a.type as projectType,
 				b.nickname as buyerName,
@@ -707,7 +708,7 @@
 				a.complete_comment as completeComment,
 				a.uid,
 				a.status as projectStatus,
-				a.deleted_sign as deleteSign,
+				a.deleted_sign as deletedSign,
 				a.order_no as orderNo,
 				a.type as projectType,
 				b.nickname as buyerName,
@@ -734,7 +735,7 @@
 		a.commodity_name as commodityName,
 		a.commodity_quantity as commodityQuantity,
 		a.task_status as taskStatus,
-		a.delete_sign as deleteSign,
+		a.deleted_sign as deletedSign,
 		a.task_comment as taskComment,
 		b.name as technicianName
 	from
@@ -748,7 +749,7 @@
 			a.commodity_id as commodityId,
 			a.serial_number as taskNo,
 			a.task_status as taskStatus,
-			a.delete_sign as deleteSign,
+			a.deleted_sign as deletedSign,
 			date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDistributionTimes,
 			a.task_comment as taskComment,
 			b.bname as commodityName ,

+ 8 - 0
src/main/java/com/goafanti/order/bo/CommodityDetailBo.java

@@ -15,6 +15,8 @@ public class CommodityDetailBo {
 	private String commodityMode;
 	/** 商品类型 **/
 	private Integer commodityType;
+	/** 业务品类 **/
+	private String commodityClassify;
 	/** 商品实价 **/
 	private String discountPrice;
 	/** 实际首付价格 **/
@@ -63,6 +65,12 @@ public class CommodityDetailBo {
 	public void setCommodityType(Integer commodityType) {
 		this.commodityType = commodityType;
 	}
+	public String getCommodityClassify() {
+		return commodityClassify;
+	}
+	public void setCommodityClassify(String commodityClassify) {
+		this.commodityClassify = commodityClassify;
+	}
 	public String getDiscountPrice() {
 		return discountPrice;
 	}

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -154,6 +154,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
 		tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
 		tOrder.setOrderRemarks(remarks);
+		tOrder.setContractType(bo.getCommodityClassify());
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		
 		TOrderDetail tOrderDetail = new TOrderDetail();

+ 8 - 8
src/main/java/com/goafanti/techproject/bo/ProjectListBo.java

@@ -13,11 +13,11 @@ public class ProjectListBo {
 	/** 结算状态 **/
 	private Integer liquidationStatus;
 	/** 项目类型 **/
-	private Integer projectType;
+	private String projectType;
 	/** 项目状态 **/
 	private Integer projectStatus;
 	/** 删除标示**/
-	private Integer deleteSign; 
+	private Integer deletedSign; 
 	/** 是否特批 **/
 	private Integer approval;
 	/** 客户名 **/
@@ -74,10 +74,10 @@ public class ProjectListBo {
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
 	}
-	public Integer getProjectType() {
+	public String getProjectType() {
 		return projectType;
 	}
-	public void setProjectType(Integer projectType) {
+	public void setProjectType(String projectType) {
 		this.projectType = projectType;
 	}
 	public Integer getProjectStatus() {
@@ -86,11 +86,11 @@ public class ProjectListBo {
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
 	}
-	public Integer getDeleteSign() {
-		return deleteSign;
+	public Integer getDeletedSign() {
+		return deletedSign;
 	}
-	public void setDeleteSign(Integer deleteSign) {
-		this.deleteSign = deleteSign;
+	public void setDeletedSign(Integer deletedSign) {
+		this.deletedSign = deletedSign;
 	}
 	public String getBuyerName() {
 		return buyerName;

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

@@ -308,7 +308,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			String orderEndDate, String setUpStartDate, String setUpEndDate,Integer pageNo,Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
-		if(bo.getDeleteSign() != null) params.put("deleteSign", bo.getDeleteSign());
+		if(bo.getDeletedSign() != null) params.put("deletedSign", bo.getDeletedSign());
 		if(StringUtils.isNotBlank(bo.getOrderNo())) params.put("orderNo", bo.getOrderNo());
 		if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());
 		if(StringUtils.isNotBlank(bo.getSerialNumber())) params.put("serialNumber", bo.getSerialNumber());
@@ -370,8 +370,8 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			task.setCreateTime(new Date());
 			task.setContractId(contractId);
 			task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
-			task.setDeletedSign(DeleteStatus.LOCKING.getCode());
 			task.setTaskComment(taskComment);
+			task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			contractTaskMapper.insert(task);
 		}
 		return 1;