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

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java

@@ -55,6 +55,5 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
 //        RscpImageDataTotal rscpImageDataTotal = BeanUtil.toBean(vo, RscpImageDataTotal.class);
         dto.setRange(getBinNameByGId(dto));
         List<RscpAreaInfo> imageAreaInfoList = rscpAreaInfoMapper.getIntersectAreaInfo(dto.getRange());
-
     }
 }

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImagePriceController.java

@@ -16,7 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
@@ -49,6 +51,23 @@ public class RscpImagePriceController extends BaseController<RscpImagePriceBiz,
         return ObjectRestResponse.succ(imagePriceVOS);
     }
 
+    @RequestMapping(value = "/app/unauth/price", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse unauthPrice() {
+        List<RscpImagePrice> list = baseBiz.selectByWeekend(w -> {
+            w.andEqualTo(RscpImagePrice::getStatus, SYS_TRUE);
+            return w;
+        }, " daily_sort asc");
+
+        Map<String, BigDecimal> priceMap = CollUtil.newHashMap();
+
+        list.forEach(rscpImagePrice -> {
+            priceMap.put(rscpImagePrice.getImageSatelliteType()+"_"+rscpImagePrice.getImageSensorType(), rscpImagePrice.getPrice());
+        });
+
+        return ObjectRestResponse.succ(priceMap);
+    }
+
     @Data
     static public class ImagePriceVO {
 

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

@@ -260,4 +260,15 @@ public class CustomForm implements Serializable {
 	 * 价格
 	 */
 	private BigDecimal amount;
+
+	/**
+	 *  订单号
+	 */
+	@Column(name = "order_no")
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
+
+	public void setOrderId(Integer orderId) {
+		this.orderId = orderId;
+	}
 }

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

@@ -700,6 +700,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 			orderInfo.setType(2);
 			generateOrder(orderInfo);
 			customForm.setOrderId(Integer.parseInt(String.valueOf(orderInfo.getOrderId())));
+			customForm.setOrderNo(orderInfo.getOrderNo());
 			//设置定制信息为已转成订单
 			customForm.setStatus(2);
 			customForm.setAuditStatus(customFormDto.getAuditStatus());