|
@@ -62,6 +62,11 @@ public class SupplyChainController extends BaseController {
|
|
|
@Value("${accept.mgsPrivateKey2}")
|
|
|
private String mgsPrivateKey2;
|
|
|
|
|
|
+
|
|
|
+ @Value("${ownership.id}")
|
|
|
+ private String ownershipId;
|
|
|
+
|
|
|
+
|
|
|
@GetMapping("/privateKey")
|
|
|
@ApiOperation(value = "达人订单")
|
|
|
public String privateKey() {
|
|
@@ -332,6 +337,7 @@ public class SupplyChainController extends BaseController {
|
|
|
export.add(date.getString("userName"));
|
|
|
export.add(date.getLong("itemId"));
|
|
|
export.add(date.getString("itemTitle"));
|
|
|
+ export.add(date.getString("isPresale"));
|
|
|
export.add(date.getString("imageUrl"));
|
|
|
export.add(date.getString("itemCommissionRate"));
|
|
|
export.add(date.getInteger("orderNum"));
|
|
@@ -349,7 +355,7 @@ public class SupplyChainController extends BaseController {
|
|
|
exportList.add(export);
|
|
|
}
|
|
|
}
|
|
|
- String[] headers = {"所属人", "商品ID", "商品名称", "商品封面", "佣金率", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数", "ccr", "小店星级", "店铺物流分", "店铺评分", "店铺服务分", "店铺质量分"};
|
|
|
+ String[] headers = {"所属人", "商品ID", "商品名称", "是否预售", "商品封面", "佣金率", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数", "ccr", "小店星级", "店铺物流分", "店铺评分", "店铺服务分", "店铺质量分"};
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -910,6 +916,7 @@ public class SupplyChainController extends BaseController {
|
|
|
@RequestMapping(value = "/exportPromoterTotal")
|
|
|
@ResponseBody
|
|
|
public void exportPromoterTotal(HttpServletRequest request, HttpServletResponse response, @RequestBody JSONObject requestJson) throws Exception {
|
|
|
+
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
|
Long start = DateUtils.getStartLongTime(requestJson.getString("orderStartDate"));
|
|
@@ -937,10 +944,19 @@ public class SupplyChainController extends BaseController {
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
JSONObject date = list.get(i);
|
|
|
List<Object> export = new ArrayList();
|
|
|
- Long promoterId = date.getLong("promoterId");
|
|
|
- String promoterNickName = date.getString("promoterNickName");
|
|
|
- String name = promoterNickName + "(" + promoterId + ")";
|
|
|
- export.add(name);
|
|
|
+
|
|
|
+ if (ownershipId.equals("miaogousi")) {
|
|
|
+ Long promoterId = date.getLong("promoterId");
|
|
|
+ export.add(promoterId);
|
|
|
+ String promoterNickName = date.getString("promoterNickName");
|
|
|
+ export.add(promoterNickName);
|
|
|
+ } else {
|
|
|
+ Long promoterId = date.getLong("promoterId");
|
|
|
+ String promoterNickName = date.getString("promoterNickName");
|
|
|
+ String name = promoterNickName + "(" + promoterId + ")";
|
|
|
+ export.add(name);
|
|
|
+ }
|
|
|
+
|
|
|
export.add(date.getInteger("orderNum"));
|
|
|
export.add(date.getInteger("validOrderNUm"));
|
|
|
export.add(date.getString("validRadio"));
|
|
@@ -999,7 +1015,12 @@ public class SupplyChainController extends BaseController {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- String[] headers = {"达人名称", "订单数", "有效订单数", "有效订单率", "GVM", "有效GMV", "发货数", "发货率", "未发货数", "绑定人"};
|
|
|
+ String[] headers = {};
|
|
|
+ if (!ownershipId.equals("miaogousi")) {
|
|
|
+ headers = new String[]{"达人名称", "订单数", "有效订单数", "有效订单率", "GVM", "有效GMV", "发货数", "发货率", "未发货数", "绑定人"};
|
|
|
+ } else {
|
|
|
+ headers = new String[]{"达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "GVM", "有效GMV", "发货数", "发货率", "未发货数", "绑定人"};
|
|
|
+ }
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -1043,8 +1064,14 @@ public class SupplyChainController extends BaseController {
|
|
|
List<Object> export = new ArrayList();
|
|
|
String promoterNickName = date.getString("promoterNickName");
|
|
|
Long promoterId = date.getLong("promoterId");
|
|
|
- String promoter = promoterNickName + "(" + promoterId + ")";
|
|
|
- export.add(promoter);
|
|
|
+ if ("miaogousi".equals(ownershipId)) {
|
|
|
+ export.add(promoterId);
|
|
|
+ export.add(promoterNickName);
|
|
|
+ } else {
|
|
|
+ String promoter = promoterNickName + "(" + promoterId + ")";
|
|
|
+ export.add(promoter);
|
|
|
+ }
|
|
|
+
|
|
|
Long itemId = date.getLong("itemId");
|
|
|
String itemTitle = date.getString("itemTitle");
|
|
|
String item = itemTitle + "(" + itemId + ")";
|
|
@@ -1059,7 +1086,13 @@ public class SupplyChainController extends BaseController {
|
|
|
exportList.add(export);
|
|
|
}
|
|
|
}
|
|
|
- String[] headers = {"达人", "商品", "商品封面", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "商品状态"};
|
|
|
+ String[] headers = {};
|
|
|
+ if (!"miaogousi".equals(ownershipId)) {
|
|
|
+ headers = new String[]{"达人", "商品", "商品封面", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "商品状态"};
|
|
|
+
|
|
|
+ } else {
|
|
|
+ headers = new String[]{"达人id", "达人名称", "商品", "商品封面", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "商品状态"};
|
|
|
+ }
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|