|
|
@@ -2,6 +2,7 @@ package com.caimei.modules.hehe.web;
|
|
|
|
|
|
import com.caimei.modules.bulkpurchase.entity.BpClause;
|
|
|
import com.caimei.modules.bulkpurchase.service.BpClauseService;
|
|
|
+import com.caimei.modules.common.utils.ExcelUtil;
|
|
|
import com.caimei.modules.hehe.dao.CmHeheUserDao;
|
|
|
import com.caimei.modules.hehe.entity.CmHeheUser;
|
|
|
import com.caimei.modules.hehe.service.HeHeNewOrderService;
|
|
|
@@ -13,16 +14,20 @@ import com.caimei.modules.order.service.CmDiscernReceiptService;
|
|
|
import com.caimei.modules.order.service.CmReceiptOrderRelationService;
|
|
|
import com.caimei.modules.order.service.CmReturnedPurchaseService;
|
|
|
import com.caimei.modules.order.service.NewOrderConfigService;
|
|
|
+import com.caimei.modules.order.utils.OrderUtil;
|
|
|
+import com.thinkgem.jeesite.common.config.Global;
|
|
|
import com.thinkgem.jeesite.common.persistence.Page;
|
|
|
import com.thinkgem.jeesite.common.utils.StringUtils;
|
|
|
import com.thinkgem.jeesite.common.web.BaseController;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
+import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.Model;
|
|
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
@@ -227,4 +232,128 @@ public class HeHeNewOrderController extends BaseController {
|
|
|
model.addAttribute("returnedPurchaseFee", returnedPurchaseFee);
|
|
|
return "modules/hehe/heheNewOrderDetail";
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 取消订单
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping("cancelOrder")
|
|
|
+ public String cancelOrder(Integer orderID, RedirectAttributes redirectAttributes) {
|
|
|
+ heHeNewOrderService.cancelOrder(orderID);
|
|
|
+ addMessage(redirectAttributes, "取消订单成功");
|
|
|
+ return "redirect:" + Global.getAdminPath() + "/hehe/new/order/detail/?id=" + orderID;
|
|
|
+ }
|
|
|
+
|
|
|
+ /*@RequestMapping(value = "batchExportOrder")
|
|
|
+ public void exportTest(String startTime, String endTime, CmDiscernReceipt cmDiscernReceipt, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response) {
|
|
|
+ //获取订单数据
|
|
|
+ String fileName = "收款账单.xls";
|
|
|
+ String template = Global.getConfig("export.template");
|
|
|
+ String templateFileName = template + "/discern_receipt_export.xls";
|
|
|
+ List<String> listSheetNames = new ArrayList<String>();
|
|
|
+ ArrayList<List> objects = new ArrayList<List>();
|
|
|
+ //收款时间筛查
|
|
|
+ if (startTime == null) {
|
|
|
+ cmDiscernReceipt.setStartTime("2019-10-01 00:00:00");
|
|
|
+ } else {
|
|
|
+ cmDiscernReceipt.setStartTime(startTime);
|
|
|
+ }
|
|
|
+ if (endTime == null) {
|
|
|
+ cmDiscernReceipt.setEndTime("2019-10-31 23:59:59");
|
|
|
+ } else {
|
|
|
+ cmDiscernReceipt.setEndTime(endTime);
|
|
|
+ }
|
|
|
+ try {
|
|
|
+
|
|
|
+ List<CmMainReceiptExport> list = cmDiscernReceiptService.exportTest(cmDiscernReceipt);
|
|
|
+ for (CmMainReceiptExport bean : list) {
|
|
|
+ String productNames = bean.getProductNames();
|
|
|
+ if (StringUtils.isNotEmpty(productNames)) {
|
|
|
+ String[] productNameArr = productNames.split(",");
|
|
|
+ for (int i = 0; i < productNameArr.length; i++) {
|
|
|
+ productNameArr[i] = (i + 1) + "." + productNameArr[i] + "\r\n";
|
|
|
+ productNames = i==0?productNameArr[i]:productNames + productNameArr[i];
|
|
|
+ }
|
|
|
+ bean.setProductNames(productNames);
|
|
|
+ }
|
|
|
+ bean.setPayType(OrderUtil.getPayTypeStr(bean.getPayType()));
|
|
|
+ }
|
|
|
+ //返佣数据
|
|
|
+ List<CmMainReceiptExport> list1 = cmDiscernReceiptService.exportRebate(cmDiscernReceipt);
|
|
|
+ for (CmMainReceiptExport export : list1) {
|
|
|
+ export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
|
|
|
+ export.setOrderID(export.getOrderID() + ("5".equals(export.getReceiptType())?"(供应商退款订单)":"(返佣订单)"));
|
|
|
+ list.add(export);
|
|
|
+ }
|
|
|
+ //非订单款
|
|
|
+ List<CmMainReceiptExport> list2 = cmDiscernReceiptService.theOrder(cmDiscernReceipt);
|
|
|
+ for (CmMainReceiptExport export : list2) {
|
|
|
+ export.setOrderID("非订单");
|
|
|
+ export.setUserName("");
|
|
|
+ export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
|
|
|
+ list.add(export);
|
|
|
+ }
|
|
|
+
|
|
|
+ //退款记录表
|
|
|
+ List<CmReturnedPurchase> purchases = cmDiscernReceiptService.exportRefund(cmDiscernReceipt);
|
|
|
+ for (CmReturnedPurchase purchase : purchases) {
|
|
|
+ String refundWay = "";
|
|
|
+ if ("1".equals(purchase.getReturnedWay())) {
|
|
|
+ if (purchase.getRefundBalanceFee() != null && purchase.getRefundBalanceFee() != 0) {
|
|
|
+ refundWay += "账户余额";
|
|
|
+ }
|
|
|
+ if (purchase.getRefundOnlineFee() != null && purchase.getRefundOnlineFee() != 0) {
|
|
|
+ refundWay += ";线上退回";
|
|
|
+ }
|
|
|
+ if (purchase.getRefundOfflineFee() != null && purchase.getRefundOfflineFee() != 0) {
|
|
|
+ refundWay += ";线下转账";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ purchase.setReturnedWay(refundWay);
|
|
|
+ String payType = OrderUtil.getPayType(purchase.getPayType());
|
|
|
+ purchase.setPayType(payType);
|
|
|
+ }
|
|
|
+
|
|
|
+ //超级会员款
|
|
|
+ List<CmMainReceiptExport> svipList = cmDiscernReceiptService.svipReceipt(cmDiscernReceipt);
|
|
|
+ for (CmMainReceiptExport export : svipList) {
|
|
|
+ export.setOrderID("超级会员款");
|
|
|
+ export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
|
|
|
+ list.add(export);
|
|
|
+ }
|
|
|
+
|
|
|
+ //二手商品上架费
|
|
|
+ List<CmMainReceiptExport> secondList = cmDiscernReceiptService.secondReceipt(cmDiscernReceipt);
|
|
|
+ for (CmMainReceiptExport export : secondList) {
|
|
|
+ export.setOrderID("二手商品上架费");
|
|
|
+ export.setUserName("");
|
|
|
+ export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
|
|
|
+ list.add(export);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 收款进度 1待收 2部分收 3全收
|
|
|
+ cmDiscernReceipt.setReceiptProgress("2");
|
|
|
+ List<CmReceiptExportData> ListExportData1 = getListExportData(cmDiscernReceipt);
|
|
|
+ cmDiscernReceipt.setReceiptProgress("3");
|
|
|
+ List<CmReceiptExportData> ListExportData2 = getListExportData(cmDiscernReceipt);
|
|
|
+
|
|
|
+ objects.add(list);
|
|
|
+ *//*objects.add(ListExportData1);
|
|
|
+ objects.add(ListExportData2);
|
|
|
+ objects.add(getListOrderPayment(cmDiscernReceipt));
|
|
|
+ objects.add(purchases);*//*
|
|
|
+ listSheetNames.add("收款表");
|
|
|
+ *//*listSheetNames.add("部分收款");
|
|
|
+ listSheetNames.add("已收款");
|
|
|
+ listSheetNames.add("返佣订单");
|
|
|
+ listSheetNames.add("退款记录表");*//*
|
|
|
+
|
|
|
+ new ExcelUtil().createMultipleSheetsExcel(templateFileName, fileName, listSheetNames, objects, response);
|
|
|
+ } catch (Exception e) {
|
|
|
+ addMessage(redirectAttributes, "收款列表导出失败！" + e.getMessage());
|
|
|
+ logger.info(e.getMessage());
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }*/
|
|
|
}
|
Aslee