Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-webapp-plug
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-webapp-plug
Commits
8c7556a3
Commit
8c7556a3
authored
Aug 18, 2020
by
何文超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer'
parents
eefd60b8
07a8b5ea
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
AppletConfigGoodsController.java
...lug/web/controller/goods/AppletConfigGoodsController.java
+3
-3
dubbo-gic-webapp-plug.xml
src/main/resources/dubbo-gic-webapp-plug.xml
+2
-0
No files found.
src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java
View file @
8c7556a3
...
@@ -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
Mall
GoodsBusinessApiService
mallGoodsBusiness
ApiService
;
private
Mall
ProApiService
mallPro
ApiService
;
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
=
mall
GoodsBusiness
ApiService
.
getLowestSkuPrice
(
goodsIds
,
getEnterpriseId
());
ServiceResponse
<
Map
<
Long
,
BigDecimal
>>
mapServiceResponse
=
mall
Pro
ApiService
.
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
->
{
...
...
src/main/resources/dubbo-gic-webapp-plug.xml
View file @
8c7556a3
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment