|
@@ -22,8 +22,7 @@ import java.time.ZoneId;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
|
|
|
-import static com.awspaas.user.apps.donenow_ctt.service.contractService.GetEntryCost;
|
|
|
|
|
-import static com.awspaas.user.apps.donenow_ctt.service.contractService.getLocalDate;
|
|
|
|
|
|
|
+import static com.awspaas.user.apps.donenow_ctt.service.contractService.*;
|
|
|
|
|
|
|
|
@Controller
|
|
@Controller
|
|
|
public class contractApproveController {
|
|
public class contractApproveController {
|
|
@@ -1417,9 +1416,9 @@ public class contractApproveController {
|
|
|
|
|
|
|
|
@Mapping(value = "com.awspaas.user.apps.donenow_ctt.checkCommissionPeriodExists2")
|
|
@Mapping(value = "com.awspaas.user.apps.donenow_ctt.checkCommissionPeriodExists2")
|
|
|
public ResponseObject checkCommissionPeriodExists2(UserContext uc,
|
|
public ResponseObject checkCommissionPeriodExists2(UserContext uc,
|
|
|
- String bindid,
|
|
|
|
|
- String startDate,
|
|
|
|
|
- String endDate) {
|
|
|
|
|
|
|
+ String bindid,
|
|
|
|
|
+ String startDate,
|
|
|
|
|
+ String endDate) {
|
|
|
try {
|
|
try {
|
|
|
String checkSql = "SELECT COUNT(1) FROM BO_EU_DNCTT_COMMISSION_PERIOD " +
|
|
String checkSql = "SELECT COUNT(1) FROM BO_EU_DNCTT_COMMISSION_PERIOD " +
|
|
|
"WHERE BINDID = ? " +
|
|
"WHERE BINDID = ? " +
|
|
@@ -1583,6 +1582,24 @@ public class contractApproveController {
|
|
|
if (StringUtils.isNotBlank(APPROVE_AND_POST_DATE))
|
|
if (StringUtils.isNotBlank(APPROVE_AND_POST_DATE))
|
|
|
return ResponseObject.newErrResponse("已审批不允许修改");
|
|
return ResponseObject.newErrResponse("已审批不允许修改");
|
|
|
|
|
|
|
|
|
|
+ BigDecimal rate = divideToBigDecimal(periodPrice, period.get("PERIOD_ADJUSTED_PRICE"));
|
|
|
|
|
+
|
|
|
|
|
+ String COMMISSION_BINDID = period.getString("BINDID");
|
|
|
|
|
+
|
|
|
|
|
+ String PERIOD_BEGIN_DATE = period.getDate("PERIOD_BEGIN_DATE").toInstant().atZone(ZoneId.systemDefault()).toLocalDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
|
|
|
+
|
|
|
|
|
+ List<BO> commissionSalesBOs = SDK.getBOAPI().query("BO_EU_DNCTT_COMMISSION_PERIOD_SALES").addQuery("BINDID =", COMMISSION_BINDID).addQuery("PERIOD_BEGIN_DATE=?", PERIOD_BEGIN_DATE).list();
|
|
|
|
|
+ for (BO commissionSalesBO : commissionSalesBOs) {
|
|
|
|
|
+ commissionSalesBO.set("PERIOD_ADJUSTED_PRICE", multiply(commissionSalesBO.get("PERIOD_ADJUSTED_PRICE"), rate));
|
|
|
|
|
+ SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD_SALES", commissionSalesBO);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ List<BO> commissionAGENTBOs = SDK.getBOAPI().query("BO_EU_DNCTT_COMMISSION_PERIOD_AGENT").addQuery("BINDID =", COMMISSION_BINDID).addQuery("PERIOD_BEGIN_DATE=?", PERIOD_BEGIN_DATE).list();
|
|
|
|
|
+ for (BO commissionAGENTBO : commissionAGENTBOs) {
|
|
|
|
|
+ commissionAGENTBO.set("PERIOD_ADJUSTED_PRICE", multiply(commissionAGENTBO.get("PERIOD_ADJUSTED_PRICE"), rate));
|
|
|
|
|
+ SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD_AGENT", commissionAGENTBO);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
DBSql.update("update BO_EU_DNCTT_COMMISSION_PERIOD set PERIOD_ADJUSTED_PRICE=? where ID=?", new Object[]{periodPrice, id});
|
|
DBSql.update("update BO_EU_DNCTT_COMMISSION_PERIOD set PERIOD_ADJUSTED_PRICE=? where ID=?", new Object[]{periodPrice, id});
|
|
|
|
|
|
|
|
return ResponseObject.newOkResponse();
|
|
return ResponseObject.newOkResponse();
|