瀏覽代碼

结算单添加服务费

yangzian 4 年之前
父節點
當前提交
432e19aead

+ 6 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CreateSheetServiceImpl.java

@@ -158,6 +158,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
                             vo.setRebateType("返货");
                         }else if (Integer.valueOf(policyRateMap.get("rebateType").toString())== 2){
                             vo.setRebateType("返现+返货");
+                        }else if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 3){
+                            vo.setRebateType("服务费");
                         }
                         vo.setRebateRate(policyRateMap.getOrDefault("rebateRate","")+"%");//返点比列
                     }else {
@@ -335,6 +337,7 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
             SheetKuaiShouVo voSource = new SheetKuaiShouVo();
             voSource.setAccountId(map.get("accountId")+"");
             voSource.setKsId(map.get("ksId")+"");
+            voSource.setAccountName(map.get("accountName")+"");
 
             //政策所有时间点
             List<String> policyDaysList = new ArrayList<>();
@@ -372,6 +375,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
                             vo.setRebateType("返货");
                         } else if (Integer.valueOf(policyRateMap.get("rebateType").toString()) == 2) {
                             vo.setRebateType("返现+返货");
+                        }else if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 3){
+                            vo.setRebateType("服务费");
                         }
                         vo.setRebateRate(policyRateMap.getOrDefault("rebateRate", "") + "%");//返点比列
                     } else {
@@ -380,8 +385,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
 
                     // 时间段内 账户流水 信息
                     List<SheetKuaiShouVo>  listInfo = reportSettlementMapper.getTransactionDayKuaiShouSheet(map.get("accountId") + "", stringMap.get("startDate"), stringMap.get("endDate"));
+
                     listInfo.removeAll(Collections.singleton(null));
-                    vo.setAccountName(listInfo.get(0).getAccountName());
                     vo.setDailyCharge(listInfo.stream().filter(v -> !Check.isNull(v.getDailyCharge())).map(SheetKuaiShouVo::getDailyCharge).reduce(BigDecimal.ZERO, BigDecimal::add));
                     vo.setRealCharged(listInfo.stream().filter(v -> !Check.isNull(v.getRealCharged())).map(SheetKuaiShouVo::getRealCharged).reduce(BigDecimal.ZERO, BigDecimal::add));
                     vo.setContractRebateRealCharged(listInfo.stream().filter(v -> !Check.isNull(v.getContractRebateRealCharged())).map(SheetKuaiShouVo::getContractRebateRealCharged).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -415,7 +420,6 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
                 // 时间段内 账户流水 信息
                 List<SheetKuaiShouVo>  listInfo = reportSettlementMapper.getTransactionDayKuaiShouSheet(map.get("accountId") + "", stringMap.get("startDate"), stringMap.get("endDate"));
                 listInfo.removeAll(Collections.singleton(null));
-                vo.setAccountName(listInfo.get(0).getAccountName());
                 vo.setDailyCharge(listInfo.stream().filter(v -> !Check.isNull(v.getDailyCharge())).map(SheetKuaiShouVo::getDailyCharge).reduce(BigDecimal.ZERO, BigDecimal::add));
                 vo.setRealCharged(listInfo.stream().filter(v -> !Check.isNull(v.getRealCharged())).map(SheetKuaiShouVo::getRealCharged).reduce(BigDecimal.ZERO, BigDecimal::add));
                 vo.setContractRebateRealCharged(listInfo.stream().filter(v -> !Check.isNull(v.getContractRebateRealCharged())).map(SheetKuaiShouVo::getContractRebateRealCharged).reduce(BigDecimal.ZERO, BigDecimal::add));

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/ReportSettlementMapper.xml

@@ -539,6 +539,7 @@
     <select id="getProfitKuaiShouAccountCostSheet" resultType="java.util.LinkedHashMap">
         SELECT
         d.account_id as accountId,
+        (SELECT ua.auth_name from ctop_user_allocation ua where ua.account_id = d.account_id) as accountName,
         d.user_id AS ksId,
         round(SUM(d.total_charged_in_yuan),3) AS cost,
         round(SUM((d.real_charged_in_yuan + d.total_rebate_real_charged_in_yuan + d.credit_real_charged_in_yuan)),3) as cashCost,

+ 4 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -593,6 +593,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                                 vo.setRebateType("返货");
                             }else if (Integer.valueOf(policyRateMap.get("rebateType").toString())== 2){
                                 vo.setRebateType("返现+返货");
+                            }else if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 3){
+                                vo.setRebateType("服务费");
                             }
                             vo.setRebateRate(policyRateMap.getOrDefault("rebateRate","")+"%");//返点比列
                         }else {
@@ -735,6 +737,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                                 vo.setRebateType("返货");
                             } else if (Integer.valueOf(policyRateMap.get("rebateType").toString()) == 2) {
                                 vo.setRebateType("返现+返货");
+                            }else if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 3){
+                                vo.setRebateType("服务费");
                             }
                             vo.setRebateRate(policyRateMap.getOrDefault("rebateRate", "") + "%");//返点比列
                         } else {