|
@@ -522,7 +522,18 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
ProfitReportBytedanceVo vo = new ProfitReportBytedanceVo();
|
|
|
//使用政策 返点类型和比例
|
|
|
Map<String,Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("productName")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
|
- vo.setRebateType(policyRateMap.getOrDefault("rebateType","")+"");//返点类型
|
|
|
+ // vo.setRebateType(policyRateMap.getOrDefault("rebateType","")+"");//返点类型
|
|
|
+
|
|
|
+ if(policyRateMap.getOrDefault("rebateType","").equals("0")){
|
|
|
+ vo.setRebateType("返现");//返点类型
|
|
|
+ }else if (policyRateMap.getOrDefault("rebateType","").equals("1")){
|
|
|
+ vo.setRebateType("返货");
|
|
|
+ }else if (policyRateMap.getOrDefault("rebateType","").equals("2")){
|
|
|
+ vo.setRebateType("返现+返货");
|
|
|
+ }else {
|
|
|
+ vo.setRebateType("");
|
|
|
+ }
|
|
|
+
|
|
|
vo.setRebateRate(policyRateMap.getOrDefault("rebateRate","")+"");//返点比列
|
|
|
// 时间段内 账户流水 信息
|
|
|
List<Map<String,Object>> listAccount = reportSettlementMapper.getProfitBytedanceCost(map.get("accountId")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
@@ -658,7 +669,20 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
ProfitReportKuaiShouVo vo = new ProfitReportKuaiShouVo();
|
|
|
//使用政策 返点类型和比例
|
|
|
Map<String,Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("productName")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
|
- vo.setRebateType(policyRateMap.getOrDefault("rebateType","")+"");//返点类型
|
|
|
+ if(policyRateMap.getOrDefault("rebateType","").equals("0")){
|
|
|
+ vo.setRebateType("返现");//返点类型
|
|
|
+ }else if (policyRateMap.getOrDefault("rebateType","").equals("1")){
|
|
|
+ vo.setRebateType("返货");
|
|
|
+ }else if (policyRateMap.getOrDefault("rebateType","").equals("2")){
|
|
|
+ vo.setRebateType("返现+返货");
|
|
|
+ }else {
|
|
|
+ vo.setRebateType("");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
vo.setRebateRate(policyRateMap.getOrDefault("rebateRate","")+"");//返点比列
|
|
|
// 时间段内 账户流水 信息
|
|
|
List<Map<String,Object>> listAccount = reportSettlementMapper.getProfitKuaiShouCost(map.get("accountId")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
@@ -726,7 +750,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Result sendMessageToOperate() {
|
|
|
- int month = Calendar.getInstance().get(Calendar.MONTH) + 1;
|
|
|
+ //上个月份
|
|
|
+ int month = Calendar.getInstance().get(Calendar.MONTH);
|
|
|
int productNum = 0;
|
|
|
int accountNum = 0;
|
|
|
String productInfo = null;
|
|
@@ -757,7 +782,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
|
|
|
@Override
|
|
|
public Result sendMessageToOperateDemo(String userId) {
|
|
|
- int month = Calendar.getInstance().get(Calendar.MONTH) + 1;
|
|
|
+ //上个月份
|
|
|
+ int month = Calendar.getInstance().get(Calendar.MONTH);
|
|
|
int productNum = 0;
|
|
|
int accountNum = 0;
|
|
|
String productInfo = null;
|