Merge branch 'lmy_start' into dev_yy_dh

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

@@ -31,7 +31,7 @@ public class GoblinImportServiceImpl implements IGoblinImportService {
                     String skuIds = "";
                     int init = 22;
                     int skip = 9;
-                    int count = (item.size() - init) / skip;
+                    int count = 1+(item.size() - init) / skip;
                     String orderId = item.get(0);
                     String mailNo = item.get(13);
                     for (int i = 0; i < count; i++) {
@@ -49,7 +49,7 @@ public class GoblinImportServiceImpl implements IGoblinImportService {
                     if (mailNo == null || mailNo.equals("")) {
                         log.error("发货失败 orderId = " + orderId + "skuIds = " + skuIds + " 快递单号空");
                     }
-                    ResponseDto<Boolean> express = iGoblinStoreOrderService.express(orderId, skuIds, mailNo, "d0920ca469129c3950f70371b36c1ce2");
+                    ResponseDto<Boolean> express = iGoblinStoreOrderService.express(orderId, skuIds, mailNo, CurrentUtil.getCurrentUid());
                     if (express.getCode().equals("0")) {
                     } else {
                         log.error("发货失败 orderId = " + orderId + "skuIds = " + skuIds + " mailNo = " + mailNo);