朱园亮 / xingyun-erp · Commits

Commit 9576c887aa0d7b22cc47bcba68b02287a5722a3f

Authored by 房远帅
1 parent fad9c25a

订单明细报表导出：运费问题处理

Inline Side-by-side
Showing 2 changed files with 1 additions and 22 deletions
@@ -296,16 +296,6 @@ public class GetOrderDetailReportBo extends BaseBo<OrderDetailReport> { @@ -296,16 +296,6 @@ public class GetOrderDetailReportBo extends BaseBo<OrderDetailReport> {
296 296
297 @Override 297 @Override
298 protected void afterInit(OrderDetailReport dto) { 298 protected void afterInit(OrderDetailReport dto) {
299 - if ("PROCESS_STD_AGMT".equals(dto.getContractType())) {  
300 - if (StringUtils.isBlank(this.returnShippingCost) && StringUtils.isNotBlank(this.shippingCost)) {  
301 - this.returnShippingCost = this.shippingCost;  
302 - }  
303 - this.shippingCost = null;  
304 - } else {  
305 - if (StringUtils.isBlank(this.shippingCost) && StringUtils.isNotBlank(this.returnShippingCost)) {  
306 - this.shippingCost = this.returnShippingCost;  
307 - }  
308 - this.returnShippingCost = null;  
309 - } 299 +
310 } 300 }
311 } 301 }
@@ -354,17 +354,6 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> { @@ -354,17 +354,6 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
354 this.specialRequirements = getDicItemNameOrOriginal(DIC_SPECIAL_REQUIREMENTS, this.specialRequirements); 354 this.specialRequirements = getDicItemNameOrOriginal(DIC_SPECIAL_REQUIREMENTS, this.specialRequirements);
355 this.deptCode = convertDeptNameToDeptCode(this.deptName); 355 this.deptCode = convertDeptNameToDeptCode(this.deptName);
356 this.contractTypeName = handleContractType(this.contractTypeCode); 356 this.contractTypeName = handleContractType(this.contractTypeCode);
357 - if ("PROCESS_STD_AGMT".equals(this.contractTypeCode)) {  
358 - if (StringUtils.isBlank(this.returnShippingCost) && StringUtils.isNotBlank(this.shippingCost)) {  
359 - this.returnShippingCost = this.shippingCost;  
360 - }  
361 - this.shippingCost = null;  
362 - } else {  
363 - if (StringUtils.isBlank(this.shippingCost) && StringUtils.isNotBlank(this.returnShippingCost)) {  
364 - this.shippingCost = this.returnShippingCost;  
365 - }  
366 - this.returnShippingCost = null;  
367 - }  
368 } 357 }
369 358
370 private static String getDicItemNameOrOriginal(String dicCode, String itemCode) { 359 private static String getDicItemNameOrOriginal(String dicCode, String itemCode) {