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

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

@@ -41,8 +41,12 @@ public class OrderItem implements Serializable {
     @Column(name = "name")
 	@ApiModelProperty(value = "商品名称")
     private String name;
-	
-	    /**
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
      *  详情id
      */
     @Column(name = "detail_id")

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

@@ -34,8 +34,12 @@ public class ShoppingCartInfo implements Serializable {
     @Column(name = "name")
 	@ApiModelProperty(value = "订单名称")
     private String name;
-	
-	    /**
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
      *  详情id
      */
     @Column(name = "detail_id")

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

@@ -339,7 +339,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 							orderItem.setTotalAmount(imageInfoRelation.getPrice().multiply(new BigDecimal(itemInfoDto.getNumber())));
 							orderItem.setPrice(imageInfoRelation.getPrice());
 							orderItem.setNumber(itemInfoDto.getNumber());
-							orderItem.setName(imageImgStorage.getName());
+							orderItem.setName(imageImgStorage.getName() + " (" + imageInfoRelation.getFileWidth()+ ")");
 							orderItem.setItemPic(imageImgStorage.getCoverImg());
 							orderItem.setDetailJson(JSONObject.toJSONString(imageImgStorage));
 							orderItem.setDetailId(Long.valueOf(imageImgStorage.getId()));
@@ -705,7 +705,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 					.orLike("phone", "%" + userOrderDto.getKeywords() + "%")
 					.orLike("orderNo", "%" + userOrderDto.getKeywords() + "%");
 		}
-		example.orderBy("updTime").desc();
+//		example.orderBy("updTime").desc();
+		example.orderBy("crtTime").desc();
 		PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
 		if (pageDataVO != null && pageDataVO.getData() != null && pageDataVO.getData().size() > 0) {
 			fillOrderItem(pageDataVO.getData());
@@ -889,7 +890,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 							orderItem.setTotalAmount(imageInfoRelation.getPrice().multiply(new BigDecimal(itemInfoDto.getNumber())));
 							orderItem.setPrice(imageInfoRelation.getPrice());
 							orderItem.setNumber(itemInfoDto.getNumber());
-							orderItem.setName(imageImgStorage.getName());
+							orderItem.setName(imageImgStorage.getName() + " (" + imageInfoRelation.getFileWidth()+ ")");
 							orderItem.setItemPic(imageImgStorage.getCoverImg());
 							orderItem.setDetailJson(JSONObject.toJSONString(imageImgStorage));
 							orderItem.setDetailId(Long.valueOf(imageInfoRelation.getId()));
@@ -982,7 +983,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 						if (imageInfoRelationList != null && imageInfoRelationList.size() > 0) {
 							imageInfoRelationList.stream().forEach(imageInfoRelation -> {
 								ItemInfoVo itemInfoVo = new ItemInfoVo();
-								itemInfoVo.setName(imageImgStorage.getName() + " 尺寸：(" + imageInfoRelation.getFileWidth()+ ")");
+								itemInfoVo.setName(imageImgStorage.getName() + " (" + imageInfoRelation.getFileWidth()+ ")");
 								itemInfoVo.setId(Long.parseLong(String.valueOf(imageInfoRelation.getId())));
 								itemInfoVo.setType(ItemTypeEnum.IMAGE_STORAGE.getType());
 								itemInfoVoList.add(itemInfoVo);

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

@@ -175,7 +175,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 					shoppingCartInfo.setFilePath(orderInfoDto.getFilePath());
 					shoppingCartInfo.setNumber(orderInfoDto.getNumber());
 					shoppingCartInfo.setItemPic(imageImgStorage.getCoverImg());
-					shoppingCartInfo.setName(imageImgStorage.getName());
+					shoppingCartInfo.setName(imageImgStorage.getName() + " (" + imageInfoRelation.getFileWidth()+ ")");
 					shoppingCartInfo.setTotalAmount(orderInfoDto.getPrice().multiply(new BigDecimal(orderInfoDto.getNumber())));
 					shoppingCartInfo.setType(orderInfoDto.getType());
 					//添加用户信息