From bcc40243fa9b9a4654386061eb3daab5a5caf5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 26 Jun 2024 10:24:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/DecorationDesignRequest.java | 15 +++++++++++++-- .../controller/webc/MiniDecorationController.java | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java index 9efe25810..6783be0ff 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java @@ -1,9 +1,13 @@ package com.cool.store.request; +import com.alibaba.fastjson.JSONObject; +import com.cool.store.constants.CommonConstants; +import com.cool.store.dto.decoration.ThreeAcceptanceDTO; import com.cool.store.entity.DecorationDesignInfoDO; import lombok.Data; import javax.persistence.Column; +import javax.swing.text.StyleConstants; import java.util.Date; /** @@ -38,7 +42,7 @@ public class DecorationDesignRequest { * 加密商验收签名 {"pic":"","acceptanceTime":"","result":"","remark":"","status":0} */ @Column(name = "partner_acceptance_signatures") - private String partnerAcceptanceSignatures; + private ThreeAcceptanceDTO partnerAcceptanceSignatures; @@ -48,7 +52,14 @@ public class DecorationDesignRequest { decorationDesignInfoDO.setShopId(this.shopId); decorationDesignInfoDO.setRemark(this.remark); decorationDesignInfoDO.setQuotationUrl(this.quotationUrl); - decorationDesignInfoDO.setPartnerAcceptanceSignatures(this.partnerAcceptanceSignatures); + if (this.partnerAcceptanceSignatures != null){ + ThreeAcceptanceDTO threeAcceptanceDTO = this.partnerAcceptanceSignatures; + threeAcceptanceDTO.setAcceptanceTime(new Date()); + threeAcceptanceDTO.setStatus(CommonConstants.ONE); + threeAcceptanceDTO.setResult(CommonConstants.ONE); + threeAcceptanceDTO.setRemark("加盟商确认设计方案通过"); + decorationDesignInfoDO.setPartnerAcceptanceSignatures(JSONObject.toJSONString(threeAcceptanceDTO)); + } decorationDesignInfoDO.setUpdateTime(new Date()); return decorationDesignInfoDO; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java index c098665ca..cb5674ce3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java @@ -123,7 +123,7 @@ public class MiniDecorationController { } @ApiOperation("加盟商确定设计方案") - @GetMapping("/confirmDesign") + @PostMapping("/confirmDesign") public ResponseResult confirmDesign(@RequestParam DecorationDesignRequest shopId){ return ResponseResult.success(decorationService.confirmDesign(shopId,CurrentUserHolder.getUser())); }