Merge branch 'master' into dev_gjy_now_order_detals_paycode

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinExportService.java
#	liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinStoreOrderMapper.xml

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinExportService.java

@@ -13,13 +13,12 @@ public interface IGoblinExportService {
 
     List<GoblinZhengzaiMarketOrderExcelDto> exportZhengzaiMarketOrder(Map<String, Object> paramMap);
 
-    List<GoblinMarketGoodsExcelDto> exportMarketGoods(Map<String, Object> paramMap);
-
-    List<GoblinMarketGoodsUnDateExcelDto> exportMarketGoodsUnDate(Map<String, Object> paramMap);
-
     //导出商城订单信息
     ResponseDto<String> exportMallOrder(HttpServletResponse response, String beginTime, String endTime, String state, Integer mailType,String storeId);
 
 
+    List<GoblinMarketGoodsExcelDto> exportMarketGoods(Map<String, Object> paramMap);
+
+    List<GoblinMarketGoodsUnDateExcelDto> exportMarketGoodsUnDate(Map<String, Object> paramMap);
 
 }

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

@@ -82,8 +82,7 @@
         </where>
         group by gos.order_sku_id
     </select>
-    <select id="exportZhengzaiMarketOrder"
-            resultType="com.liquidnet.service.goblin.dto.GoblinZhengzaiMarketOrderExcelDto">
+    <select id="exportZhengzaiMarketOrder" resultType="com.liquidnet.service.goblin.dto.GoblinZhengzaiMarketOrderExcelDto">
         select gos.spu_name                                       spuName,
                gsm.name                                           marketName,
                gsi.store_name                                     storeName,
@@ -109,8 +108,7 @@
                  inner join goblin_store_info gsi on gsi.store_id = gso.store_id
                  inner join goblin_self_marketing gsm on gsm.self_market_id = SUBSTRING_INDEX(gso.market_id, 'ZZ', -1)
         <where>
-            gso.status not in (0, 5) and gso.store_id = #{storeId,jdbcType=VARCHAR} and gso.market_id =
-            #{marketId,jdbcType=VARCHAR}
+            gso.status not in (0, 5) and gso.store_id = #{storeId,jdbcType=VARCHAR} and gso.market_id = #{marketId,jdbcType=VARCHAR}
             <if test="beginTime != null">
                 and gso.created_at <![CDATA[>=]]> #{beginTime,jdbcType=TIMESTAMP}
             </if>
@@ -247,5 +245,4 @@
         b.sku_id;
     </select>
 
-
 </mapper>

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

@@ -242,4 +242,119 @@ public class GoblinExportDataController {
             }
         }
     }
