licailing il y a 5 ans
Parent
commit
f97b94688d

+ 1 - 0
src/main/java/com/izouma/imt/domain/User.java

@@ -113,4 +113,5 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "身份", name = "identity")
     private UserIdentity identity;
 
+    private String alipayUserId;
 }

+ 3 - 0
src/main/java/com/izouma/imt/service/vendor/ProductService.java

@@ -188,6 +188,9 @@ public class ProductService {
         }
         List<ProductTag> applicationFields = productTagRepo.findAllById(product.getApplicationField());
 
+        if (CollUtil.isNotEmpty(product.getOrigin1())) {
+            dto.setOrigin1(productTagRepo.findAllById(product.getOrigin1()));
+        }
         ProductCategory category = productCategoryRepo.findById(product.getProductCategoryId())
                 .orElseThrow(new BusinessException("无分类"));
 

+ 16 - 0
src/main/vue/src/router.js

@@ -713,6 +713,22 @@ const router = new Router({
                     meta: {
                         title: '预设参数'
                     }
+                },
+                {
+                    path: '/payFeeEdit',
+                    name: 'PayFeeEdit',
+                    component: () => import(/* webpackChunkName: "payFeeEdit" */ '@/views/PayFeeEdit.vue'),
+                    meta: {
+                        title: '支付流水编辑'
+                    }
+                },
+                {
+                    path: '/payFeeList',
+                    name: 'PayFeeList',
+                    component: () => import(/* webpackChunkName: "payFeeList" */ '@/views/PayFeeList.vue'),
+                    meta: {
+                        title: '支付流水'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

+ 1 - 1
src/test/java/com/izouma/imt/service/vendor/ProductServiceTest.java

@@ -117,7 +117,7 @@ public class ProductServiceTest {
 
     @Test
     public void test10() {
-        System.out.println(productService.toDetailDTO(productRepo.findById(6540L)
+        System.out.println(productService.toDetailDTO(productRepo.findById(20278L)
                 .orElseThrow(new BusinessException("无记录"))));
     }