合并后丢失的代码恢复

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/controller/contractApproveController.java

@@ -1295,4 +1295,105 @@ public class contractApproveController {
             return ResponseObject.newErrResponse("查询失败：" + e.getMessage());
         }
     }
+
+
+    /**
+     * 佣金审批
+     * @param uc
+     * @param approveDate
+     * @param approveIds
+     * @return
+     */
+    @Mapping(value = "com.awspaas.user.apps.donenow_ctt.approve_commission")
+    public ResponseObject approveCommission(UserContext uc, String approveDate, String approveIds) throws SQLException {
+        if (StringUtils.isBlank(approveDate) || StringUtils.isBlank(approveIds))
+            return ResponseObject.newErrResponse("参数错误");
+        contractService.getInstance().approveCommission(uc, approveDate, approveIds);
+        return ResponseObject.newOkResponse();
+    }
+
+
+    /**
+     * 佣金调整
+     * @param uc
+     * @return
+     */
+    @Mapping(value = "com.awspaas.user.apps.donenow_ctt.approve_updateCommissionPrice")
+    public ResponseObject updateCommissionPrice(UserContext uc, String id, String periodPrice) throws SQLException {
+
+        BO bo = SDK.getBOAPI().get("BO_EU_DNCTT_COMMISSION_PERIOD", id);//佣金
+
+        if(bo.get("APPROVE_AND_POST_DATE")!=null||StringUtils.isNotBlank(bo.getString("APPROVE_AND_POST_USER_ID")))
+            return ResponseObject.newErrResponse("该佣金已审批通过");
+
+        bo.set("PERIOD_ADJUSTED_PRICE", periodPrice);
+        SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD", bo);
+
+        return ResponseObject.newOkResponse();
+    }
+
+
+    /**
+     * 佣金调整，恢复初始价格
+     * @param uc
+     * @return
+     */
+    @Mapping(value = "com.awspaas.user.apps.donenow_ctt.approve_initCommissionPrice")
+    public ResponseObject initCommissionPrice(UserContext uc, String ids) {
+
+        for (String id : ids.split(","))
+        {
+            BO bo = SDK.getBOAPI().get("BO_EU_DNCTT_COMMISSION_PERIOD", id);//佣金
+
+            if(bo.get("APPROVE_AND_POST_DATE")!=null||StringUtils.isNotBlank(bo.getString("APPROVE_AND_POST_USER_ID")))
+                return ResponseObject.newErrResponse("该佣金已审批通过");
+
+            bo.set("PERIOD_ADJUSTED_PRICE", bo.get("COMMISSION_DOLLARS"));
+            SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD", bo);
+        }
+
+        return ResponseObject.newOkResponse();
+    }
+
+
+
+    /**
+     * 撤销佣金审批
+     * @param ids
+     * @return
+     */
+    @Mapping("com.awspaas.user.apps.donenow_ctt.revoke_commission")
+    public ResponseObject revokeCommission(UserContext uc, String ids) throws SQLException {
+        Connection connUpdate = null;
+        try {
+            connUpdate = DBSql.open();
+            connUpdate.setAutoCommit(false);
+            for (String id : ids.split(",")) {
+                BO bo = SDK.getBOAPI().get("BO_EU_DNCRM_ACCOUNT_DEDUCTION", id);
+                bo.set("CLOSED", 1);
+                dn.recordFormChanges.record(uc, bo, "撤销佣金审批");
+
+                SDK.getBOAPI().remove("BO_EU_DNCRM_ACCOUNT_DEDUCTION", bo.getId(), connUpdate);
+
+                BO oldEntry = SDK.getBOAPI().get("BO_EU_DNCTT_COMMISSION_PERIOD", bo.getString("OBJECT_ID"));
+                oldEntry.set("APPROVE_AND_POST_DATE", null);
+                oldEntry.set("APPROVE_AND_POST_USER_ID", null);
+                dn.recordFormChanges.record(uc, oldEntry, "撤销佣金审批");
+                SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD", oldEntry);
+
+            }
+            connUpdate.commit();
+        } catch (SQLException e) {
+            if (connUpdate != null && !connUpdate.isClosed())
+                try {
+                    connUpdate.rollback();
+                } catch (SQLException ex) {
+                    ex.printStackTrace();
+                }
+        } finally {
+            if (connUpdate != null && !connUpdate.isClosed())
+                DBSql.close(connUpdate);
+        }
+        return ResponseObject.newOkResponse();
+    }
 }