suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设计阶段

Browse Source
This commit is contained in:
苏竹红
2024-06-26 10:24:36 +08:00
parent c29e78e831
commit bcc40243fa
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java
View File

@@ -1,9 +1,13 @@
package com.cool.store.request; 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 com.cool.store.entity.DecorationDesignInfoDO;
import lombok.Data; import lombok.Data;
import javax.persistence.Column; import javax.persistence.Column;
import javax.swing.text.StyleConstants;
import java.util.Date; import java.util.Date;
/** /**
@@ -38,7 +42,7 @@ public class DecorationDesignRequest {
* 加密商验收签名 {"pic":"","acceptanceTime":"","result":"","remark":"","status":0} * 加密商验收签名 {"pic":"","acceptanceTime":"","result":"","remark":"","status":0}
*/ */
@Column(name = "partner_acceptance_signatures") @Column(name = "partner_acceptance_signatures")
private String partnerAcceptanceSignatures; private ThreeAcceptanceDTO partnerAcceptanceSignatures;
@@ -48,7 +52,14 @@ public class DecorationDesignRequest {
decorationDesignInfoDO.setShopId(this.shopId); decorationDesignInfoDO.setShopId(this.shopId);
decorationDesignInfoDO.setRemark(this.remark); decorationDesignInfoDO.setRemark(this.remark);
decorationDesignInfoDO.setQuotationUrl(this.quotationUrl); 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()); decorationDesignInfoDO.setUpdateTime(new Date());
return decorationDesignInfoDO; return decorationDesignInfoDO;
} }

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java
View File

@@ -123,7 +123,7 @@ public class MiniDecorationController {
} }
@ApiOperation("加盟商确定设计方案") @ApiOperation("加盟商确定设计方案")
@GetMapping("/confirmDesign") @PostMapping("/confirmDesign")
public ResponseResult<Boolean> confirmDesign(@RequestParam DecorationDesignRequest shopId){ public ResponseResult<Boolean> confirmDesign(@RequestParam DecorationDesignRequest shopId){
return ResponseResult.success(decorationService.confirmDesign(shopId,CurrentUserHolder.getUser())); return ResponseResult.success(decorationService.confirmDesign(shopId,CurrentUserHolder.getUser()));
} }