fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -10,12 +10,13 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.yeshi.utils.JsonUtil; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.yeshi.fanli.controller.admin.utils.AdminUtils; import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.money.UserMoneyDetail; import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum; import com.yeshi.fanli.entity.order.CommonOrder; @@ -26,6 +27,7 @@ import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService; import com.yeshi.fanli.service.inter.order.CommonOrderCountService; import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.order.OrderProcessService; import com.yeshi.fanli.service.inter.order.OrderService; import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService; import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService; @@ -34,6 +36,7 @@ import com.yeshi.fanli.tag.PageEntity; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil; import com.yeshi.fanli.vo.order.CommonOrderVO; import net.sf.json.JSONArray; @@ -69,6 +72,9 @@ @Resource private UserMoneyDetailService userMoneyDetailService; @Resource private OrderProcessService orderProcessService; /** * 统计历史订单-淘宝订单 @@ -166,7 +172,7 @@ TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService .selectByOrderItemId(weiQuanOrder.getOrderItemId()); if (drawBack != null) {// 已经退款 // 计算退款资金 UserMoneyDetail detail = null; switch (order.getHongBaoType()) { @@ -937,4 +943,23 @@ return data; } @RequestMapping(value = "uploadTaoBaoWeiQuanOrder") public void uploadWeiQuanOrder(String callback, HttpServletRequest request, PrintWriter out) { try { // 1. 先判断httpRequest 是否含有文件类型 if (request instanceof MultipartHttpServletRequest) { MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request; MultipartFile file = fileRequest.getFile("file"); List<TaoBaoWeiQuanOrder> orderList = TaoBaoOrderUtil.getWeiQuanOrders(file.getInputStream()); for (TaoBaoWeiQuanOrder order : orderList) taoBaoWeiQuanOrderService.addWeiQuanOrder(order);// 添加维权订单到数据库 // 处理维权订单 orderProcessService.weiQuanOrder(orderList); } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("更新成功")); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("更新失败")); } } } fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
@@ -308,15 +308,8 @@ return getOrderList(30, config); } public static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String excelPath) { try { return parseWeiQuanOrder(new FileInputStream(new File(excelPath))); } catch (FileNotFoundException e) { e.printStackTrace(); } return null; public static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(InputStream input) { return parseWeiQuanOrder(input); } private static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String cookies, long startTime, long endTime) { @@ -575,41 +568,41 @@ for (int c = 0; c < sheet.getColumns(); c++) { String content = sheet.getCell(c, r).getContents().trim(); switch (c) { case 0://维权时间 case 0:// 维权时间 if (!StringUtil.isNullOrEmpty(content)) orderRecord.setWeiQuanTime( new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss"))); break; case 1://维权完成时间 case 1:// 维权完成时间 if (!StringUtil.isNullOrEmpty(content)) orderRecord.setWeiQuanFinishTime( new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss"))); break; case 2://结算时间 case 2:// 结算时间 if (!StringUtil.isNullOrEmpty(content)) orderRecord.setJieSuanTime( new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss"))); break; case 3://商品名称 case 3:// 商品名称 orderRecord.setGoodsName(content); break; case 5://淘宝订单号 case 5:// 淘宝订单号 orderRecord.setOrderId(content); break; case 6://淘宝子订单号 case 6:// 淘宝子订单号 orderRecord.setOrderItemId(content); break; case 7://维权状态 case 7:// 维权状态 orderRecord.setState(content); break; case 8://结算金额 case 8:// 结算金额 break; case 9://退款金额 case 9:// 退款金额 orderRecord.setMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content)); break; case 10://返还商家金额 case 10:// 返还商家金额 orderRecord.setFanMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content)); break; } fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -1672,7 +1672,10 @@ LogHelper.error("渠道ID申请出错:" + e.getMsg()); throw new TaoBaoAuthException(TaoBaoAuthException.CODE_OTHER, errorJSON.optString("sub_msg")); } } catch (Exception e) { LogHelper.error("渠道ID申请出错:" + (resultJSON != null ? resultJSON.toString() : "未知错误")); } return null; } public static String getSpecialId(String accessToken, String appKey, String appSecret) throws TaoBaoAuthException { @@ -1700,7 +1703,11 @@ LogHelper.error("会员运营ID申请出错:" + e.getMsg()); throw new TaoBaoAuthException(TaoBaoAuthException.CODE_OTHER, errorJSON.optString("sub_msg")); } } catch (Exception e) { LogHelper.error("会员运营ID申请出错:" + (resultJSON != null ? resultJSON.toString() : "未知错误")); } return null; } public static void specialConvertItem(Long auctionId, TaoKeAppInfo app) {
