diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue index e84bbb48d..864ee8465 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue @@ -21,7 +21,7 @@
-
积分兑换订单
+
积分商城订单
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java index 1c4db307b..c82ecb12b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java @@ -19,4 +19,8 @@ public class IntegralOrdersDTO extends IntegralOrders { private String coverImage; private Long deptId; private List storeIds; + /** + * 支付类型 + */ + private String paymentType; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index 351703a18..530cc5e2c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -181,6 +181,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl fenxiByDaili2 = allOrderInfoMapper.getFenxiByDaili2(allOrderInfo); + record.setPayMoney(convertPayMoneyToWanYuan(record.getPayMoney())); + record.setFenxiByDaili2(fenxiByDaili2); } return fenxiByDaili; @@ -1693,4 +1695,17 @@ public class AllOrderInfoServiceImpl extends ServiceImpl