|
|
@@ -10,12 +10,11 @@ import com.ruoyi.business.service.IBusinessLogisticsConfigService;
|
|
|
import com.ruoyi.business.service.IBusinessSalesConfigService;
|
|
|
import com.ruoyi.business.service.IBusinessSelfPickupAddressService;
|
|
|
import com.ruoyi.business.service.IBusinessService;
|
|
|
-import com.ruoyi.common.enums.order.MarketingType;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.BeanUtil;
|
|
|
import com.ruoyi.common.utils.MathUtils;
|
|
|
import com.ruoyi.shop.business.domain.UserBusinessRole;
|
|
|
-import com.ruoyi.shop.business.service.*;
|
|
|
+import com.ruoyi.shop.business.service.IUserBusinessRoleService;
|
|
|
import com.ruoyi.shop.enums.ProductPaymentMode;
|
|
|
import com.ruoyi.shop.freightTemplate.domain.FreightTemplate;
|
|
|
import com.ruoyi.shop.freightTemplate.service.IFreightTemplateService;
|
|
|
@@ -41,11 +40,9 @@ import com.ruoyi.user.service.IUserService;
|
|
|
import com.ruoyi.useraddress.domain.UserAddress;
|
|
|
import com.ruoyi.useraddress.service.IUserAddressService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.simpleframework.xml.Default;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.math.RoundingMode;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|