增加打款佣金时间字段

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyController.java

@@ -3,6 +3,7 @@ package com.jpsoft.picc.modules.business.controller;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.pagehelper.Page;
+import com.github.pagehelper.util.StringUtil;
 import com.jpsoft.picc.modules.base.entity.*;
 import com.jpsoft.picc.modules.base.service.*;
 import com.jpsoft.picc.modules.business.entity.*;
@@ -12,6 +13,7 @@ import com.jpsoft.picc.modules.common.constant.PolicyStatus;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.*;
+import com.jpsoft.picc.modules.sys.entity.DataDictionary;
 import com.jpsoft.picc.modules.sys.entity.User;
 import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
 import com.jpsoft.picc.modules.sys.service.UserRoleService;
@@ -1044,6 +1046,41 @@ public class InsurancePolicyController {
 
         Page<InsurancePolicy> page = insurancePolicyService.hisPageSearch(searchParams,pageIndex,pageSize,sortList);
 
+        for (InsurancePolicy insurancePolicy:page) {
+            if(insurancePolicy.getCommission()!=null) {
+                List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("佣金分成");
+
+                if (dataDictionaryList.size() > 0) {
+
+                    DataDictionary item = dataDictionaryList.get(0);
+
+                    BigDecimal value = new BigDecimal(item.getValue());
+                    BigDecimal bili = new BigDecimal("0.01");
+                    BigDecimal fencheng = value.multiply(bili);
+                    BigDecimal commission = insurancePolicy.getCommission();
+                    BigDecimal finalFee = commission.multiply(fencheng);
+
+                    insurancePolicy.setPromoterFee(finalFee);
+
+
+                }
+
+                if (dataDictionaryList.size() > 1) {
+                    DataDictionary item = dataDictionaryList.get(1);
+
+                    BigDecimal value = new BigDecimal(item.getValue());
+                    BigDecimal bili = new BigDecimal("0.01");
+                    BigDecimal fencheng = value.multiply(bili);
+                    BigDecimal commission = insurancePolicy.getCommission();
+                    BigDecimal finalFee = commission.multiply(fencheng);
+
+                    insurancePolicy.setAgentFee(finalFee);
+
+
+                }
+            }
+        }
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -111,6 +111,12 @@ public class InsurancePolicy {
     @ApiModelProperty(value = "佣金打款时间")
     private Date commissionTime;
 
+    @ApiModelProperty(value = "保险代理人佣金")
+    private BigDecimal agentFee;
+
+    @ApiModelProperty(value = "社会推广员佣金")
+    private BigDecimal promoterFee;
+
     /**
      * 状态翻译
      * @return