|
@@ -1,7 +1,11 @@
|
|
|
package com.ruixuan.isc.controller;
|
|
|
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -43,9 +47,52 @@ public class KuaishouRewardBaseInfoController extends BaseController {
|
|
|
* 查询【请填写功能名称】列表
|
|
|
*/
|
|
|
@GetMapping("/list")
|
|
|
- public TableDataInfo list(KuaishouRewardBaseInfo kuaishouRewardBaseInfo) {
|
|
|
+ public TableDataInfo list(Long itemId, String promoterId, String startDate, String endDate, String itemTitle, String promoterName) {
|
|
|
+
|
|
|
+ Map<String, Object> requestMap = new HashMap<>();
|
|
|
+ if (!Check.isNull(itemId)) {
|
|
|
+ requestMap.put("itemId", itemId);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(promoterId)) {
|
|
|
+ requestMap.put("promoterId", promoterId);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(startDate)) {
|
|
|
+ requestMap.put("startDate", startDate);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(endDate)) {
|
|
|
+ requestMap.put("endDate", endDate);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(itemTitle)) {
|
|
|
+ requestMap.put("itemTitle", itemTitle);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(promoterName)) {
|
|
|
+ requestMap.put("promoterName", promoterName);
|
|
|
+ }
|
|
|
startPage();
|
|
|
- List<KuaishouRewardBaseInfo> list = kuaishouRewardBaseInfoService.selectKuaishouRewardBaseInfoList(kuaishouRewardBaseInfo);
|
|
|
+ List<KuaishouRewardBaseInfo> list = kuaishouRewardBaseInfoService.selectKuaishouRewardBaseInfoList(requestMap);
|
|
|
+ return getDataTable(list);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping("/totalListInfo")
|
|
|
+ public TableDataInfo totalListInfo(Long itemId, String promoterId, String itemTitle, String promoterName) {
|
|
|
+
|
|
|
+ Map<String, Object> requestMap = new HashMap<>();
|
|
|
+ if (!Check.isNull(itemId)) {
|
|
|
+ requestMap.put("itemId", itemId);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(promoterId)) {
|
|
|
+ requestMap.put("promoterId", promoterId);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!Check.isNull(itemTitle)) {
|
|
|
+ requestMap.put("itemTitle", itemTitle);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(promoterName)) {
|
|
|
+ requestMap.put("promoterName", promoterName);
|
|
|
+ }
|
|
|
+ startPage();
|
|
|
+ List<KuaishouRewardBaseInfo> list = kuaishouRewardBaseInfoService.totalListInfo(requestMap);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
@@ -60,13 +107,13 @@ public class KuaishouRewardBaseInfoController extends BaseController {
|
|
|
/**
|
|
|
* 导出【请填写功能名称】列表
|
|
|
*/
|
|
|
- @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
|
|
|
+/* @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
|
|
|
@PostMapping("/export")
|
|
|
public void export(HttpServletResponse response, KuaishouRewardBaseInfo kuaishouRewardBaseInfo) {
|
|
|
List<KuaishouRewardBaseInfo> list = kuaishouRewardBaseInfoService.selectKuaishouRewardBaseInfoList(kuaishouRewardBaseInfo);
|
|
|
ExcelUtil<KuaishouRewardBaseInfo> util = new ExcelUtil<KuaishouRewardBaseInfo>(KuaishouRewardBaseInfo.class);
|
|
|
util.exportExcel(response, list, "【请填写功能名称】数据");
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
/**
|
|
|
* 获取【请填写功能名称】详细信息
|
|
@@ -76,6 +123,63 @@ public class KuaishouRewardBaseInfoController extends BaseController {
|
|
|
return AjaxResult.success(kuaishouRewardBaseInfoService.selectKuaishouRewardBaseInfoById(id));
|
|
|
}
|
|
|
|
|
|
+ @GetMapping(value = "/getItemName")
|
|
|
+ public String getItemName(Long itemId) {
|
|
|
+ if (Check.isNull(itemId)) {
|
|
|
+ return null;
|
|
|
+
|
|
|
+ }
|
|
|
+ return kuaishouRewardBaseInfoService.getItemName(itemId);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping(value = "/getPromoterName")
|
|
|
+ public String getPromoterName(String promoterId) {
|
|
|
+ if (Check.isNull(promoterId)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ return kuaishouRewardBaseInfoService.getPromoterName(promoterId);
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping(value = "/getTotalSettlementNum")
|
|
|
+ public Long getTotalSettlementNum(String promoterId, Long itemId, Long currentSettlementNum) {
|
|
|
+ if (Check.isNull(promoterId)) {
|
|
|
+ return 0L;
|
|
|
+ }
|
|
|
+ if (Check.isNull(itemId)) {
|
|
|
+ return 0L;
|
|
|
+ }
|
|
|
+ if (Check.isNull(currentSettlementNum)) {
|
|
|
+ return 0L;
|
|
|
+ }
|
|
|
+ Long lastTotalSettlementNum = kuaishouRewardBaseInfoService.getTotalSettlementNum(promoterId, itemId);
|
|
|
+ BigDecimal totalSettlementNum = new BigDecimal(currentSettlementNum).add(new BigDecimal(lastTotalSettlementNum));
|
|
|
+ return totalSettlementNum.longValue();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping(value = "/getTotalAmount")
|
|
|
+ public BigDecimal getTotalAmount(String promoterId, Long itemId, BigDecimal anchorAmount, BigDecimal referenceAmount) {
|
|
|
+ if (Check.isNull(promoterId)) {
|
|
|
+ return BigDecimal.ZERO;
|
|
|
+ }
|
|
|
+ if (Check.isNull(itemId)) {
|
|
|
+ return BigDecimal.ZERO;
|
|
|
+ }
|
|
|
+
|
|
|
+ BigDecimal lastTotalAmount = kuaishouRewardBaseInfoService.getTotalAmount(promoterId, itemId);
|
|
|
+ if (!Check.isNull(anchorAmount) && anchorAmount.compareTo(BigDecimal.ZERO) != 0) {
|
|
|
+ lastTotalAmount = lastTotalAmount.add(anchorAmount);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(referenceAmount) && anchorAmount.compareTo(referenceAmount.ZERO) != 0) {
|
|
|
+ lastTotalAmount = lastTotalAmount.add(referenceAmount);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ return lastTotalAmount;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 新增【请填写功能名称】
|
|
|
*/
|
|
@@ -112,6 +216,7 @@ public class KuaishouRewardBaseInfoController extends BaseController {
|
|
|
kuaishouRewardBaseInfo.setPromoterName(promoterName);
|
|
|
}
|
|
|
}
|
|
|
+ kuaishouRewardBaseInfo.setPromoterType(1);
|
|
|
return toAjax(kuaishouRewardBaseInfoService.insertKuaishouRewardBaseInfo(kuaishouRewardBaseInfo));
|
|
|
} catch (Exception e) {
|
|
|
result.put("code", 500);
|