资金商品 维度增加排序

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -445,6 +445,7 @@ public class GoblinMongoUtils {
         return mongoTemplate.findOne(Query.query(Criteria.where("storeId").is(storeId).and("name").is(name).and("delFlg").is("0")),
                 GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
     }
+
     public long countMgtGoodsInfoVo(String name) {
         return mongoTemplate.count(Query.query(Criteria.where("name").is(name).and("delFlg").is("0")),
                 GoblinGoodsInfoVo.class.getSimpleName());
@@ -870,7 +871,7 @@ public class GoblinMongoUtils {
         }
         if (spuName != null) {
             //根据spu名称查询spuId
-            Query query = Query.query(Criteria.where("name").regex(".*?" + spuName + ".*").and("storeId").is(storeId));
+            Query query = Query.query(Criteria.where("name").regex(".*?" + spuName + ".*").and("storeId").is(storeId)).with(Sort.by(Sort.Order.desc("createdAt")));
             query.fields().include("spuId").include("name");
             spuIdAndName = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
             spuIdList = spuIdAndName.stream().map(GoblinGoodsInfoVo::getSpuId).collect(Collectors.toList());
@@ -878,7 +879,7 @@ public class GoblinMongoUtils {
                 finalCount = spuIdList.size();
             }
         }
-        if(finalCount>0){
+        if (finalCount > 0) {
             spuIdList = spuIdList.subList(skipCount, finalCount);
         }
         criteria = criteria.and("spuId").in(spuIdList);
@@ -940,7 +941,7 @@ public class GoblinMongoUtils {
                     criteria = criteria.and("orderType").is("zhengzai").and("status").in(22, 28);
                     break;
             }
-        }else{
+        } else {
             criteria = criteria.and("status").in(
                     GoblinStatusConst.Status.ORDER_LOG_STATUS_11.getValue(),
                     GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue(),

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/DataController.java

@@ -19,12 +19,12 @@ public class DataController {
     private DataImpl data;
 
 
-    @PostMapping("phpGoodsOrder")
-    @ApiOperation("php今年订单迁移")
-    public ResponseDto<Boolean> fieldData() {
-        data.fieldData();
-        return ResponseDto.success();
-    }
+//    @PostMapping("phpGoodsOrder")
+//    @ApiOperation("php今年订单迁移")
+//    public ResponseDto<Boolean> fieldData() {
+//        data.fieldData();
+//        return ResponseDto.success();
+//    }
 
 //    @PostMapping("fieldData")
 //    @ApiOperation("场地数据迁移")

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -74,7 +74,7 @@ public class DataImpl {
                     "       m.matter_num                             as 'master_order_code',\n" +
                     "       m.matter_num                             as 'order_code',\n" +
                     "       m.out_trade_no                           as 'pay_code',\n" +
-                    "       ifnull(user_id, user_id_new)             as 'user_id',\n" +
+                    "       m.user_id_new             as 'user_id',\n" +
                     "       m.matter_amount                          as 'price_total',\n" +
                     "       (m.matter_amount - m.coupon_type2_price) as 'price_actual',\n" +
                     "       m.price_send                             as 'price_express',\n" +
@@ -172,15 +172,15 @@ public class DataImpl {
                     skuVo.setSkuPriceActual(rowSku.getBigDecimal("sku_price_actual"));
                     skuVo.setSkuName(rowSku.getString("sku_specs"));
                     skuVo.setSkuImage(rowSku.getString("sku_image"));
-                    skuVo.setSkuSpecs("[{\"specName\":\""+rowSku.getString("sku_name")+"\",\"specVname\":\""+rowSku.getString("sku_specs")+"\"}]");//
+                    skuVo.setSkuSpecs("[{\"specName\":\"" + rowSku.getString("sku_name") + "\",\"specVname\":\"" + rowSku.getString("sku_specs") + "\"}]");//
                     skuVo.setSpuName(rowSku.getString("spu_name"));
                     skuVo.setCreatedAt(orderVo.getCreatedAt());
                     setGoblinOrderSku(skuVo.getOrderSkuId(), skuVo);
                     orderSkuIds.add(skuVo.getOrderSkuId());
                 }
                 orderVo.setOrderSkuVoIds(orderSkuIds);
-                setGoblinOrder(orderVo.getOrderId(),orderVo);
-                addOrderList(orderVo.getUserId(),orderVo.getOrderId());
+                setGoblinOrder(orderVo.getOrderId(), orderVo);
+                addOrderList(orderVo.getUserId(), orderVo.getOrderId());
 
                 rowSku.close();
                 preparedStatementSku.close();