Commit 8c7556a3 by 何文超

Merge branch 'developer'

parents eefd60b8 07a8b5ea
...@@ -6,10 +6,10 @@ import com.gic.commons.util.EntityUtil; ...@@ -6,10 +6,10 @@ import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.goods.api.dto.GoodsCordDTO; import com.gic.goods.api.dto.GoodsCordDTO;
import com.gic.goods.api.service.CordApiService; import com.gic.goods.api.service.CordApiService;
import com.gic.goods.api.service.MallGoodsBusinessApiService;
import com.gic.goods.api.util.Constant; import com.gic.goods.api.util.Constant;
import com.gic.mall.api.dto.goods.MallGoodsCordDTO; import com.gic.mall.api.dto.goods.MallGoodsCordDTO;
import com.gic.mall.api.service.MallCordApiService; import com.gic.mall.api.service.MallCordApiService;
import com.gic.mall.api.service.MallProApiService;
import com.gic.mall.base.api.enums.ErrorCodeEnums; import com.gic.mall.base.api.enums.ErrorCodeEnums;
import com.gic.mall.share.api.dto.shop.ShopDTO; import com.gic.mall.share.api.dto.shop.ShopDTO;
import com.gic.mall.share.api.service.ShopApiService; import com.gic.mall.share.api.service.ShopApiService;
...@@ -62,7 +62,7 @@ public class AppletConfigGoodsController extends BaseGoodsController { ...@@ -62,7 +62,7 @@ public class AppletConfigGoodsController extends BaseGoodsController {
private EsBusinessOperaApiService esBusinessOperaApiService; private EsBusinessOperaApiService esBusinessOperaApiService;
@Autowired @Autowired
private MallGoodsBusinessApiService mallGoodsBusinessApiService; private MallProApiService mallProApiService;
private static final Logger log = LogManager.getLogger(AppletConfigGoodsController.class); private static final Logger log = LogManager.getLogger(AppletConfigGoodsController.class);
...@@ -135,7 +135,7 @@ public class AppletConfigGoodsController extends BaseGoodsController { ...@@ -135,7 +135,7 @@ public class AppletConfigGoodsController extends BaseGoodsController {
goodsIds.add(goodsId); goodsIds.add(goodsId);
}); });
} }
ServiceResponse<Map<Long, BigDecimal>> mapServiceResponse = mallGoodsBusinessApiService.getLowestSkuPrice(goodsIds, getEnterpriseId()); ServiceResponse<Map<Long, BigDecimal>> mapServiceResponse = mallProApiService.getLowestSkuPrice(goodsIds, getEnterpriseId());
if (mapServiceResponse.isSuccess()) { if (mapServiceResponse.isSuccess()) {
Map<Long, BigDecimal> map = mapServiceResponse.getResult(); Map<Long, BigDecimal> map = mapServiceResponse.getResult();
serviceResponse.getResult().getRes().forEach(json -> { serviceResponse.getResult().getRes().forEach(json -> {
......
...@@ -61,4 +61,5 @@ ...@@ -61,4 +61,5 @@
<dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="10000" retries="0" /> <dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="10000" retries="0" />
<dubbo:reference interface="com.gic.store.service.StoreTagApiService" id="storeTagApiService" timeout="10000" retries="0" /> <dubbo:reference interface="com.gic.store.service.StoreTagApiService" id="storeTagApiService" timeout="10000" retries="0" />
<dubbo:reference interface="com.gic.mall.api.service.MallCordApiService" id="mallCordApiService" timeout="10000" retries="0" /> <dubbo:reference interface="com.gic.mall.api.service.MallCordApiService" id="mallCordApiService" timeout="10000" retries="0" />
<dubbo:reference interface="com.gic.mall.api.service.MallProApiService" id="mallProApiService" timeout="10000" retries="0" />
</beans> </beans>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment