修改省bug

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

@@ -266,6 +266,11 @@ public class OrderInfo implements Serializable {
 	 */
 	String satellite;
 
+	/**
+	 * 数据是否已准备
+	 */
+	Integer dataPrepare;
+
 	@Transient
 	private List<OrderItem> orderItemList;
 

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

@@ -950,7 +950,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/job/WebsiteScheduleTask.java

@@ -26,6 +26,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.upyuns.platform.rs.website.entity.OrderInfo.SENDTYPE_OL;
 import static com.upyuns.platform.rs.website.type.OrderStatusEnum.ORDER_PAID;
 import static com.upyuns.platform.rs.website.type.OrderStatusEnum.ORDER_SEND;
@@ -68,6 +69,7 @@ public class WebsiteScheduleTask {
         List<OrderInfo> list = orderInfoBiz.selectByWeekend(w -> {
             w.andEqualTo(OrderInfo::getStatus, ORDER_SEND.getType());
             w.andEqualTo(OrderInfo::getSendType, SENDTYPE_OL);
+            w.andEqualTo(OrderInfo::getDataPrepare, SYS_TRUE);
 //            w.andEqualTo(OrderInfo::getUserId, 656);
             return w;
         });