商城订单导出

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -1416,7 +1416,7 @@ public class ExportServiceImpl implements ExportService {
         queryInfo.setOrderType("3");
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
-//        params.put("noGroupType","MALL_SELL");
+        params.put("noGroupType","MALL_SELL");
         int count = studentPaymentRouteOrderDao.queryCount(params);
         if (count <= 0) {
             return BaseController.failed("没有可导出的数据");
@@ -1678,7 +1678,7 @@ public class ExportServiceImpl implements ExportService {
         }
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
-//        params.put("notGroupType","MALL_SELL");
+        params.put("notGroupType","MALL_SELL");
         int count = studentPaymentOrderService.getDao().queryCount(params);
         if (count <= 0) {
             return BaseController.failed("没有可导出的数据");
@@ -1790,8 +1790,8 @@ public class ExportServiceImpl implements ExportService {
             List<JSONObject> orderItemList = JSONObject.parseArray(JSONObject.parseObject(goodsJson).getString("orderItemList"), JSONObject.class);
             productIdList.addAll(orderItemList.stream().map(e -> e.get("productId").toString()).collect(Collectors.toSet()));
         }
-        List<String> categoryNames = sellOrderDao.getMallProductCategory("mall_pro");
-        Map<Long,String> productCategoryMap = MapUtil.convertMybatisMap(sellOrderDao.getMallProductMap(productIdList,"mall_pro"));
+        List<String> categoryNames = sellOrderDao.getMallProductCategory("mec_mall");
+        Map<Long,String> productCategoryMap = MapUtil.convertMybatisMap(sellOrderDao.getMallProductMap(productIdList,"mec_mall"));
         for (StudentPaymentOrderMallExportDto row : studentPaymentOrderExportDtos) {
             if (row.getActualAmount() == null) {
                 row.setActualAmount(BigDecimal.ZERO);
@@ -2621,8 +2621,8 @@ public class ExportServiceImpl implements ExportService {
             List<JSONObject> orderItemList = JSONObject.parseArray(JSONObject.parseObject(goodsJson).getString("orderItemList"), JSONObject.class);
             productIdList.addAll(orderItemList.stream().map(e -> e.get("productId").toString()).collect(Collectors.toSet()));
         }
-        List<String> categoryNames = sellOrderDao.getMallProductCategory("mall_pro");
-        Map<Long,String> productCategoryMap = MapUtil.convertMybatisMap(sellOrderDao.getMallProductMap(productIdList,"mall_pro"));
+        List<String> categoryNames = sellOrderDao.getMallProductCategory("mec_mall");
+        Map<Long,String> productCategoryMap = MapUtil.convertMybatisMap(sellOrderDao.getMallProductMap(productIdList,"mec_mall"));
         for (StudentPaymentOrderMallExportDto basicOrder : studentPaymentOrderExportDtos) {
             basicOrder.getUser().setUsername(studentNameMap.get(basicOrder.getUserId()));
             basicOrder.setUserOrganName(userOrganNameMap.get(basicOrder.getOrganId()));

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -673,16 +673,16 @@
         </foreach>
     </select>
     <select id="getMallProductMap" resultType="java.util.Map">
-        select pp.id 'key',ppc.name 'value' from mall_pro.pms_product_category ppc
-        left join mall_pro.pms_product_category ppcc ON ppcc.parent_id = ppc.id
-        left join mall_pro.pms_product pp ON pp.product_category_id = ppcc.id
+        select pp.id 'key',ppc.name 'value' from mec_mall.pms_product_category ppc
+        left join mec_mall.pms_product_category ppcc ON ppcc.parent_id = ppc.id
+        left join mec_mall.pms_product pp ON pp.product_category_id = ppcc.id
         where pp.id IN
         <foreach collection="productIdList" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </select>
     <select id="getMallProductCategory" resultType="java.lang.String">
-        select name from mall_pro.pms_product_category where parent_id = 0
+        select name from mec_mall.pms_product_category where parent_id = 0
     </select>
 
 </mapper>