1
This commit is contained in:
@@ -30,7 +30,10 @@ import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.jarvis.domain.JDOrder;
|
||||
import com.ruoyi.jarvis.domain.dto.JDOrderSimpleDTO;
|
||||
import com.ruoyi.jarvis.domain.dto.QuickRecordModelOption;
|
||||
import com.ruoyi.jarvis.domain.dto.QuickRecordModelShopOption;
|
||||
import com.ruoyi.jarvis.util.QuickRecordModelShopOptionUtil;
|
||||
import com.ruoyi.jarvis.service.IJDOrderProfitService;
|
||||
import com.ruoyi.system.service.ISysConfigService;
|
||||
import com.ruoyi.jarvis.service.IJDOrderService;
|
||||
import com.ruoyi.jarvis.service.IInstructionService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
@@ -54,13 +57,15 @@ public class JDOrderListController extends BaseController
|
||||
private final IGroupRebateExcelUploadService groupRebateExcelUploadService;
|
||||
|
||||
private final ObjectMapper objectMapper;
|
||||
private final ISysConfigService sysConfigService;
|
||||
|
||||
public JDOrderListController(IJDOrderService jdOrderService, IJDOrderProfitService jdOrderProfitService,
|
||||
IOrderRowsService orderRowsService,
|
||||
IInstructionService instructionService,
|
||||
GroupRebateExcelImportService groupRebateExcelImportService,
|
||||
IGroupRebateExcelUploadService groupRebateExcelUploadService,
|
||||
ObjectMapper objectMapper) {
|
||||
ObjectMapper objectMapper,
|
||||
ISysConfigService sysConfigService) {
|
||||
this.jdOrderService = jdOrderService;
|
||||
this.jdOrderProfitService = jdOrderProfitService;
|
||||
this.orderRowsService = orderRowsService;
|
||||
@@ -68,6 +73,7 @@ public class JDOrderListController extends BaseController
|
||||
this.groupRebateExcelImportService = groupRebateExcelImportService;
|
||||
this.groupRebateExcelUploadService = groupRebateExcelUploadService;
|
||||
this.objectMapper = objectMapper;
|
||||
this.sysConfigService = sysConfigService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -180,6 +186,16 @@ public class JDOrderListController extends BaseController
|
||||
return AjaxResult.success(options);
|
||||
}
|
||||
|
||||
/**
|
||||
* 快捷录单页:型号后缀店铺下拉(系统参数 quickRecord.modelShopOptions,每行格式:短前缀(完整店名))
|
||||
*/
|
||||
@GetMapping("/quickRecord/shopOptions")
|
||||
public AjaxResult quickRecordShopOptions() {
|
||||
String raw = sysConfigService.selectConfigByKey(QuickRecordModelShopOptionUtil.CONFIG_KEY);
|
||||
List<QuickRecordModelShopOption> options = QuickRecordModelShopOptionUtil.parseOptions(raw);
|
||||
return AjaxResult.success(options);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入跟团返现类 Excel:按「单号/订单号」匹配系统订单,将「是否返现」「总共返现」等写入后返备注(可多次导入累加);文件落盘并记上传记录。
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user