|
@@ -19,13 +19,12 @@ import com.ydtech.modules.order.entity.InsAreaCompany;
|
|
|
import com.ydtech.modules.order.entity.InsOrders;
|
|
import com.ydtech.modules.order.entity.InsOrders;
|
|
|
import com.ydtech.modules.order.entity.vo.*;
|
|
import com.ydtech.modules.order.entity.vo.*;
|
|
|
import com.ydtech.modules.order.service.InsOrdersService;
|
|
import com.ydtech.modules.order.service.InsOrdersService;
|
|
|
-import com.ydtech.modules.protocol.service.*;
|
|
|
|
|
import com.ydtech.modules.protocols.entity.po.*;
|
|
import com.ydtech.modules.protocols.entity.po.*;
|
|
|
import com.ydtech.modules.protocols.entity.vo.AgreementProductCosts;
|
|
import com.ydtech.modules.protocols.entity.vo.AgreementProductCosts;
|
|
|
import com.ydtech.modules.protocols.service.*;
|
|
import com.ydtech.modules.protocols.service.*;
|
|
|
-import com.ydtech.utils.StringUtils;
|
|
|
|
|
import com.ydtech.utils.idgen.IdGenerate;
|
|
import com.ydtech.utils.idgen.IdGenerate;
|
|
|
-import org.apache.commons.lang3.ObjectUtils;
|
|
|
|
|
|
|
+import org.slf4j.Logger;
|
|
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
@@ -89,6 +88,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private static final Logger log = LoggerFactory.getLogger("FeeRules");
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 校验费用因子
|
|
* 校验费用因子
|
|
|
*/
|
|
*/
|
|
@@ -112,7 +113,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
|
|
|
String costsId = verificationCosts(agreementProductCosts, insAreaCompany, insOrders);
|
|
String costsId = verificationCosts(agreementProductCosts, insAreaCompany, insOrders);
|
|
|
if(costsId != null) {
|
|
if(costsId != null) {
|
|
|
calcCosts(costsId, insAreaCompany);
|
|
calcCosts(costsId, insAreaCompany);
|
|
|
- System.out.printf("费用因子校验通过,子订单id:" + insAreaCompany.getId() + ",费用id:" + costsId + "\n");
|
|
|
|
|
|
|
+ log.debug("费用因子校验通过,子订单id:" + insAreaCompany.getId() + ",费用id:" + costsId);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -524,9 +525,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
|
|
|
|
|
|
|
|
//如果查找不到 传值属性 直接费用对比失败
|
|
//如果查找不到 传值属性 直接费用对比失败
|
|
|
if(ruleAttrMappingVo == null){
|
|
if(ruleAttrMappingVo == null){
|
|
|
- System.out.printf("规则匹配失败:" + ptlAgreementProductCostsAttrLinks.get(i).getAttrCode());
|
|
|
|
|
- System.out.printf("传入的值找不到该属性:" + ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode());
|
|
|
|
|
- System.out.printf("\n\n");
|
|
|
|
|
|
|
+ log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLinks.get(i).getAttrCode());
|
|
|
|
|
+ log.debug("传入的值找不到该属性:" + ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode());
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -537,10 +537,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
|
|
|
|
|
|
|
|
useFlag = attrEqual(ptlAgreementProductCostsAttrLinks.get(i), ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
|
|
useFlag = attrEqual(ptlAgreementProductCostsAttrLinks.get(i), ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
|
|
|
if(!useFlag){
|
|
if(!useFlag){
|
|
|
- System.out.printf("规则匹配失败:" + ptlAgreementProductCostsAttrLinks.get(i).getAttrCode());
|
|
|
|
|
- System.out.printf("检验的值:" + ptlAgreementProductCostsAttrLinks.get(i).getMin());
|
|
|
|
|
- System.out.printf("传入的值:" + ruleAttrMappingVo.getValue());
|
|
|
|
|
- System.out.printf("\n\n");
|
|
|
|
|
|
|
+ log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLinks.get(i).getAttrCode());
|
|
|
|
|
+ log.debug("检验的值:" + ptlAgreementProductCostsAttrLinks.get(i).getMin());
|
|
|
|
|
+ log.debug("传入的值:" + ruleAttrMappingVo.getValue());
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|