核销

src/main/java/com/izouma/jiashanxia/service/StockService.java

@@ -30,8 +30,14 @@ public class StockService {
             if (ObjectUtil.isNotEmpty(stock.getId())) {
                 Stock orig = stockRepo.findById(stock.getId()).orElseThrow(new BusinessException("无记录"));
                 ObjUtils.merge(orig, stock);
+                if (ObjectUtil.isNull(stock.getSettlementPrice())) {
+                    stock.setSettlementPrice(stock.getPrice());
+                }
                 stockRepo.save(orig);
             } else {
+                if (ObjectUtil.isNull(stock.getSettlementPrice())) {
+                    stock.setSettlementPrice(stock.getPrice());
+                }
                 stockRepo.save(stock);
             }
         });

src/main/java/com/izouma/jiashanxia/service/UserPackageFlowService.java

@@ -1,6 +1,7 @@
 package com.izouma.jiashanxia.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -81,12 +82,15 @@ public class UserPackageFlowService {
             }
             return criteriaBuilder.and(and.toArray(new Predicate[0]));
         }), JpaUtils.toPageRequest(pageQuery)).map(flow -> {
-            List<GoodsVO> goodsVOS = this.toGoodsVO(flow.getContent(), goodsMap);
+
             UserPackageFlowVO vo = new UserPackageFlowVO();
             BeanUtil.copyProperties(flow, vo);
             vo.setNickname(flow.getUser().getNickname());
             vo.setAvatar(flow.getUser().getAvatar());
-            vo.setContent(goodsVOS);
+            if (CollUtil.isNotEmpty(flow.getContent())){
+                List<GoodsVO> goodsVOS = this.toGoodsVO(flow.getContent(), goodsMap);
+                vo.setContent(goodsVOS);
+            }
             return vo;
         });
     }

src/main/vue/src/views/employee/ChildrenList.vue

@@ -72,12 +72,10 @@ export default {
             url: '/user/children',
             downloading: false,
             members: [
-                { label: '普通用户', value: 'NORMAL' },
-                { label: '达人', value: 'EXPERT' },
-                { label: '108将', value: 'GENERAL' },
-                { label: '创客', value: 'MAKER' },
-                { label: '全职', value: 'EMPLOYEE' },
-                { label: '108将/创客', value: 'GENERAL_MAKER' }
+                { label: '普通会员', value: 'NORMAL' },
+                { label: '黄金佳人', value: 'EXPERT' },
+                { label: '钻石佳人', value: 'BIG_EXPERT' },
+                { label: '钻石合伙人', value: 'PARTNER' }
             ]
         };
     },

src/main/vue/src/views/employee/EmployeeList.vue

@@ -36,6 +36,7 @@
                     ></el-image>
                 </template>
             </el-table-column>
+            <el-table-column prop="member" label="身份" :formatter="memberFormatter"></el-table-column>
             <el-table-column prop="amount" label="余额">
                 <!-- <template slot-scope="{ row }">
                     <span>{{ row.amount }}</span>
@@ -87,7 +88,13 @@ export default {
             search: '',
             url: '/user/all',
             downloading: false,
-            display: false
+            display: false,
+            members: [
+                { label: '普通会员', value: 'NORMAL' },
+                { label: '黄金佳人', value: 'EXPERT' },
+                { label: '钻石佳人', value: 'BIG_EXPERT' },
+                { label: '钻石合伙人', value: 'PARTNER' }
+            ]
         };
     },
     created() {
@@ -103,11 +110,18 @@ export default {
         }
     },
     methods: {
+        memberFormatter(row, column, cellValue, index) {
+            let selectedOption = this.members.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
         beforeGetData() {
             return {
                 search: this.search,
                 query: {
-                    member: 'EXPERT,BIG_EXPERT'
+                    member: 'EXPERT,BIG_EXPERT,PARTNER'
                 }
             };
         },

src/test/java/com/izouma/jiashanxia/service/UserPackageFlowServiceTest.java

@@ -11,6 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
+import java.util.Map;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
@@ -40,6 +41,9 @@ public class UserPackageFlowServiceTest {
 
     @Test
     public void test1() {
-        System.out.println(userPackageFlowService.writeOffAll1(new PageQuery()));
+        PageQuery pageQuery = new PageQuery();
+        Map<String, Object> query = pageQuery.getQuery();
+        query.put("writeOffUserId",1131L);
+        System.out.println(userPackageFlowService.writeOffAll1(pageQuery).getContent());
     }
 }