订单

src/main/java/com/izouma/dingdong/service/OrderInfoService.java

@@ -531,6 +531,7 @@ public class OrderInfoService {
             dto.setMerAddress(merchant.getAddress());
             dto.setMid(merchant.getId());
             dto.setMerLogo(merchant.getLogo());
+            dto.setMUserId(merchant.getUserId());
         });
 
         return dto;

src/test/java/com/izouma/dingdong/contorller/OrderInfoControllerTest.java

@@ -10,6 +10,7 @@ import com.izouma.dingdong.repo.backstage.MerchantNatureRepo;
 import com.izouma.dingdong.repo.merchant.MerchantRepo;
 import com.izouma.dingdong.service.OrderInfoService;
 import com.izouma.dingdong.web.AuthenticationController;
+import com.izouma.dingdong.web.OrderInfoController;
 import com.izouma.dingdong.web.backstage.CategoryController;
 import com.izouma.dingdong.web.merchant.GoodsController;
 import com.izouma.dingdong.web.merchant.MerchantClassificationController;
@@ -33,9 +34,9 @@ public class OrderInfoControllerTest {
     @Autowired
     private GoodsController goodsController;
     @Autowired
-    private MerchantRepo merchantRepo;
+    private MerchantRepo        merchantRepo;
     @Autowired
-    private OrderInfoService orderInfoService;
+    private OrderInfoController orderInfoController;
 
     //商家注册
     @Test
@@ -101,26 +102,8 @@ public class OrderInfoControllerTest {
     }
 
     @Test
-    public void testMy(){
-        System.out.println(orderInfoService.my(83L));
-    }
-
-    @Test
-    public void testBuy(){
-        UserOrderDTO dto = UserOrderDTO.builder()
-                .addressId(1889L)
-                .payMethod(PayMethod.ALI_PAY)
-                .shoppingCartId(1985L)
-                //.remark("多加点！")
-                //.userCouponId(217L)
-                .build();
-
-        System.out.println(orderInfoService.userOrder(dto).getId());
-    }
-
-    @Test
-    public void testMer(){
-        orderInfoService.merReceiveOrder(1352L,true);
+    public void test(){
+        System.out.println(orderInfoController.get(2177L).getMUserId());
     }
 
 }

src/test/java/com/izouma/dingdong/service/OrderInfoServiceTest.java

@@ -34,5 +34,22 @@ public class OrderInfoServiceTest {
                 .build();
         orderInfoService.userOrder(build);
     }
+    @Test
+    public void testMy(){
+        System.out.println(orderInfoService.my(83L));
+    }
+
+    @Test
+    public void testBuy(){
+        UserOrderDTO dto = UserOrderDTO.builder()
+                .addressId(1889L)
+                .payMethod(PayMethod.ALI_PAY)
+                .shoppingCartId(1985L)
+                //.remark("多加点！")
+                //.userCouponId(217L)
+                .build();
+
+        System.out.println(orderInfoService.userOrder(dto).getId());
+    }
 
 }