快递文案修改

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

@@ -1216,9 +1216,9 @@ public class GoblinRedisUtils {
 //        String rk = GoblinRedisConst.REDIS_ZZ_MUSIC_TAG.concat(musicTag + ":").concat(performanceId);
 //        Object obj = redisUtil.get(rk);
 //        if (obj == null) {
-        listVo = goblinMongoUtils.getMusicTagPGoods(musicTag, performanceId);
-//            redisUtil.set(rk, listVo);
-        return listVo;
+            listVo = goblinMongoUtils.getMusicTagPGoods(musicTag, performanceId);
+//            redisUtil.set(rk, listVo, 60 * 30);
+//            return listVo;
 //        } else {
 //            return (List<GoblinGoodsInfoVo>) obj;
 //        }

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
+import com.liquidnet.service.goblin.dto.vo.GoblinMailVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinOrderAttrVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
@@ -74,7 +75,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" +
-                    "       m.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" +
@@ -93,10 +94,14 @@ public class DataImpl {
                     "       m.post_phone                             as 'express_phone',\n" +
                     "       m.post_address                           as 'express_address',\n" +
                     "       m.post_address                           as 'express_address_detail',\n" +
-                    "       m.created_at                             as 'created_at'\n" +
-                    "from matters as m\n" +
+                    "       m.created_at                             as 'created_at',\n" +
+                    "       e.name                                 as 'logistics_company',\n" +
+                    "       e.status                                 as 'express_status',\n" +
+                    "       e.number                                 as 'mail_no',\n" +
+                    "       e.created_at                             as 'delivery_time'\n" +
+                    "from matters as m  left join expresses as e on e.order_id = m.id and e.order_type = 'order_product'\n" +
                     "where m.status = 1\n" +
-                    "  and m.created_at >= '2022-01-01 00:00:00'";
+                    "  and m.created_at >= '2022-01-01 00:00:00' group by m.id;";
             Connection connection = DriverManager.getConnection(SQL_URL, SQL_USER, SQL_PWD);
             //查询数据
             PreparedStatement preparedStatement = connection.prepareStatement(sql);
@@ -107,7 +112,18 @@ public class DataImpl {
                 orderVo.setStoreId("dab4742921ba3555700896c4fafbee5b");
                 orderVo.setStoreName("摩登天空自营店");
                 orderVo.setPayCountdownMinute(5);
-                orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                //判断快递状态
+                String express_status = row.getString("express_status");
+                if (express_status == null) {
+                    orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
+                } else {
+                    if (express_status.equals("3")) {
+                        orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                    } else {
+                        orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_3.getValue());
+                    }
+                }
+
                 orderVo.setOrderId(row.getString("order_id"));
                 orderVo.setMasterOrderCode(row.getString("master_order_code"));
                 orderVo.setOrderCode(row.getString("order_code"));
@@ -163,7 +179,7 @@ public class DataImpl {
                 while (rowSku.next()) {
                     GoblinOrderSkuVo skuVo = GoblinOrderSkuVo.getNew();
                     skuVo.setOrderId(orderVo.getOrderId());
-                    skuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                    skuVo.setStatus(orderVo.getStatus());
                     skuVo.setOrderSkuId(rowSku.getString("order_sku_id"));
                     skuVo.setSpuId(rowSku.getString("spu_id"));
                     skuVo.setSkuId(rowSku.getString("sku_id"));
@@ -178,9 +194,21 @@ public class DataImpl {
                     setGoblinOrderSku(skuVo.getOrderSkuId(), skuVo);
                     orderSkuIds.add(skuVo.getOrderSkuId());
                 }
+                //判断快递
+                if (express_status != null) {
+                    GoblinMailVo mailVo = GoblinMailVo.getNew();
+                    mailVo.setMailId(IDGenerator.nextTimeId2());
+                    mailVo.setOrderId(orderVo.getOrderId());
+                    mailVo.setMailNo(row.getString("mail_no"));
+                    mailVo.setDeliveryTime(row.getString("delivery_time"));
+                    mailVo.setLogisticsCompany(row.getString("logistics_company"));
+                    mailVo.setOrderSkuVoIds(orderSkuIds);
+                    setGoblinMail(orderVo.getOrderId(), mailVo);
+                }
+
                 orderVo.setOrderSkuVoIds(orderSkuIds);
                 setGoblinOrder(orderVo.getOrderId(), orderVo);
-                addOrderList(orderVo.getUserId(), orderVo.getOrderId());
+//                addOrderList(orderVo.getUserId(), orderVo.getOrderId());
 
                 rowSku.close();
                 preparedStatementSku.close();
@@ -227,4 +255,18 @@ public class DataImpl {
             return (List<String>) obj;
         }
     }
+
+    // 赋值 快递vo
+    public void setGoblinMail(String orderId, GoblinMailVo vo) {
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_MAIL.concat(orderId);
+        List<GoblinMailVo> list = goblinMailVoList();
+        list.add(vo);
+        redisDataSourceUtil.getRedisKylinUtil().set(redisKey, list);
+    }
+
+    private static final ArrayList<GoblinMailVo> goblinMailVo = new ArrayList<>();
+
+    public static ArrayList<GoblinMailVo> goblinMailVoList() {
+        return (ArrayList<GoblinMailVo>) goblinMailVo.clone();
+    }
 }