|
@@ -266,6 +266,45 @@ public class KuaishouRuleSettlementDataController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @PutMapping("/updateSettlement")
|
|
|
+ public AjaxResult updateSettlement(@RequestBody KuaishouRuleSettlementData kuaishouRuleSettlementData) {
|
|
|
+ KuaishouRuleSettlementData updateKuaishouRuleSettlementData = new KuaishouRuleSettlementData();
|
|
|
+ updateKuaishouRuleSettlementData.setId(kuaishouRuleSettlementData.getId());
|
|
|
+ if (!Check.isNull(kuaishouRuleSettlementData.getAnchorAmount())) {
|
|
|
+ updateKuaishouRuleSettlementData.setAnchorAmount(kuaishouRuleSettlementData.getAnchorAmount());
|
|
|
+ }
|
|
|
+ if (!Check.isNull(kuaishouRuleSettlementData.getReferenceAmount())) {
|
|
|
+ updateKuaishouRuleSettlementData.setReferenceAmount(kuaishouRuleSettlementData.getReferenceAmount());
|
|
|
+ }
|
|
|
+ if (!Check.isNull(kuaishouRuleSettlementData.getRemarks())) {
|
|
|
+ updateKuaishouRuleSettlementData.setRemarks(kuaishouRuleSettlementData.getRemarks());
|
|
|
+
|
|
|
+ }
|
|
|
+ KuaishouRuleSettlementData selectData = kuaishouRuleSettlementDataService.selectKuaishouRuleSettlementDataById(kuaishouRuleSettlementData.getId());
|
|
|
+ KuaishouRuleSettlementCheck check = new KuaishouRuleSettlementCheck();
|
|
|
+ // kuaishouRuleSettlementCheckService
|
|
|
+ Long relateId = selectData.getRelateId();
|
|
|
+ Long promoterId = selectData.getPromoterId();
|
|
|
+ Long statDate = selectData.getStatDate();
|
|
|
+ check.setRelateId(relateId);
|
|
|
+ check.setPromoterId(promoterId);
|
|
|
+ check.setStatDate(statDate);
|
|
|
+ if (!Check.isNull(kuaishouRuleSettlementData.getAnchorAmount())) {
|
|
|
+ check.setAnchorAmount(kuaishouRuleSettlementData.getAnchorAmount());
|
|
|
+ }
|
|
|
+ if (!Check.isNull(kuaishouRuleSettlementData.getReferenceAmount())) {
|
|
|
+ check.setReferenceAmount(kuaishouRuleSettlementData.getReferenceAmount());
|
|
|
+ }
|
|
|
+ if (!Check.isNull(kuaishouRuleSettlementData.getRemarks())) {
|
|
|
+ check.setRemarks(kuaishouRuleSettlementData.getRemarks());
|
|
|
+ }
|
|
|
+
|
|
|
+ kuaishouRuleSettlementCheckService.updateCheck(check);
|
|
|
+
|
|
|
+ return toAjax(kuaishouRuleSettlementDataService.updateKuaishouRuleSettlementData(updateKuaishouRuleSettlementData));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@GetMapping("/getPromoterSettlementDetail")
|
|
|
public TableDataInfo getPromoterSettlementDetail(String statDate, Long promoterId, Integer settlementStatus, Long itemId) {
|
|
|
Long date = Long.valueOf(statDate.replace("-", ""));
|