+
+    /**
+     * excel正在下单根据日期导出
+     *
+     * @return
+     */
+    @GetMapping("/exportMarketGoods")
+    @ApiOperation(value = "正在下单-商品根据日期")
+    @ResponseBody
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "marketId", value = "活动ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "bDate", value = "开始时间[yyyy-MM-dd]"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "eDate", value = "结束时间[yyyy-MM-dd]"),
+    })
+    public void exportMarketGoods(@RequestParam(required = true, name = "bDate") @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "开始日期格式有误") String beginDate,
+                                  @RequestParam(required = true, name = "eDate") @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "结束日期格式有误") String endDate,
+                                  @RequestParam String marketId, @RequestParam String storeId, HttpServletResponse response) {
+        String currentUid = CurrentUtil.getCurrentUid();
+        ServletOutputStream servletOutputStream = null;
+        try {
+            log.debug("数据导出:正在下单-商品根据日期导出:[uid:{},storeId:{},marketId:{},date:{}~{}]", currentUid, storeId, marketId, beginDate, endDate);
+            String fileName = DateUtil.Formatter.yyyyMMddHHmmssTrim.format(LocalDateTime.now())
+                    .concat(new String(("正在下单-商品根据日期导出").getBytes("gb2312"), StandardCharsets.ISO_8859_1));
+            response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=".concat(fileName).concat(ExcelTypeEnum.XLSX.getValue()));
+            response.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
+            response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+            servletOutputStream = response.getOutputStream();
+
+            HashMap<String, Object> paramMap = CollectionUtil.mapStringObject();
+            paramMap.put("storeId", storeId);
+            paramMap.put("marketId", GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue() + marketId);
+            LocalDate beginLocalDate = DateUtil.Formatter.yyyy_MM_dd.parse2LocalDate(beginDate);
+            LocalDate endLocalDate = DateUtil.Formatter.yyyy_MM_dd.parse2LocalDate(endDate);
+            paramMap.put("beginTime", null == beginLocalDate ? beginLocalDate : LocalDateTime.of(beginLocalDate, LocalTime.MIN));
+            paramMap.put("endTime", null == endLocalDate ? endLocalDate : LocalDateTime.of(endLocalDate, LocalTime.MAX));
+            if (log.isDebugEnabled()) {
+                log.debug("数据导出:正在下单-商品根据日期导出:[uid:{},paramMap:{}]", currentUid, JsonUtils.toJson(paramMap));
+            }
+
+            List<GoblinMarketGoodsExcelDto> excelDtos = iGoblinExportService.exportMarketGoods(paramMap);
+            if (CollectionUtils.isEmpty(excelDtos)) {
+                log.warn("数据导出:正在下单-商品根据日期导出:无数据，请核实:[uid:{},paramMap:{}]", currentUid, JsonUtils.toJson(paramMap));
+                return;
+            }
+            EasyExcel.write(servletOutputStream, GoblinMarketGoodsExcelDto.class).sheet("销售数据").doWrite(excelDtos);
+        } catch (IOException e) {
+            log.error("数据导出:正在下单-商品根据日期导出:异常[uid:{},storeId:{},marketId:{},date:{}~{},ex.msg={}]",
+                    currentUid, storeId, marketId, beginDate, endDate, e.getLocalizedMessage());
+            throw new LiquidnetServiceException("-1", "导出失败，请联系网站管理员");
+        } finally {
+            if (null != servletOutputStream) {
+                try {
+                    servletOutputStream.close();
+                } catch (Exception ignored) {
+                }
+            }
+        }
+    }
+
+    /**
+     * excel正在下单根据导出
+     */
+    @GetMapping("/exportMarketGoodsUnDate")
+    @ApiOperation(value = "正在下单-商品导出")
+    @ResponseBody
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "marketId", value = "活动ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "bDate", value = "开始时间[yyyy-MM-dd HH:mm:ss]"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "eDate", value = "结束时间[yyyy-MM-dd HH:mm:ss]"),
+    })
+    public void exportMarketGoodsUnDate(@RequestParam(required = true, name = "bDate") @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "开始日期格式有误") String beginDate,
+                                        @RequestParam(required = true, name = "eDate") @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "结束日期格式有误") String endDate,
+                                        @RequestParam String marketId, @RequestParam String storeId, HttpServletResponse response) {
+        String currentUid = CurrentUtil.getCurrentUid();
+        ServletOutputStream servletOutputStream = null;
+        try {
+            log.debug("数据导出:正在下单-商品导出:[uid:{},storeId:{},marketId:{},date:{}~{}]", currentUid, storeId, marketId, beginDate, endDate);
+            String fileName = DateUtil.Formatter.yyyyMMddHHmmssTrim.format(LocalDateTime.now())
+                    .concat(new String(("正在下单-商品导出").getBytes("gb2312"), StandardCharsets.ISO_8859_1));
+            response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=".concat(fileName).concat(ExcelTypeEnum.XLSX.getValue()));
+            response.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
+            response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+            servletOutputStream = response.getOutputStream();
+
+            HashMap<String, Object> paramMap = CollectionUtil.mapStringObject();
+            paramMap.put("storeId", storeId);
+            paramMap.put("marketId", GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue() + marketId);
+            paramMap.put("beginTime", beginDate);
+            paramMap.put("endTime", endDate);
+            if (log.isDebugEnabled()) {
+                log.debug("数据导出:正在下单-商品导出:[uid:{},paramMap:{}]", currentUid, JsonUtils.toJson(paramMap));
+            }
+
+            List<GoblinMarketGoodsUnDateExcelDto> excelDtos = iGoblinExportService.exportMarketGoodsUnDate(paramMap);
+            if (CollectionUtils.isEmpty(excelDtos)) {
+                log.warn("数据导出:正在下单-商品导出:无数据，请核实:[uid:{},paramMap:{}]", currentUid, JsonUtils.toJson(paramMap));
+                return;
+            }
+            EasyExcel.write(servletOutputStream, GoblinMarketGoodsUnDateExcelDto.class).sheet("销售数据").doWrite(excelDtos);
+        } catch (IOException e) {
+            log.error("数据导出:正在下单-商品导出:异常[uid:{},storeId:{},marketId:{},date:{}~{},ex.msg={}]",
+                    currentUid, storeId, marketId, beginDate, endDate, e.getLocalizedMessage());
+            throw new LiquidnetServiceException("-1", "导出失败，请联系网站管理员");
+        } finally {
+            if (null != servletOutputStream) {
+                try {
+                    servletOutputStream.close();
+                } catch (Exception ignored) {
+                }
+            }
+        }
+    }
+
 }

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

@@ -32,6 +32,17 @@ public class GoblinExportServiceImpl implements IGoblinExportService {
     @Autowired
     GoblinStoreOrderMapper goblinStoreOrderMapper;
 
+    @Override
+    public List<GoblinMarketGoodsExcelDto> exportMarketGoods(Map<String, Object> paramMap) {
+        return goblinStoreOrderMapper.exportMarketGoods(paramMap);
+    }
+
+    @Override
+    public List<GoblinMarketGoodsUnDateExcelDto> exportMarketGoodsUnDate(Map<String, Object> paramMap) {
+        return goblinStoreOrderMapper.exportMarketGoodsUnDate(paramMap);
+    }
+
+
     @Override
     public List<GoblinZhengzaiMarketOrderExcelDto> exportZhengzaiMarketOrder(Map<String, Object> paramMap) {
         return goblinStoreOrderMapper.exportZhengzaiMarketOrder(paramMap);