|
@@ -6,6 +6,7 @@ import com.gree.mall.miniapp.plus.entity.WorkerStock;
|
|
|
import com.gree.mall.miniapp.plus.entity.WorkerStockAcc;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
import lombok.Data;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
|
import javax.validation.constraints.NotBlank;
|
|
@@ -128,8 +129,8 @@ public class WorkerStockDTO {
|
|
|
WorkerStock workerStock = new WorkerStock();
|
|
|
BeanUtils.copyProperties(this, workerStock);
|
|
|
workerStock.setId(null)
|
|
|
- .setWebsitId(this.workerWebsitId)
|
|
|
- .setWebsitName(this.workerWebsitName)
|
|
|
+ .setWebsitId(StringUtils.isBlank(this.workerWebsitId) ? this.websitId : this.workerWebsitId)
|
|
|
+ .setWebsitName(StringUtils.isBlank(this.workerWebsitName) ? this.workerWebsitName : this.workerWebsitName)
|
|
|
.setQty(BigDecimal.ZERO)
|
|
|
.setOldQty(BigDecimal.ZERO)
|
|
|
.setTempNewQty(BigDecimal.ZERO)
|