diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java index 0a1290d..24346bb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java @@ -43,10 +43,10 @@ import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService; import com.starry.admin.modules.order.service.IPlayOrderInfoService; import com.starry.admin.modules.order.service.IPlayOrderRefundInfoService; import com.starry.admin.modules.order.service.support.ClerkRevenueCalculator; -import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEntity; -import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; +import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity; import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; import com.starry.admin.modules.shop.module.constant.CouponUseState; import com.starry.admin.modules.shop.service.IPlayCouponDetailsService; import com.starry.admin.modules.weichat.entity.order.*; diff --git a/play-admin/src/test/java/com/starry/admin/api/WxCustomRandomOrderApiTest.java b/play-admin/src/test/java/com/starry/admin/api/WxCustomRandomOrderApiTest.java index dcc84d9..b4157d8 100644 --- a/play-admin/src/test/java/com/starry/admin/api/WxCustomRandomOrderApiTest.java +++ b/play-admin/src/test/java/com/starry/admin/api/WxCustomRandomOrderApiTest.java @@ -54,6 +54,7 @@ class WxCustomRandomOrderApiTest extends WxCustomOrderApiTestSupport { private static final String CLERK_RANDOM_ORDER_ENABLED = "1"; private static final String CLERK_FIXING_LEVEL = "1"; private static final String CLERK_ONBOARDING_STATE = "1"; + private static final BigDecimal HIGH_BALANCE = new BigDecimal("1000.00"); @MockBean private NotificationSender notificationSender; @@ -275,6 +276,7 @@ class WxCustomRandomOrderApiTest extends WxCustomOrderApiTestSupport { String adminToken = null; try { resetCustomerBalance(); + setCustomerBalance(HIGH_BALANCE); customerToken = wxTokenService.createWxUserToken(ApiTestDataSeeder.DEFAULT_CUSTOMER_ID); customUserInfoService.updateTokenById(ApiTestDataSeeder.DEFAULT_CUSTOMER_ID, customerToken); @@ -321,6 +323,7 @@ class WxCustomRandomOrderApiTest extends WxCustomOrderApiTestSupport { String adminToken = null; try { resetCustomerBalance(); + setCustomerBalance(HIGH_BALANCE); customerToken = wxTokenService.createWxUserToken(ApiTestDataSeeder.DEFAULT_CUSTOMER_ID); customUserInfoService.updateTokenById(ApiTestDataSeeder.DEFAULT_CUSTOMER_ID, customerToken); @@ -464,7 +467,7 @@ class WxCustomRandomOrderApiTest extends WxCustomOrderApiTestSupport { } ensureTenantContext(); PlayPersonnelAdminInfoEntity entity = new PlayPersonnelAdminInfoEntity(); - entity.setId("admin-info-" + sysUserId); + entity.setId(IdUtils.getUuid()); entity.setTenantId(ApiTestDataSeeder.DEFAULT_TENANT_ID); entity.setSysUserId(sysUserId); entity.setSysUserCode(sysUserCode);