消费记录增加字段

share-system/src/main/java/share/system/service/impl/SConsumptionRecordsServiceImpl.java

@@ -65,19 +65,21 @@ public class SConsumptionRecordsServiceImpl implements ISConsumptionRecordsServi
         List<Long> oredrIds = sConsumptionRecordsList.stream().map(SConsumptionRecords::getOrderId).collect(Collectors.toList());
         List<SOrder> sOrders = sOrderMapper.selectBatchIds(oredrIds);
         List<SConsumptionRecordsVo> sConsumptionRecordsVoList = new ArrayList<>();
-        BeanUtils.copyProperties(sConsumptionRecordsList, sConsumptionRecordsVoList);
-        sConsumptionRecordsVoList.stream().forEach(item -> {
+        sConsumptionRecordsList.stream().forEach(item -> {
+            SConsumptionRecordsVo sConsumptionRecordsVo = new SConsumptionRecordsVo();
+            BeanUtils.copyProperties(item, sConsumptionRecordsVo);
             sConsumers.stream().forEach(vo -> {
-                if (item.getConsumerId().equals(vo.getId())) {
-                    item.setNickName(vo.getNickName());
-                    item.setPhone(vo.getPhone());
+                if (sConsumptionRecordsVo.getConsumerId().equals(vo.getId())) {
+                    sConsumptionRecordsVo.setNickName(vo.getNickName());
+                    sConsumptionRecordsVo.setPhone(vo.getPhone());
                 }
             });
             sOrders.stream().forEach(vo -> {
-                if (item.getOrderId().equals(vo.getId())) {
-                    item.setOrderNo(vo.getOrderNo());
+                if (sConsumptionRecordsVo.getOrderId().equals(vo.getId())) {
+                    sConsumptionRecordsVo.setOrderNo(vo.getOrderNo());
                 }
             });
+            sConsumptionRecordsVoList.add(sConsumptionRecordsVo);
         });
         return sConsumptionRecordsVoList;
     }

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -763,6 +763,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         if (userCoupon.getId().equals(vo.getCouponId())) {
                             // 判断是否可以退款
                             vo.setIsRefund(isRefund(vo, userCoupon));
+                            vo.setCouponName(userCoupon.getName());
+
                         }
                     });
                 }else{

share-system/src/main/java/share/system/service/impl/SStoreServiceImpl.java

@@ -158,6 +158,7 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
         listVoCheck(request);
         SStore store = new SStore();
         store.setStatus(request.getStatus());
+        store.setName(request.getName());
         List<SStore> storeList = baseMapper.selectSStoreList(store);
         List<SStoreVo> voList = new ArrayList<>();
         if (StringUtils.isNotBlank(request.getNowLongitude())) {