Commit 6a9cdb69 authored by yajun.zhang's avatar yajun.zhang

添加日志和枚举

parent fc8d190f
...@@ -74,8 +74,40 @@ public enum ProblemTypeEnum { ...@@ -74,8 +74,40 @@ public enum ProblemTypeEnum {
LOGISTICS_UPLOAD_ERROR(412, "物流上传错误"), LOGISTICS_UPLOAD_ERROR(412, "物流上传错误"),
TEST(410, "测试"), TEST(410, "测试"),
; /*投诉错误*/
COMPLAINT_ERROR(435, "投诉错误"),
/*卡包业务*/
CARD_BUSINESS(437, "卡包业务"),
/*电商订单业务*/
URGE_DELIVERY_WITHIN_TIME(439, "催发货-时效内"),
URGE_DELIVERY_OVERDUE(440, "催发货-超时效"),
URGE_REFUND_WITHIN_TIME(441, "催退款-时效内"),
URGE_REFUND_OVERDUE(442, "催退款-超时效"),
INTERCEPT_RETURN_OR_CANCEL(443, "拦截退回/取消拦截"),
MODIFY_ADDRESS_OR_INFO(444, "改地址/改信息"),
AFTER_SALES_ISSUE(445, "商品售后问题"),
WRONG_MISSING_DAMAGE(446, "错发/漏发/少发/破损"),
CANCEL_ORDER_447(447, "取消订单"),
SERVICE_COMPLAINT(448, "服务不满投诉"),
OTHER_CONSULTATION_TYPE(449, "其他咨询类型"),
PRE_SALE_CONSULTATION(458, "售前问题咨询"),
MEMBER_REFUND_ISSUE(459, "会员退费问题"),
OTHER_LOGISTICS_ISSUE(460, "其他物流问题"),
EMPTY_PACKAGE(462, "空包裹"),
/*账号业务*/
CANCEL_ACCOUNT_451(451, "注销账号"),
CHANGE_PHONE(452, "更换手机号码"),
FORCE_LOGOUT(453, "强制登出小程序/APP"),
CLOSE_ORDER_VERIFICATION(454, "关闭历史订单验证"),
VERIFICATION_CODE_ISSUE(455, "验证码获取相关"),
LOGIN_PROBLEM(461, "账号登录问题"),
/*其他业务*/
OHTHER_BUSINESS(457, "其他业务"),
;
private final int code; private final int code;
private final String desc; private final String desc;
......
...@@ -292,8 +292,8 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService { ...@@ -292,8 +292,8 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
} }
int pageNo = (count + pageSize - 1) / pageSize; int pageNo = (count + pageSize - 1) / pageSize;
List<ThirdWorkOrderExportVo> exportVos = new ArrayList<>();
//数据库查出来的
List<ThirdWorkOrderExportVo> dbAllData = new ArrayList<>(); List<ThirdWorkOrderExportVo> dbAllData = new ArrayList<>();
List<ThirdWorkOrderExportVo> kdspResult = new ArrayList<>(); List<ThirdWorkOrderExportVo> kdspResult = new ArrayList<>();
...@@ -301,6 +301,7 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService { ...@@ -301,6 +301,7 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
for (int i = 1;i <= pageNo;i++){ for (int i = 1;i <= pageNo;i++){
long offset = (i - 1) * pageSize; long offset = (i - 1) * pageSize;
String tempSql = sql.toString() + " limit "+offset+","+pageSize; String tempSql = sql.toString() + " limit "+offset+","+pageSize;
log.info("工单导出sql:"+tempSql);
Query nativeQuery = entityManager.createNativeQuery(tempSql); Query nativeQuery = entityManager.createNativeQuery(tempSql);
List<Object[]> result = nativeQuery.getResultList(); List<Object[]> result = nativeQuery.getResultList();
for (Object[] objects : result) { for (Object[] objects : result) {
...@@ -353,15 +354,16 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService { ...@@ -353,15 +354,16 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
} }
log.info("工单数据库查数据结果:"+dbAllData.size() +" 详细数据:"+JSON.toJSONString(dbAllData));
int orderPageNo = (orderNos.size() + pageSize - 1) / pageSize; int orderPageNo = (orderNos.size() + pageSize - 1) / pageSize;
List<String> orderNoList = new ArrayList<>(orderNos); List<String> orderNoList = new ArrayList<>(orderNos);
for (int i =0;i < orderPageNo;i++){ for (int i =0;i < orderPageNo;i++){
List<String> subList = null; List<String> subList = null;
if (i != orderPageNo-1){ if (i != orderPageNo-1){
System.out.println(i*pageSize +"||"+ (i+1)*pageSize); log.info("工单orderno分页:"+i*pageSize +"||"+ (i+1)*pageSize);
subList = orderNoList.subList(i*pageSize, (i+1)*pageSize); subList = orderNoList.subList(i*pageSize, (i+1)*pageSize);
}else { }else {
System.out.println(i*pageSize +"||"+ orderNos.size()); log.info("工单orderno分页:"+i*pageSize +"||"+ orderNos.size());
subList = orderNoList.subList(i*pageSize, orderNos.size()); subList = orderNoList.subList(i*pageSize, orderNos.size());
} }
JsonResult<List<ThirdWorkOrderExportVo>> orderResult = iKdspService.getOrderDetailForWorkOder(subList,tenantId); JsonResult<List<ThirdWorkOrderExportVo>> orderResult = iKdspService.getOrderDetailForWorkOder(subList,tenantId);
...@@ -374,7 +376,8 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService { ...@@ -374,7 +376,8 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
kdspResult.addAll(data); kdspResult.addAll(data);
} }
} }
log.info("工单kdsp查询订单商品数据结果:"+kdspResult.size() +" 详细数据:"+JSON.toJSONString(kdspResult));
List<ThirdWorkOrderExportVo> exportVos = new ArrayList<>();
Map<String, List<ThirdWorkOrderExportVo>> groupBy = kdspResult.stream().collect(Collectors.groupingBy(ThirdWorkOrderExportVo::getOrderNo)); Map<String, List<ThirdWorkOrderExportVo>> groupBy = kdspResult.stream().collect(Collectors.groupingBy(ThirdWorkOrderExportVo::getOrderNo));
for (ThirdWorkOrderExportVo dbData : dbAllData){ for (ThirdWorkOrderExportVo dbData : dbAllData){
List<ThirdWorkOrderExportVo> kdspOrders = groupBy.get(dbData.getOrderNo()); List<ThirdWorkOrderExportVo> kdspOrders = groupBy.get(dbData.getOrderNo());
...@@ -402,6 +405,7 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService { ...@@ -402,6 +405,7 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
exportVos.add(kdspOrder); exportVos.add(kdspOrder);
} }
} }
log.info("工单导出完整数据结果:"+exportVos.size() +" 详细数据:"+JSON.toJSONString(exportVos));
String date = DateUtil.format(new Date(), DateUtil.YYYYMMDDHHMMSS); String date = DateUtil.format(new Date(), DateUtil.YYYYMMDDHHMMSS);
String path = System.getProperty("java.io.tmpdir") +File.separator + "工单导出"+DateUtil.format(new Date(),DateUtil.YYYYMMDDHHMMSS) +".xlsx"; String path = System.getProperty("java.io.tmpdir") +File.separator + "工单导出"+DateUtil.format(new Date(),DateUtil.YYYYMMDDHHMMSS) +".xlsx";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment