添加意见反馈添加信息

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/CustomFormDto.java

+package com.upyuns.platform.rs.website.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName : CustomFormDto
+ * @Description : 定制表单
+ * @Author : jiaoruizhen
+ * @Date: 2020-12-23 10:49
+ */
+@Data
+public class CustomFormDto {
+
+	//定制表单ID
+	Integer customId;
+
+	//审核状态
+	Integer auditStatus;
+
+	//审核原因
+	String  auditReason;
+
+	//价格
+	BigDecimal amount;
+
+
+}

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/CustomForm.java

 package com.upyuns.platform.rs.website.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
@@ -244,4 +245,19 @@ public class CustomForm implements Serializable {
 	@Column(name = "status")
 	@ApiModelProperty(value = "状态 1--已提交；2--已转订单")
 	private Integer status;
+
+	/**
+	 * 审核状态：1、待审核，2、已审核, 3、审核不通过
+	 */
+	private Integer auditStatus;
+
+	/**
+	 * 审核不通过原因
+	 */
+	private String auditReason;
+
+	/**
+	 * 价格
+	 */
+	private BigDecimal amount;
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -640,7 +640,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (StringUtils.isNotBlank(userOrderDto.getPhone())) {
 			orderInfoCriteria.andEqualTo("phone", userOrderDto.getPhone());
 		}
-
+		if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) {
+			orderItemCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
+		}
 		if (StringUtils.isNotBlank(userOrderDto.getName())) {
 			orderItemCriteria.andLike("name", "%" + userOrderDto.getName() + "%");
 		}
@@ -659,39 +661,51 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	/**
 	 * 定制信息转订单
 	 *
-	 * @param customerId
+	 * @param customFormDto
 	 * @return
 	 */
-	public ObjectRestResponse customerToOrderInfo(Integer customerId) {
+	public ObjectRestResponse customerToOrderInfo(CustomFormDto customFormDto) {
 
-		if (customerId == null) {
+		if (customFormDto == null || customFormDto.getCustomId() == null || customFormDto.getAuditStatus() == null) {
 			return ObjectRestResponse.paramIsEmpty();
 		}
-		CustomForm customForm = customFormBiz.selectById(customerId);
+		CustomForm customForm = customFormBiz.selectById(customFormDto.getCustomId());
 		if (customForm == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
 		}
-		AppUserDTO appUserDTO = userFeign.userDetailById(customForm.getUserId()).getData();
-		if (appUserDTO == null) {
-			return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
+		if (customFormDto.getAuditStatus() == 2) { //审核通过
+			AppUserDTO appUserDTO = userFeign.userDetailById(customForm.getUserId()).getData();
+			if (appUserDTO == null) {
+				return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
+			}
+			OrderInfo orderInfo = new OrderInfo();
+			orderInfo.setRealName(appUserDTO.getRealname());
+			orderInfo.setUserId(appUserDTO.getUserid());
+			orderInfo.setPhone(appUserDTO.getUsername());
+			orderInfo.setNickname(appUserDTO.getNickname());
+			orderInfo.setHeadImg(appUserDTO.getHeadimgurl());
+			orderInfo.setStatus(OrderStatusEnum.ORDER_NO_PRICE.getType());
+			orderInfo.setCustomerId(customFormDto.getCustomId());
+			orderInfo.setCustomerJson(JSONObject.toJSONString(customForm));
+			orderInfo.setAmount(customFormDto.getAmount());
+			orderInfo.setTotalAmount(customFormDto.getAmount());
+			orderInfo.setNumber(1);
+			orderInfo.setType(2);
+			generateOrder(orderInfo);
+			customForm.setOrderId(Integer.parseInt(String.valueOf(orderInfo.getOrderId())));
+			//设置定制信息为已转成订单
+			customForm.setStatus(2);
+			customForm.setAuditStatus(customFormDto.getAuditStatus());
+			customForm.setAmount(customFormDto.getAmount());
+			customFormBiz.updateSelectiveByIdRe(customForm);
+			return ObjectRestResponse.succ();
+		} else {
+			customForm.setAuditStatus(customFormDto.getAuditStatus());
+			customForm.setAuditReason(customFormDto.getAuditReason());
+			customFormBiz.updateSelectiveByIdRe(customForm);
+			return ObjectRestResponse.succ();
 		}
-		OrderInfo orderInfo = new OrderInfo();
-		orderInfo.setRealName(appUserDTO.getRealname());
-		orderInfo.setUserId(appUserDTO.getUserid());
-		orderInfo.setPhone(appUserDTO.getUsername());
-		orderInfo.setNickname(appUserDTO.getNickname());
-		orderInfo.setHeadImg(appUserDTO.getHeadimgurl());
-		orderInfo.setStatus(OrderStatusEnum.ORDER_NO_PRICE.getType());
-		orderInfo.setCustomerId(customerId);
-		orderInfo.setCustomerJson(JSONObject.toJSONString(customForm));
-		orderInfo.setNumber(1);
-		orderInfo.setType(2);
-		generateOrder(orderInfo);
-		customForm.setOrderId(Integer.parseInt(String.valueOf(orderInfo.getOrderId())));
-		//设置定制信息为已转成订单
-		customForm.setStatus(2);
-		customFormBiz.updateSelectiveByIdRe(customForm);
-		return ObjectRestResponse.succ();
+
 	}