Merge branch 'dev' of http://113.105.137.151:22280/zhoujw/rs-cloud-platform into dev

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/vo/ItemInfoVo.java

@@ -18,4 +18,6 @@ public class ItemInfoVo {
 	private BigDecimal price;
 	private Integer type;
 	private String img;
+
+	private String name;
 }

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

@@ -243,6 +243,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 						number.updateAndGet(v -> v + itemInfoDto.getNumber());
 						BigDecimal totalAmount = shoppingCartInfo.getTotalAmount();
 						amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue())));
+						//下单后删除购物车
+						shoppingCartInfo.setIsDel(1);
+						shoppingCartInfoBiz.updateSelectiveByIdRe(shoppingCartInfo);
 					}
 					break;
 				default:

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/service/ConfirmOrderService.java

@@ -79,6 +79,7 @@ public class ConfirmOrderService {
 							itemInfoVo.setNumber(itemInfoDto.getNumber());
 							itemInfoVo.setType(itemInfoDto.getType());
 							itemInfoVo.setPrice(industryApplicationInfo.getPrice());
+							itemInfoVo.setName(industryApplicationInfo.getTitle());
 							itemInfoVoList.add(itemInfoVo);
 							//总数量
 							number.updateAndGet(v -> v + itemInfoDto.getNumber());
@@ -102,6 +103,7 @@ public class ConfirmOrderService {
 								itemInfoVo.setNumber(itemInfoDto.getNumber());
 								itemInfoVo.setImg(imageImgStorage.getCoverImg());
 								itemInfoVo.setDetailJson(JSONObject.toJSONString(imageImgStorage));
+								itemInfoVo.setName(imageImgStorage.getName());
 								itemInfoVoList.add(itemInfoVo);
 								//总数量
 								number.updateAndGet(v -> v + itemInfoDto.getNumber());
@@ -121,6 +123,7 @@ public class ConfirmOrderService {
 							itemInfoVo.setNumber(itemInfoDto.getNumber());
 							itemInfoVo.setImg(shoppingCartInfo.getItemPic());
 							itemInfoVo.setDetailJson(shoppingCartInfo.getDetailJson());
+							itemInfoVo.setName(shoppingCartInfo.getName());
 							itemInfoVoList.add(itemInfoVo);
 							number.updateAndGet(v -> v + itemInfoDto.getNumber());
 							BigDecimal totalAmount = shoppingCartInfo.getTotalAmount();