Merge branch 'lmy_start' into dev_yy_dh

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinStoreOrderMapper.xml

@@ -73,13 +73,14 @@
                     ${item}
                 </foreach>
             </if>
-            <if test="mailType != null and mailType == '1'">
-                and gm.mail_no is null;
+            <if test="mailType != null and mailType == 1">
+                and gm.mail_no is null
             </if>
-            <if test="mailType != null and mailType == '2'">
-                and gm.mail_no is not null;
+            <if test="mailType != null and mailType == 2">
+                and gm.mail_no is not null
             </if>
         </where>
+        group by gos.order_sku_id
     </select>
 
 </mapper>

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

@@ -109,7 +109,7 @@ public class GoblinExportServiceImpl implements IGoblinExportService {
                 cells.add("下单时间");
                 cells.add("快递公司");
                 cells.add("物流单号");
-                int j = (max - 13) / 9;
+                int j = (max - 14) / 9;
                 for (int i = 1; i <= j; i++) {
                     cells.add("商品id" + i);
                     cells.add("商品名" + i);