no message

mall-server-api/src/main/java/com/gree/mall/manager/controller/contract/WebsitContractSignController.java

@@ -74,7 +74,7 @@ public class WebsitContractSignController {
     @PostMapping("/confirm")
     @ApiOperation(value = "网点合同签约-审核")
     public ResponseHelper confirm(
-            @ApiParam(value = "明细id", required = true) @RequestParam String id,
+            @ApiParam(value = "id", required = true) @RequestParam String id,
             @ApiParam(value = "状态 OK=通过 REJECT=驳回", required = true) @RequestParam SignContractStatusEnum status,
             @ApiParam(value = "备注") @RequestParam(required = false) String remark) {
         websitContractSignLogic.confirm(id, status, remark);

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/WebsitContractSignLogic.java

@@ -594,50 +594,53 @@ public class WebsitContractSignLogic {
     @Transactional
     public void confirm(String id, SignContractStatusEnum status, String remark) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        WebsitContractSignItem signItem = websitContractSignItemService.getById(id);
-        if (Objects.isNull(signItem)) {
+        final WebsitContractSignRecord record = websitContractSignRecordService.getById(id);
+
+        if (Objects.isNull(record)) {
             throw new RemoteServiceException("合同明细不存在");
         }
-        if (status.getKey().equals(SignContractStatusEnum.OK.getKey())) {
-            if (signItem.getNeedPartyASign().equals(IsYesNoEnum.YES.getKey())) {
-                //甲方签署
-                JSONObject object = Auth4FDDUtil.extSignAuto(IdWorker.getIdStr(), signItem.getFadadaContractId(),
-                        signItem.getCaCustomerId(), "甲方签章", "0",
-                        signItem.getPartyASignFiled(), "", "", "");
-                log.info(signItem.getFadadaContractId() + " 甲方签章结果：{}", object);
-
-                // 法大大合同归档
-                JSONObject object1 = Auth4FDDUtil.contractFiling(signItem.getFadadaContractId());
-                log.info(signItem.getFadadaContractId() + " 合同归档结果：{}", object1);
+
+        List<WebsitContractSignItem> signItemList = websitContractSignItemService.lambdaQuery()
+                .eq(WebsitContractSignItem::getWebsitContractSignRecordId, record.getId())
+                .list();
+
+        for (WebsitContractSignItem signItem : signItemList) {
+            if (status.getKey().equals(SignContractStatusEnum.OK.getKey())) {
+                if (signItem.getNeedPartyASign().equals(IsYesNoEnum.YES.getKey())) {
+                    //甲方签署
+                    JSONObject object = Auth4FDDUtil.extSignAuto(IdWorker.getIdStr(), signItem.getFadadaContractId(),
+                            signItem.getCaCustomerId(), "甲方签章", "0",
+                            signItem.getPartyASignFiled(), "", "", "");
+                    log.info(signItem.getFadadaContractId() + " 甲方签章结果：{}", object);
+
+                    // 法大大合同归档
+                    JSONObject object1 = Auth4FDDUtil.contractFiling(signItem.getFadadaContractId());
+                    log.info(signItem.getFadadaContractId() + " 合同归档结果：{}", object1);
+                }
+                websitContractSignItemService.lambdaUpdate()
+                        .set(WebsitContractSignItem::getContractStatus, SignContractStatusEnum.OK.getKey())
+                        .set(WebsitContractSignItem::getConfirmBy, adminUser.getNickName())
+                        .set(WebsitContractSignItem::getConfirmTime, DateUtil.date())
+                        .eq(WebsitContractSignItem::getId, id)
+                        .update();
+            } else {
+                websitContractSignItemService.lambdaUpdate()
+                        .set(WebsitContractSignItem::getContractStatus, SignContractStatusEnum.REJECT.getKey())
+                        .set(WebsitContractSignItem::getConfirmBy, adminUser.getNickName())
+                        .set(WebsitContractSignItem::getConfirmTime, DateUtil.date())
+                        .eq(WebsitContractSignItem::getId, id)
+                        .update();
             }
-            websitContractSignItemService.lambdaUpdate()
-                    .set(WebsitContractSignItem::getContractStatus, SignContractStatusEnum.OK.getKey())
-                    .set(WebsitContractSignItem::getRemark, remark)
-                    .set(WebsitContractSignItem::getConfirmBy, adminUser.getNickName())
-                    .set(WebsitContractSignItem::getConfirmTime, DateUtil.date())
-                    .eq(WebsitContractSignItem::getId, id)
-                    .update();
-        } else {
-            websitContractSignItemService.lambdaUpdate()
-                    .set(WebsitContractSignItem::getContractStatus, SignContractStatusEnum.REJECT.getKey())
-                    .set(WebsitContractSignItem::getRemark, remark)
-                    .set(WebsitContractSignItem::getConfirmBy, adminUser.getNickName())
-                    .set(WebsitContractSignItem::getConfirmTime, DateUtil.date())
-                    .eq(WebsitContractSignItem::getId, id)
-                    .update();
-        }
-        final Integer count = websitContractSignItemService.lambdaQuery()
-                .eq(WebsitContractSignItem::getWebsitContractSignRecordId, signItem.getWebsitContractSignRecordId())
-                .in(WebsitContractSignItem::getContractStatus, SignContractStatusEnum.WAIT_SIGN.getKey(), SignContractStatusEnum.WAIT.getKey(), SignContractStatusEnum.REJECT.getKey())
-                .count();
-        if (count == 0) {
-            // 合同都已审核，更新记录为审核通过
-            websitContractSignRecordService.lambdaUpdate()
-                    .set(WebsitContractSignRecord::getStatus, SignContractStatusEnum.OK.getKey())
-                    .set(WebsitContractSignRecord::getConfirmBy, adminUser.getNickName())
-                    .set(WebsitContractSignRecord::getConfirmTime, DateUtil.date())
-                    .eq(WebsitContractSignRecord::getId, signItem.getWebsitContractSignRecordId())
-                    .update();
         }
+
+        // 合同都已审核，更新记录为审核通过
+        websitContractSignRecordService.lambdaUpdate()
+                .set(WebsitContractSignRecord::getRemark, remark)
+                .set(WebsitContractSignRecord::getStatus, status.getKey())
+                .set(WebsitContractSignRecord::getConfirmBy, adminUser.getNickName())
+                .set(WebsitContractSignRecord::getConfirmTime, DateUtil.date())
+                .eq(WebsitContractSignRecord::getId, id)
+                .update();
+
     }
 }