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

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

@@ -745,6 +745,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 			orderInfo.setTotalAmount(customFormDto.getAmount());
 			orderInfo.setNumber(1);
 			orderInfo.setType(2);
+			orderInfo.setSendType(1);
+			orderInfo.setDataPrepare(0);
 			generateOrder(orderInfo);
 			customForm.setOrderId(Integer.parseInt(String.valueOf(orderInfo.getOrderId())));
 			customForm.setOrderNo(orderInfo.getOrderNo());
@@ -786,6 +788,31 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		return ObjectRestResponse.succ();
 	}
 
+	/**
+	 * 设置数据为已准备
+	 * @param orderInfoDto
+	 * @return
+	 */
+	public ObjectRestResponse setDataPrepare(OrderInfoDto orderInfoDto) {
+		if (orderInfoDto == null || orderInfoDto.getOrderId() == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		OrderInfo orderInfo = selectById(orderInfoDto.getOrderId());
+		if (orderInfo == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.ORDER_NOT_EXIST, ResultCode.getMsg(ResultCode.ORDER_NOT_EXIST));
+		}
+		orderInfo.setDataPrepare(1);
+		updateSelectiveByIdRe(orderInfo);
+		CustomForm customForm = customFormBiz.selectOne(new CustomForm() {{
+			setOrderId(orderInfo.getOrderId().intValue());
+		}});
+		if (customForm != null) {
+			customForm.setStatus(2);
+			customFormBiz.updateSelectiveByIdRe(customForm);
+		}
+		return ObjectRestResponse.succ();
+	}
+
 	/**
 	 * 定制订单添加订单商品
 	 *
@@ -804,12 +831,18 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (orderInfo == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.ORDER_NOT_EXIST, ResultCode.getMsg(ResultCode.ORDER_NOT_EXIST));
 		}
+		List<OrderItem> orderItems = orderItemBiz.selectList(new OrderItem(){{setOrderId(orderInfo.getOrderId());}});
+		if (orderItems != null && orderItems.size() > 0) {
+			orderItems.parallelStream().forEach(orderItem -> {
+				orderItemBiz.delete(orderItem);
+			});
+		}
 		List<OrderItem> orderItemList = new ArrayList<>();
 		itemInfoDtoList.stream().forEach(itemInfoDto -> {
 			switch (OrderTypeEnum.getByCode(itemInfoDto.getType())) {
 				//标准数据
 				case STANDARD_DATA:
-					List<ImageDataVO> imageDataVOList = datacenterFeign.queryByIds(orderInfoDto.getDetailId() + "").getData();
+					List<ImageDataVO> imageDataVOList = datacenterFeign.queryByIds(itemInfoDto.getId() + "").getData();
 					if (imageDataVOList != null && imageDataVOList.size() > 0) {
 						ImageDataVO imageDataVO = imageDataVOList.get(0);
 						OrderItem orderItem = new OrderItem();
@@ -842,7 +875,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 				case IMAGE_STORAGE:
 					ImageInfoRelation imageInfoRelation = imageInfoRelationBiz.selectById(itemInfoDto.getId());
 					if (imageInfoRelation != null) {
-						ImageImgStorage imageImgStorage = imageImgStorageBiz.getDetail(itemInfoDto.getId().intValue()).getData();
+						ImageImgStorage imageImgStorage = imageImgStorageBiz.getDetail(imageInfoRelation.getRelationId()).getData();
 						if (imageImgStorage != null) {
 							List<ImageInfoRelation> imageInfoRelationList = new ArrayList<>();
 							imageInfoRelationList.add(imageInfoRelation);
@@ -855,7 +888,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 							orderItem.setName(imageImgStorage.getName());
 							orderItem.setItemPic(imageImgStorage.getCoverImg());
 							orderItem.setDetailJson(JSONObject.toJSONString(imageImgStorage));
-							orderItem.setDetailId(Long.valueOf(imageImgStorage.getId()));
+							orderItem.setDetailId(Long.valueOf(imageInfoRelation.getId()));
 							orderItemList.add(orderItem);
 						}
 					}
@@ -868,13 +901,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 				orderItemBiz.insertSelective(orderItem);
 			}
 		});
-		CustomForm customForm = customFormBiz.selectOne(new CustomForm() {{
-			setOrderId(orderInfo.getOrderId().intValue());
-		}});
-		if (customForm != null) {
-			customForm.setStatus(2);
-			customFormBiz.updateSelectiveByIdRe(customForm);
-		}
+
 		return ObjectRestResponse.succ();
 	}
 
@@ -956,12 +983,6 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 								itemInfoVo.setType(ItemTypeEnum.IMAGE_STORAGE.getType());
 								itemInfoVoList.add(itemInfoVo);
 							});
-						} else {
-							ItemInfoVo itemInfoVo = new ItemInfoVo();
-							itemInfoVo.setName(imageImgStorage.getName());
-							itemInfoVo.setId(Long.parseLong(String.valueOf(imageImgStorage.getId())));
-							itemInfoVo.setType(ItemTypeEnum.IMAGE_STORAGE.getType());
-							itemInfoVoList.add(itemInfoVo);
 						}
 					});
 				}

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

@@ -52,6 +52,11 @@ public class OrderInfoController extends BaseController<OrderInfoBiz,OrderInfo>
 		return baseBiz.setOrderItem(orderInfoDto);
 	}
 
+	@PostMapping(value = "setDataPrepare")
+	public ObjectRestResponse setDataPrepare(@RequestBody OrderInfoDto orderInfoDto) {
+		return baseBiz.setDataPrepare(orderInfoDto);
+	}
+
 	@GetMapping(value = "getItemByType")
 	public ObjectRestResponse getItemByType(Integer type, String name) {
 		return baseBiz.getItemByType(type, name);