订单信息

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

@@ -13,7 +13,7 @@ public class ItemInfoDto {
 
 	Long id;
 
-	Integer number;
+	Integer number = 1;
 
 	/**
 	 * 类型： 1、标准数据，2、影像图库，3、行业应用信息, 4、购物车确认订单

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

@@ -47,6 +47,11 @@ public class OrderInfoDto extends PageParam {
 	 */
 	private String invoiceContent;
 
+	/**
+	 * 订单ID
+	 */
+	Long orderId;
+
 	//详情ID
 	Long detailId;
 

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

@@ -33,4 +33,19 @@ public class UserOrderDto extends PageParam {
 	//用户id
 	Integer userId;
 
+	/**
+	 * 订单号
+	 */
+	String orderNo;
+
+	/**
+	 * 昵称
+	 */
+	String nickname;
+
+	/**
+	 * 手机号
+	 */
+	String phone;
+
 }

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

@@ -212,6 +212,16 @@ public class OrderInfo implements Serializable {
 	 */
 	String cancelRemark;
 
+	/**
+	 * 定制订单ID
+	 */
+	Integer customerId;
+
+	/**
+	 * 定制信息json
+	 */
+	String customerJson;
+
 	@Transient
 	private List<OrderItem> orderItemList;
 

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderInfoController.java

@@ -3,11 +3,12 @@ package com.upyuns.platform.rs.website.controller;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
+import com.upyuns.platform.rs.website.dto.ConfirmReceivedDto;
+import com.upyuns.platform.rs.website.dto.OrderInfoDto;
+import com.upyuns.platform.rs.website.dto.OrderInvoiceDto;
 import com.upyuns.platform.rs.website.dto.UserOrderDto;
 import com.upyuns.platform.rs.website.entity.OrderInfo;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("orderInfo")
@@ -22,4 +23,35 @@ public class OrderInfoController extends BaseController<OrderInfoBiz,OrderInfo>
 	public ObjectRestResponse detail(Long orderId) {
 		return ObjectRestResponse.succ(baseBiz.getOrderDetail(orderId));
 	}
+
+	@PostMapping(value = "orderSend")
+	public ObjectRestResponse orderSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
+		return baseBiz.orderSend(confirmReceivedDto);
+	}
+
+	@PostMapping(value = "setInvoice")
+	public ObjectRestResponse setInvoice(@RequestBody OrderInvoiceDto orderInvoiceDto) {
+		return baseBiz.setInvoice(orderInvoiceDto);
+	}
+
+	@PostMapping(value = "invoiceSend")
+	public ObjectRestResponse invoiceSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
+		return baseBiz.invoiceSend(confirmReceivedDto);
+	}
+
+	@GetMapping(value = "customerToOrderInfo")
+	public ObjectRestResponse customerToOrderInfo(Integer customerId) {
+		return baseBiz.customerToOrderInfo(customerId);
+	}
+
+	@PostMapping(value = "setOrderPrice")
+	public ObjectRestResponse setOrderPrice(@RequestBody OrderInfo orderInfo) {
+		return baseBiz.setOrderPrice(orderInfo);
+	}
+
+	@PostMapping(value = "setOrderItem")
+	public ObjectRestResponse setOrderItem(@RequestBody OrderInfoDto orderInfoDto) {
+		return baseBiz.setOrderItem(orderInfoDto);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/OrderInfoWebController.java

@@ -41,21 +41,6 @@ public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInf
 		return baseBiz.confirmReceived(orderId);
 	}
 
-	@PostMapping(value = "orderSend")
-	public ObjectRestResponse orderSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
-		return baseBiz.orderSend(confirmReceivedDto);
-	}
-
-	@PostMapping(value = "setInvoice")
-	public ObjectRestResponse setInvoice(@RequestBody OrderInvoiceDto orderInvoiceDto) {
-		return baseBiz.setInvoice(orderInvoiceDto);
-	}
-
-	@PostMapping(value = "invoiceSend")
-	public ObjectRestResponse invoiceSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
-		return baseBiz.invoiceSend(confirmReceivedDto);
-	}
-
 	@GetMapping(value = "confirmOrderInvoice")
 	public ObjectRestResponse confirmOrderInvoice(Long orderId) {
 		return baseBiz.confirmOrderInvoice(orderId);
@@ -70,4 +55,10 @@ public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInf
 	public ObjectRestResponse deleteOrder(Long orderId) {
 		return baseBiz.deleteOrder(orderId);
 	}
+
+	@PostMapping(value = "setAddressOrInvoice")
+	public ObjectRestResponse setAddressOrInvoice(@RequestBody OrderInfoDto orderInfoDto) {
+		return baseBiz.setAddressOrInvoice(orderInfoDto);
+	}
+
 }
\ No newline at end of file