Browse Source

fix:

1.修改导出的签收状态
pre-production
pref_mail@163.com 2 months ago
parent
commit
bfe977ac73
  1. 2
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java
  2. 4
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

2
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java

@ -157,9 +157,7 @@ public class MerchantStatisticsController {
String method = "############pageReconciliationList: "; String method = "############pageReconciliationList: ";
log.info(method + "请求参数{}", merchantStatisticsDTO); log.info(method + "请求参数{}", merchantStatisticsDTO);
try { try {
IPage<StatisticsReconciliationOrderInfoEntity> pages = reconciliationOrderInfoService.pageReconciliationList(merchantStatisticsDTO); IPage<StatisticsReconciliationOrderInfoEntity> pages = reconciliationOrderInfoService.pageReconciliationList(merchantStatisticsDTO);
return R.data(pages); return R.data(pages);
} catch (CustomerException e) { } catch (CustomerException e) {
log.error(e.message, e); log.error(e.message, e);

4
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@ -1429,9 +1429,9 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
statisticsOrderInfoExportVO.setPayWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, statisticsOrderInfoVO.getPayWay())); statisticsOrderInfoExportVO.setPayWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, statisticsOrderInfoVO.getPayWay()));
String signName = "未签收"; String signName = "未签收";
if (90 == statisticsOrderInfoVO.getSignStatus()) { if (1 == statisticsOrderInfoVO.getSignStatus()) {
signName = "部分签收"; signName = "部分签收";
} else if (100 == statisticsOrderInfoVO.getSignStatus()) { } else if (2 == statisticsOrderInfoVO.getSignStatus()) {
signName = "已签收"; signName = "已签收";
} }
// statisticsOrderInfoExportVO.setSignStatus(); // statisticsOrderInfoExportVO.setSignStatus();

Loading…
Cancel
Save