Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

dao/src/main/resources/mapper/ExternalDyDataBaseMapper.xml

@@ -13,7 +13,7 @@
             floor,
             roomType AS houseType,
             price,
-            ROUND(price * buildArea,2) as amount,
+            ROUND((price * buildArea/10000),2) as amount,
             orientation,
             structure,
             usages AS useType ,
@@ -72,9 +72,12 @@
         decorate as decoration,
         dealDate,
         dealMoney as amount,
-        floorInfo,
+        onFloor as floor,
         roomType AS houseType,
         dealPrice as price,
+        orientation,
+        upPrice,
+        url,
         '链家成交' as dataResource
         FROM
         db_data_lianjia

domain/src/main/java/com/dayou/vo/ExternalPersonalVO.java

@@ -42,6 +42,11 @@ public class ExternalPersonalVO {
      * 总价
      */
     private BigDecimal amount;
+
+    /**
+     * 链家挂牌总价
+     */
+    private BigDecimal upPrice;
     /**
      * 用途
      */
@@ -77,6 +82,11 @@ public class ExternalPersonalVO {
     private LocalDate upDate;
 
     /**
+     * 链家网址
+     */
+    private String url;
+
+    /**
      * 数据源类型
      */
     private String dataResource;

service/src/main/java/com/dayou/service/impl/ItemServiceImpl.java

@@ -59,6 +59,9 @@ public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements II
     @Autowired
     private IOrderFundService orderFundService;
 
+    @Autowired
+    private IBusinessNumberService businessNumberService;
+
     @Override
     @SuppressWarnings("unchecked")
     public Page<ItemVO> selectPage(Page page, ItemDTO item){
@@ -89,6 +92,8 @@ public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements II
         itemDTO.setUserId(LoginContext.getUserId());
         if (itemDTO.getBelongTo().equals(UnitEnum.TJC.name())){
             itemDTO.setOaNo(itemDTO.getBusinessNo());
+        }else{
+            itemDTO.setOaNo(businessNumberService.takeOrderNumber());
         }
         this.save(itemDTO);
         //创建订单收款记录

service/src/main/java/com/dayou/service/impl/PersonalFacePriceServiceImpl.java

@@ -214,9 +214,8 @@ public class PersonalFacePriceServiceImpl extends ServiceImpl<PersonalFacePriceM
     private ExternalFacePriceVO queryExternalDataByCommunityNames(List<String> communityNames, Date startDate){
         if (CollectionUtil.isNotEmpty(communityNames)){
             //成交价
-            List<ExternalPersonalVO> qiYuDeal = externalDyDataBaseService.externalPriceQiYuDeal(communityNames,startDate);
             List<ExternalPersonalVO> lianJiaDeal = externalDyDataBaseService.externalPriceLianJiaDeal(communityNames, startDate);
-
+            //List<ExternalPersonalVO> qiYuDeal = externalDyDataBaseService.externalPriceQiYuDeal(communityNames,startDate);
             //挂牌价
             List<ExternalPersonalVO> qiYuUp = externalDyDataBaseService.externalPriceQiYuUp(communityNames, startDate);
 
@@ -226,14 +225,15 @@ public class PersonalFacePriceServiceImpl extends ServiceImpl<PersonalFacePriceM
             String overall = StrUtil.isBlank(globalConfigService.getValue(SYS.getCode(), FACE_PRICE_OVERALL_PARAM.getCode()))?"1":globalConfigService.getValue(SYS.getCode(), FACE_PRICE_OVERALL_PARAM.getCode());
 
             //修正成交价
-            qiYuDeal.addAll(lianJiaDeal);
-            List<BigDecimal> dealPrices = qiYuDeal.stream().map(ExternalPersonalVO::getPrice).collect(Collectors.toList());
+            List<BigDecimal> dealPrices = lianJiaDeal.stream().map(ExternalPersonalVO::getPrice).collect(Collectors.toList());
             double reduce = dealPrices.stream().mapToDouble(BigDecimal::doubleValue).reduce(0, Double::sum);
             //成交价均值
-            BigDecimal dealPrice = BigDecimal.valueOf(reduce).divide(BigDecimal.valueOf(qiYuDeal.size()==0?1:qiYuDeal.size()), 0, RoundingMode.HALF_UP);
+            BigDecimal dealPrice = BigDecimal.valueOf(reduce).divide(BigDecimal.valueOf(lianJiaDeal.size()==0?1:lianJiaDeal.size()), 0, RoundingMode.HALF_UP);
             //修正
             BigDecimal xDealPrice = dealPrice.multiply(new BigDecimal(time)).multiply(new BigDecimal(acreage)).multiply(new BigDecimal(overall)).setScale(2, RoundingMode.HALF_UP);
 
+            //lianJiaDeal.addAll(qiYuDeal);
+
             //修正挂牌价
             List<BigDecimal> upPrices = qiYuUp.stream().map(ExternalPersonalVO::getPrice).collect(Collectors.toList());
             double reduce2 = upPrices.stream().mapToDouble(BigDecimal::doubleValue).reduce(0, Double::sum);
@@ -245,7 +245,7 @@ public class PersonalFacePriceServiceImpl extends ServiceImpl<PersonalFacePriceM
             ExternalFacePriceVO facePriceVO = new ExternalFacePriceVO();
             facePriceVO.setDealPrice(xDealPrice);
             facePriceVO.setUpPrice(xUplPrice);
-            facePriceVO.setDeals(qiYuDeal);
+            facePriceVO.setDeals(lianJiaDeal);
             facePriceVO.setUps(qiYuUp);
             facePriceVO.setTimeParam(time);
             facePriceVO.setAcreageParam(acreage);