解决冲突

bweb/src/main/java/com/bweb/controller/TestController.java

@@ -6,8 +6,20 @@ import com.hfkj.common.exception.SysCode;
 import com.hfkj.common.utils.*;
 import com.hfkj.config.CommonSysConst;
 
+import com.hfkj.entity.CouponDiscountGoodsRel;
+import com.hfkj.entity.GoodsMsg;
+import com.hfkj.entity.GoodsSpecs;
 import com.hfkj.model.ResponseData;
 
+import com.hfkj.service.discount.CouponDiscountService;
+import com.hfkj.service.goods.BsOrderGoodsService;
+import com.hfkj.service.goods.GoodsMsgService;
+import com.hfkj.service.goods.GoodsSpecsService;
+import com.hfkj.service.goods.GoodsUserAddressService;
+import com.hfkj.service.hlt.HltCanteenService;
+import com.hfkj.service.hlt.HuiLianTongUnionCardService;
+import com.hfkj.service.order.BsOrderChildService;
+import com.hfkj.service.pay.huift.TradeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -17,7 +29,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Controller