|
|
@@ -8,7 +8,6 @@ import com.uas.platform.b2c.common.account.service.VendorService;
|
|
|
import com.uas.platform.b2c.core.constant.SplitChar;
|
|
|
import com.uas.platform.b2c.core.constant.Type;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
|
|
|
import com.uas.platform.b2c.core.support.view.JxlsExcelView;
|
|
|
import com.uas.platform.b2c.core.utils.FastjsonUtils;
|
|
|
import com.uas.platform.b2c.core.utils.StringUtilB2C;
|
|
|
@@ -22,32 +21,23 @@ import com.uas.platform.b2c.trade.order.service.OrderService;
|
|
|
import com.uas.platform.b2c.trade.order.type.ResultMapType;
|
|
|
import com.uas.platform.b2c.trade.support.ResultMap;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
-import com.uas.platform.core.logging.BufferedLoggerManager;
|
|
|
import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.PageParams;
|
|
|
import com.uas.platform.core.model.Status;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
|
|
|
|
|
|
import javax.management.OperationsException;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpSession;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
import static com.uas.platform.b2c.core.utils.StringUtilB2C.decodeValue;
|
|
|
|
|
|
@@ -70,8 +60,7 @@ public class OrderController {
|
|
|
@Autowired
|
|
|
private OrderDetailService orderDetailService;
|
|
|
|
|
|
- private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
|
|
|
-
|
|
|
+ private final Logger logger = LoggerFactory.getLogger(OrderController.class);
|
|
|
/**
|
|
|
* 某个人的某些订单的获取
|
|
|
*
|
|
|
@@ -84,7 +73,7 @@ public class OrderController {
|
|
|
// 判断是否可以显示订单 必须是用户UU下的订单号才可以显示
|
|
|
String[] ids = orderid.split(SplitChar.HYPHEN);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取订单信息", "获取订单号: " + orderid);
|
|
|
+ logger.info("买家订单管理", "获取订单信息", "获取订单号: " + orderid);
|
|
|
return orderService.findOnesByOrderId(ids);
|
|
|
}
|
|
|
|
|
|
@@ -119,7 +108,7 @@ public class OrderController {
|
|
|
assert logger != null;
|
|
|
if(resultMap.getCode() == ResultMapType.OK.getCode()) {
|
|
|
Order order = (Order) resultMap.getData();
|
|
|
- logger.log("买家订单管理", "立即购买", "生成订单号:" + order.getOrderid());
|
|
|
+ logger.info("买家订单管理", "立即购买", "生成订单号:" + order.getOrderid());
|
|
|
}
|
|
|
return resultMap;
|
|
|
}
|
|
|
@@ -138,7 +127,7 @@ public class OrderController {
|
|
|
String orderid= fromJson.get("orderid").toString();
|
|
|
orderService.deleteOrderDetails(orderDetailIds, orderid);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家删除订单明细", "删除订单明细: " + ids);
|
|
|
+ logger.info("买家订单管理", "买家删除订单明细", "删除订单明细: " + ids);
|
|
|
return "success";
|
|
|
}
|
|
|
|
|
|
@@ -155,7 +144,7 @@ public class OrderController {
|
|
|
public ResultMap ensureOnes(@PathVariable String orderid, @RequestBody JSONObject[] ordersInfo) {
|
|
|
orderid = StringUtilB2C.decodeValue(orderid);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家确认订单", "确认订单号: " + orderid);
|
|
|
+ logger.info("买家订单管理", "买家确认订单", "确认订单号: " + orderid);
|
|
|
return orderService.ensureOrder(orderid, ordersInfo);
|
|
|
}
|
|
|
|
|
|
@@ -167,7 +156,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET)
|
|
|
public List<OrderSimpleInfo> findOnesSimpleInfo() {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取个人订单简要信息");
|
|
|
+ logger.info("买家订单管理", "获取个人订单简要信息");
|
|
|
return orderService.findOnesSimpleInfo();
|
|
|
}
|
|
|
|
|
|
@@ -179,7 +168,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=tobeConfirmed")
|
|
|
public List<OrderSimpleInfo> findOnesToBeConfirmedSimpleInfo() {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取个人待确认订单简要信息");
|
|
|
+ logger.info("买家订单管理", "获取个人待确认订单简要信息");
|
|
|
return orderService.findOnesToBeConfirmedSimpleInfo();
|
|
|
}
|
|
|
|
|
|
@@ -191,7 +180,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=tobePaid")
|
|
|
public List<OrderSimpleInfo> findOnesToBePaidSimpleInfo() {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取个人待付款订单简要信息");
|
|
|
+ logger.info("买家订单管理", "获取个人待付款订单简要信息");
|
|
|
return orderService.findOnesToBePaidSimpleInfo();
|
|
|
}
|
|
|
|
|
|
@@ -208,7 +197,7 @@ public class OrderController {
|
|
|
info.filter("status", Status.TOBEPAID.value());
|
|
|
info.filter("buyeruu", SystemSession.getUser().getUserUU());
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "分页获取个人待付款订单简要信息");
|
|
|
+ logger.info("买家订单管理", "分页获取个人待付款订单简要信息");
|
|
|
return orderService.findOnesToBePaidPageSimpleInfo(info, keyword);
|
|
|
}
|
|
|
|
|
|
@@ -220,7 +209,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=paid")
|
|
|
public List<OrderSimpleInfo> findOnesPaidSimpleInfo() {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取个人已付款订单简要信息");
|
|
|
+ logger.info("买家订单管理", "获取个人已付款订单简要信息");
|
|
|
return orderService.findOnesPaidSimpleInfo();
|
|
|
}
|
|
|
|
|
|
@@ -232,7 +221,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=inbounds")
|
|
|
public List<OrderSimpleInfo> findOnesInbounds() {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取个人待出货、出货中、已出货、发货中、待收货订单简要信息");
|
|
|
+ logger.info("买家订单管理", "获取个人待出货、出货中、已出货、发货中、待收货订单简要信息");
|
|
|
return orderService.findOnesPaidInbounds();
|
|
|
}
|
|
|
|
|
|
@@ -244,7 +233,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/simpleinfo/ones", method = RequestMethod.GET, params = "_status=received")
|
|
|
public List<OrderSimpleInfo> findReceived() {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取个人已收货订单简要信息");
|
|
|
+ logger.info("买家订单管理", "获取个人已收货订单简要信息");
|
|
|
return orderService.findReceived();
|
|
|
}
|
|
|
|
|
|
@@ -272,7 +261,7 @@ public class OrderController {
|
|
|
List<String> orderIds = new ArrayList<>();
|
|
|
Collections.addAll(orderIds, ids);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "取消订单", "取消订单号: " + orderid);
|
|
|
+ logger.info("买家订单管理", "取消订单", "取消订单号: " + orderid);
|
|
|
return orderService.cancle(orderIds);
|
|
|
}
|
|
|
|
|
|
@@ -286,7 +275,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/{orderid}/ensurePay", method = RequestMethod.PUT)
|
|
|
public Order setToBeShipped(@PathVariable String orderid) throws OperationsException {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台确认收款", "确认收款订单号: " + orderid);
|
|
|
+ logger.info("买家订单管理", "平台确认收款", "确认收款订单号: " + orderid);
|
|
|
return orderService.ensurePayed(orderid, null);
|
|
|
}
|
|
|
|
|
|
@@ -300,7 +289,7 @@ public class OrderController {
|
|
|
public String batchToBeShipped(@PathVariable String orderids) {
|
|
|
orderService.batchToEnsureReceMoney(orderids);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台批量确认收款", "确认收款订单号: " + orderids);
|
|
|
+ logger.info("买家订单管理", "平台批量确认收款", "确认收款订单号: " + orderids);
|
|
|
return "success";
|
|
|
}
|
|
|
|
|
|
@@ -313,7 +302,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/{orderid}/received", method = RequestMethod.PUT)
|
|
|
public Order setReceived(@PathVariable String orderid) {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家确认收货", "确认收货订单号: " + orderid);
|
|
|
+ logger.info("买家订单管理", "买家确认收货", "确认收货订单号: " + orderid);
|
|
|
return orderService.setReceived(orderid);
|
|
|
}
|
|
|
|
|
|
@@ -330,7 +319,7 @@ public class OrderController {
|
|
|
info.filter("status", Status.PAID.value());
|
|
|
Page<Order> page = orderService.findPageByStatus(info, keyword);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取已付款买家订单信息");
|
|
|
+ logger.info("买家订单管理", "平台获取已付款买家订单信息");
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -347,7 +336,7 @@ public class OrderController {
|
|
|
info.filter("status", Status.TOBEPAID.value());
|
|
|
Page<Order> page = orderService.findPageByStatus(info, keyword);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取待付款买家订单信息");
|
|
|
+ logger.info("买家订单管理", "平台获取待付款买家订单信息");
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -364,7 +353,7 @@ public class OrderController {
|
|
|
info.filter("status", Status.TOBESHIPPED.value());
|
|
|
Page<Order> page = orderService.findPageByStatus(info, keyword);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取待出货买家订单信息");
|
|
|
+ logger.info("买家订单管理", "平台获取待出货买家订单信息");
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -381,7 +370,7 @@ public class OrderController {
|
|
|
info.filter("status", Status.SHIPPINGIN.value());
|
|
|
Page<Order> page = orderService.findPageByStatus(info, keyword);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取出货中买家订单信息");
|
|
|
+ logger.info("买家订单管理", "平台获取出货中买家订单信息");
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -398,7 +387,7 @@ public class OrderController {
|
|
|
info.filter("status", Status.SHIPPED.value());
|
|
|
Page<Order> page = orderService.findPageByStatus(info, keyword);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取已出货买家订单信息");
|
|
|
+ logger.info("买家订单管理", "平台获取已出货买家订单信息");
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -415,7 +404,7 @@ public class OrderController {
|
|
|
info.filter("status", Status.INBOUND.value());
|
|
|
Page<Order> page = orderService.findPageByStatus(info, keyword);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取待收货买家订单信息");
|
|
|
+ logger.info("买家订单管理", "平台获取待收货买家订单信息");
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -432,7 +421,7 @@ public class OrderController {
|
|
|
info.filter("status", Status.RECEIVED.value());
|
|
|
Page<Order> page = orderService.findPageByStatus(info, keyword);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取已收货买家订单信息");
|
|
|
+ logger.info("买家订单管理", "平台获取已收货买家订单信息");
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -448,7 +437,7 @@ public class OrderController {
|
|
|
public Page<Order> findAdminOrders(PageParams params, String keyword, String status) {
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取买家订单信息");
|
|
|
+ logger.info("买家订单管理", "平台获取买家订单信息");
|
|
|
return orderService.findAdminOrders(pageInfo, keyword, status);
|
|
|
}
|
|
|
|
|
|
@@ -471,7 +460,7 @@ public class OrderController {
|
|
|
Date end = endDate != null ? new Date(endDate) : null;
|
|
|
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家获取买家订单信息");
|
|
|
+ logger.info("买家订单管理", "买家获取买家订单信息");
|
|
|
return orderService.findOrdersByInternal(pageInfo, keyword, status, available, false, start, end, exType,isRate);
|
|
|
}
|
|
|
|
|
|
@@ -488,7 +477,7 @@ public class OrderController {
|
|
|
public Page<Order> findIndividualProofs(PageParams params, String keyword, String status, Integer available) {
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家获取买家样品订单信息");
|
|
|
+ logger.info("买家订单管理", "买家获取买家样品订单信息");
|
|
|
return orderService.findIndividualOrders(pageInfo, keyword, status, available, true);
|
|
|
}
|
|
|
|
|
|
@@ -503,7 +492,7 @@ public class OrderController {
|
|
|
orderid = StringUtilB2C.decodeValue(orderid);
|
|
|
Order order = orderService.findOrderDetail(orderid);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取买家订单详情信息", "根据订单号: " + orderid + "获取订单详情", orderid, order.getId());
|
|
|
+ logger.info("买家订单管理", "平台获取买家订单详情信息", "根据订单号: " + orderid + "获取订单详情", orderid, order.getId());
|
|
|
return order;
|
|
|
}
|
|
|
|
|
|
@@ -518,7 +507,7 @@ public class OrderController {
|
|
|
String or_id = StringUtilB2C.decodeValue(orderid);
|
|
|
Order order = orderService.buyerOrderDetail(or_id);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家获取买家订单详情信息", "根据订单号: " + orderid + "获取订单详情", orderid, order.getId());
|
|
|
+ logger.info("买家订单管理", "买家获取买家订单详情信息", "根据订单号: " + orderid + "获取订单详情", orderid, order.getId());
|
|
|
return order;
|
|
|
}
|
|
|
|
|
|
@@ -532,7 +521,7 @@ public class OrderController {
|
|
|
public BankTransfer getBankInfo(@PathVariable Long banktfid) {
|
|
|
BankTransfer bankTransfer = orderService.getBankInfo(banktfid);
|
|
|
assert logger != null;
|
|
|
- logger.log("银行信息管理", "获取银行转账信息", "根据银行转账信息id: " + banktfid + "获取银行转账信息详情", banktfid.toString(), banktfid);
|
|
|
+ logger.info("银行信息管理", "获取银行转账信息", "根据银行转账信息id: " + banktfid + "获取银行转账信息详情", banktfid.toString(), banktfid);
|
|
|
return bankTransfer;
|
|
|
}
|
|
|
|
|
|
@@ -546,7 +535,7 @@ public class OrderController {
|
|
|
public Order findByCode(@PathVariable String orderid) {
|
|
|
orderid = StringUtilB2C.decodeValue(orderid);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取买家订单信息", "根据订单号: " + orderid + "获取订单详情");
|
|
|
+ logger.info("买家订单管理", "获取买家订单信息", "根据订单号: " + orderid + "获取订单详情");
|
|
|
return orderService.findOnesByOrderId(orderid);
|
|
|
}
|
|
|
|
|
|
@@ -564,7 +553,7 @@ public class OrderController {
|
|
|
Enterprise enterprise = vendorService.getVendorByUu(sellerenuu);
|
|
|
map.put("enterprise", enterprise);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取买家订单买家卖家信息", "根据卖方企业uu号: " + sellerenuu + "获取买卖双方信息");
|
|
|
+ logger.info("买家订单管理", "获取买家订单买家卖家信息", "根据卖方企业uu号: " + sellerenuu + "获取买卖双方信息");
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
@@ -577,7 +566,7 @@ public class OrderController {
|
|
|
*/
|
|
|
@RequestMapping(value = "simpleinfo/ones/{orderid}/release", method = RequestMethod.PUT)
|
|
|
public String releaseOrder(@PathVariable String orderid, @RequestBody String reason) {
|
|
|
- logger.log("买家订单管理", "取消订单", "根据订单号: " + orderid + "取消订单,释放库存");
|
|
|
+ logger.info("买家订单管理", "取消订单", "根据订单号: " + orderid + "取消订单,释放库存");
|
|
|
return orderService.releaseOrder(orderid, reason);
|
|
|
}
|
|
|
|
|
|
@@ -588,7 +577,7 @@ public class OrderController {
|
|
|
*/
|
|
|
@RequestMapping(value = "simpleinfo/ones/{orderid}/release/audit", method = RequestMethod.PUT)
|
|
|
public String aduitReleaseOrder(@PathVariable String orderid) {
|
|
|
- logger.log("买家订单管理", "同意取消订单申请", "根据订单号: " + orderid + "取消订单,释放库存");
|
|
|
+ logger.info("买家订单管理", "同意取消订单申请", "根据订单号: " + orderid + "取消订单,释放库存");
|
|
|
return orderService.aduitReleaseOrder(orderid);
|
|
|
}
|
|
|
|
|
|
@@ -599,7 +588,7 @@ public class OrderController {
|
|
|
*/
|
|
|
@RequestMapping(value = "simpleinfo/ones/{orderid}/release/unaudit", method = RequestMethod.PUT)
|
|
|
public String unaduitReleaseOrder(@PathVariable String orderid) {
|
|
|
- logger.log("买家订单管理", "不同意取消订单申请");
|
|
|
+ logger.info("买家订单管理", "不同意取消订单申请");
|
|
|
return orderService.unaduitReleaseOrder(orderid);
|
|
|
}
|
|
|
|
|
|
@@ -613,7 +602,7 @@ public class OrderController {
|
|
|
public String setUnavailable(@PathVariable String orderid) {
|
|
|
orderid = StringUtilB2C.decodeValue(orderid);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "失效订单", "根据订单号: " + orderid + "将订单设为失效");
|
|
|
+ logger.info("买家订单管理", "失效订单", "根据订单号: " + orderid + "将订单设为失效");
|
|
|
return orderService.setUnavailable(orderid);
|
|
|
}
|
|
|
|
|
|
@@ -626,7 +615,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/admin/findUserVender/{orderid}", method = RequestMethod.GET)
|
|
|
public ModelMap findUserVenderByCode(@PathVariable String orderid) {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取订单关联企业用户信息", "根据订单号: " + orderid + "获取订单关联企业用户信息");
|
|
|
+ logger.info("买家订单管理", "获取订单关联企业用户信息", "根据订单号: " + orderid + "获取订单关联企业用户信息");
|
|
|
return orderService.findUserVenderByCode(orderid);
|
|
|
}
|
|
|
|
|
|
@@ -640,7 +629,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/personal/count", method = RequestMethod.GET)
|
|
|
public ModelMap getCountByUseruuAndStatus(String status) {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取买家订单信息", "根据状态: " + status + "获取买家订单信息");
|
|
|
+ logger.info("买家订单管理", "获取买家订单信息", "根据状态: " + status + "获取买家订单信息");
|
|
|
return orderService.getCountByUseruuAndStatus(SystemSession.getUser().getUserUU(), status);
|
|
|
}
|
|
|
|
|
|
@@ -653,7 +642,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/personal/counts", method = RequestMethod.GET)
|
|
|
public ModelMap getCountByAllStatus() {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "获取各状态买家订单总数");
|
|
|
+ logger.info("买家订单管理", "获取各状态买家订单总数");
|
|
|
return orderService.getCountByAllStatus(SystemSession.getUser().getUserUU());
|
|
|
}
|
|
|
|
|
|
@@ -668,7 +657,7 @@ public class OrderController {
|
|
|
public ModelMap applyCharge(@RequestBody String json, @PathVariable Long detailid) {
|
|
|
TradeCharge charge = FastjsonUtils.fromJson(json, TradeCharge.class);
|
|
|
assert logger != null;
|
|
|
- logger.log("客户议价单管理", "申请议价单", "申请客户议价单: " + charge.getId());
|
|
|
+ logger.info("客户议价单管理", "申请议价单", "申请客户议价单: " + charge.getId());
|
|
|
return orderService.applyCharge(charge, detailid);
|
|
|
}
|
|
|
|
|
|
@@ -681,7 +670,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/getreply/{detailid}", method = RequestMethod.GET)
|
|
|
public List<TradeCharge> getreply(@PathVariable Long detailid) {
|
|
|
assert logger != null;
|
|
|
- logger.log("客户议价单管理", "获取议价单信息", "获取客户议价单信息: " + detailid);
|
|
|
+ logger.info("客户议价单管理", "获取议价单信息", "获取客户议价单信息: " + detailid);
|
|
|
return orderService.findReplyByOrderDetail(detailid);
|
|
|
}
|
|
|
|
|
|
@@ -704,7 +693,7 @@ public class OrderController {
|
|
|
}
|
|
|
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家获取买家订单信息", "获取待开发票的订单");
|
|
|
+ logger.info("买家订单管理", "买家获取买家订单信息", "获取待开发票的订单");
|
|
|
return orderService.getBillByStatus(pageInfo, keyword, status);
|
|
|
}
|
|
|
|
|
|
@@ -720,7 +709,7 @@ public class OrderController {
|
|
|
public Page<Order> getBillByStatus(PageParams params, String keyword, int status) {
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "平台获取买家订单信息", "获取待开发票的订单");
|
|
|
+ logger.info("买家订单管理", "平台获取买家订单信息", "获取待开发票的订单");
|
|
|
return orderService.getBillByStatus(pageInfo, keyword, status);
|
|
|
}
|
|
|
|
|
|
@@ -739,7 +728,7 @@ public class OrderController {
|
|
|
map.put(key, arr);
|
|
|
}
|
|
|
assert logger != null;
|
|
|
- logger.log("发票管理", "确认开票", "确认开票,发票号: " + billNum);
|
|
|
+ logger.info("发票管理", "确认开票", "确认开票,发票号: " + billNum);
|
|
|
orderService.makeOutBill(map, billNum);
|
|
|
}
|
|
|
|
|
|
@@ -752,7 +741,7 @@ public class OrderController {
|
|
|
public void confirmBill(@RequestBody String str) {
|
|
|
JSONObject jsonObject = FastjsonUtils.parseObject(str);
|
|
|
assert logger != null;
|
|
|
- logger.log("发票管理", "确认收票", "确认收票,发票号: " + str);
|
|
|
+ logger.info("发票管理", "确认收票", "确认收票,发票号: " + str);
|
|
|
orderService.confirmBill(jsonObject);
|
|
|
}
|
|
|
|
|
|
@@ -770,7 +759,7 @@ public class OrderController {
|
|
|
String[] idArray = ids.split(SplitChar.HYPHEN);
|
|
|
orderDetailService.comfirmCancle(idArray);
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家确认取消订单明细(供应商缺货)", "取消订单明细: " + ids);
|
|
|
+ logger.info("买家订单管理", "买家确认取消订单明细(供应商缺货)", "取消订单明细: " + ids);
|
|
|
return "success";
|
|
|
}
|
|
|
|
|
|
@@ -783,7 +772,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/{ids}", method = RequestMethod.DELETE, params = "_status=unavailable")
|
|
|
public String deleteOrder(@PathVariable("ids") String ids) {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家订单管理", "买家删除订单", "删除订单明细: " + ids);
|
|
|
+ logger.info("买家订单管理", "买家删除订单", "删除订单明细: " + ids);
|
|
|
return orderService.deleteOrder(ids);
|
|
|
}
|
|
|
|
|
|
@@ -803,7 +792,7 @@ public class OrderController {
|
|
|
String exceptionType, String originalState) {
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
assert logger != null;
|
|
|
- logger.log("后台管理-买家销售单跟踪", "根据参数分页获取订单列表信息,状态码=" + status);
|
|
|
+ logger.info("后台管理-买家销售单跟踪", "根据参数分页获取订单列表信息,状态码=" + status);
|
|
|
return orderService.findOrderByPageAndParams(pageInfo, keyword, status, fromDateMils, exceptionType, originalState);
|
|
|
}
|
|
|
|
|
|
@@ -819,7 +808,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/draw/bill/{id}", method = RequestMethod.POST, params="role=admin")
|
|
|
public void drawBill(@RequestBody String json, @PathVariable("id") String id) {
|
|
|
assert logger != null;
|
|
|
- logger.log("对订单开发票", "开发票的 订单号是 : " + id);
|
|
|
+ logger.info("对订单开发票", "开发票的 订单号是 : " + id);
|
|
|
orderService.drawBill(json, id);
|
|
|
}
|
|
|
|
|
|
@@ -835,7 +824,7 @@ public class OrderController {
|
|
|
@RequestMapping(value = "/{orderId}/details/isNotReturn", method = RequestMethod.GET)
|
|
|
public Map<String, Boolean> queryOrderDetailsNotReturn(@PathVariable("orderId") String orderId) {
|
|
|
assert logger != null;
|
|
|
- logger.log("买家异常处理", "查询明细[" + orderId + "]的所有明细的退款状态");
|
|
|
+ logger.info("买家异常处理", "查询明细[" + orderId + "]的所有明细的退款状态");
|
|
|
return orderService.queryOrderDetailsNotReturn(orderId);
|
|
|
}
|
|
|
|
|
|
@@ -896,7 +885,7 @@ public class OrderController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/{orderId}/payment/failure", method = RequestMethod.PUT)
|
|
|
public ResultMap auditPaymentFailure(@PathVariable("orderId") String orderId, @RequestBody String reason) {
|
|
|
- logger.log("买家订单管理", "管理平台审核不通过");
|
|
|
+ logger.info("买家订单管理", "管理平台审核不通过");
|
|
|
return orderService.auditPaymentFailure(orderId, reason);
|
|
|
}
|
|
|
|