jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
ab110ae3 1 parent 6cc50f88

fix

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
...@@ -195,7 +195,6 @@ public class DbToProtoUtil { ...@@ -195,7 +195,6 @@ public class DbToProtoUtil {
195 .setSkuId(orderDetailDb.getSkuId()) 195 .setSkuId(orderDetailDb.getSkuId())
196 .setShowName(orderDetailDb.getShowName()) 196 .setShowName(orderDetailDb.getShowName())
197 .setPrice(orderDetailDb.getPrice()) 197 .setPrice(orderDetailDb.getPrice())
198 - .setAdjustSkuRemark(orderDetailDb.getAdjustSkuRemark())
199 .setCreatedBy(orderDetailDb.getCreatedBy()) 198 .setCreatedBy(orderDetailDb.getCreatedBy())
200 .setCreatedAt(orderDetailDb.getCreatedAt().toEpochSecond(ZoneOffset.UTC) * 1000) 199 .setCreatedAt(orderDetailDb.getCreatedAt().toEpochSecond(ZoneOffset.UTC) * 1000)
201 .setCreationSource(OrderSourceEnum.forNumber(orderDetailDb.getCreationSource())) 200 .setCreationSource(OrderSourceEnum.forNumber(orderDetailDb.getCreationSource()))
...@@ -204,6 +203,9 @@ public class DbToProtoUtil { ...@@ -204,6 +203,9 @@ public class DbToProtoUtil {
204 .setUpdateSource(OrderSourceEnum.forNumber(orderDetailDb.getUpdateSource())) 203 .setUpdateSource(OrderSourceEnum.forNumber(orderDetailDb.getUpdateSource()))
205 .setIsDeleted(orderDetailDb.getIsDeleted()) 204 .setIsDeleted(orderDetailDb.getIsDeleted())
206 .setEnterpriseId(orderDetailDb.getEnterpriseId()); 205 .setEnterpriseId(orderDetailDb.getEnterpriseId());
206 + if (orderDetailDb.getAdjustSkuRemark() != null) {
207 + protoBuilder.setAdjustSkuRemark(orderDetailDb.getAdjustSkuRemark());
208 + }
207 209
208 if (orderDetailDb.getServeStatus() != null) { 210 if (orderDetailDb.getServeStatus() != null) {
209 protoBuilder.setServeStatus(ServeStatusEnum.forNumber(orderDetailDb.getServeStatus())); 211 protoBuilder.setServeStatus(ServeStatusEnum.forNumber(orderDetailDb.getServeStatus()));
......