Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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-platform-enterprise
Commits
7e7996f8
Commit
7e7996f8
authored
Jan 05, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口名称调整
parent
18a8b739
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
34 deletions
+35
-34
WmStoreApiServiceImpl.java
.../enterprise/service/outer/impl/WmStoreApiServiceImpl.java
+6
-7
dubbo-gic-platform-enterprise-service.xml
.../main/resources/dubbo-gic-platform-enterprise-service.xml
+1
-1
WmMallStoreController.java
...c/enterprise/web/controller/wm/WmMallStoreController.java
+23
-21
dubbo-gic-platform-enterprise-web.xml
.../src/main/resources/dubbo-gic-platform-enterprise-web.xml
+5
-5
No files found.
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/WmStoreApiServiceImpl.java
View file @
7e7996f8
...
...
@@ -3,12 +3,6 @@ package com.gic.enterprise.service.outer.impl;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.constant.Constants
;
import
com.gic.enterprise.dto.wm.*
;
import
com.gic.enterprise.entity.TabWmStoreSyncLog
;
import
com.gic.enterprise.service.*
;
import
com.gic.weimob.api.service.WeimobMerchantService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
...
...
@@ -22,16 +16,21 @@ import com.gic.api.base.commons.ServiceResponse;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.PageHelperUtils
;
import
com.gic.commons.util.StringUtil
;
import
com.gic.enterprise.constant.Constants
;
import
com.gic.enterprise.constant.MallModeEnum
;
import
com.gic.enterprise.constant.WmStoreConfigTypeEnum
;
import
com.gic.enterprise.dto.WmMemberCardConfigDTO
;
import
com.gic.enterprise.dto.WmOrderConfigDTO
;
import
com.gic.enterprise.dto.WmStoreDTO
;
import
com.gic.enterprise.dto.wm.*
;
import
com.gic.enterprise.entity.TabWmStore
;
import
com.gic.enterprise.entity.TabWmStoreConfig
;
import
com.gic.enterprise.entity.TabWmStoreCouponConfig
;
import
com.gic.enterprise.entity.TabWmStoreSyncLog
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.qo.wm.CouponConfigQO
;
import
com.gic.enterprise.service.*
;
import
com.gic.weimob.api.service.WeimobMerchantApiService
;
/**
*
* @ClassName: WmStoreApiServiceImpl
...
...
@@ -51,7 +50,7 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
@Autowired
private
WmStoreSyncLogService
wmStoreSyncLogService
;
@Autowired
private
WeimobMerchantService
weimobMerchantService
;
private
WeimobMerchant
Api
Service
weimobMerchantService
;
@Override
public
ServiceResponse
<
Integer
>
saveWmStore
(
WmStoreDTO
wmStoreDTO
)
{
...
...
gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml
View file @
7e7996f8
...
...
@@ -143,7 +143,7 @@
<dubbo:reference
interface=
"com.gic.marketing.process.api.service.sms.SmsSendApiService"
id=
"smsSendApiService"
timeout=
"60000"
/>
<dubbo:reference
interface=
"com.gic.wechat.business.api.service.wxa.WeixinWxaFunService"
id=
"weixinWxaFunService"
timeout=
"60000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobMerchantService"
id=
"weimobMerchantService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobMerchant
Api
Service"
id=
"weimobMerchantService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.open.api.service.EnterpriseLicenseApiService"
id=
"enterpriseLicenseApiService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.widget.screening.api.service.EsScreeningEnterpriseInitService"
id=
"esScreeningEnterpriseInitService"
timeout=
"6000"
/>
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java
View file @
7e7996f8
...
...
@@ -5,37 +5,32 @@ import java.util.*;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
com.gic.api.base.commons.Page
;
import
com.gic.commons.annotation.HeaderSignIgnore
;
import
com.gic.enterprise.base.UserInfo
;
import
com.gic.enterprise.constant.Constants
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.goods.pump.api.service.WeiMobGoodsService
;
import
com.gic.member.config.api.enums.OrderPointCalculationPartyEnum
;
import
com.gic.member.config.api.service.OrderPointCalculationPartyApiService
;
import
com.gic.open.api.dto.EnterpriseServeInfoDTO
;
import
com.gic.open.api.service.EnterpriseLicenseApiService
;
import
com.gic.redis.data.util.RedisUtil
;
import
com.gic.weimob.api.dto.GicMemberGradeDTO
;
import
com.gic.weimob.api.dto.WeimobCouponTemplateDTO
;
import
com.gic.weimob.api.service.*
;
import
javax.servlet.http.HttpServletResponse
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.annotation.HeaderSignIgnore
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.download.utils.OperationResultUtils
;
import
com.gic.enterprise.base.UserInfo
;
import
com.gic.enterprise.constant.Constants
;
import
com.gic.enterprise.constant.MallModeEnum
;
import
com.gic.enterprise.constant.WmStoreConfigTypeEnum
;
import
com.gic.enterprise.dto.WmStoreDTO
;
import
com.gic.enterprise.dto.wm.WmStoreConfigDTO
;
import
com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.qo.wm.CouponConfigQO
;
import
com.gic.enterprise.service.WmStoreApiService
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
...
...
@@ -43,11 +38,18 @@ import com.gic.enterprise.utils.UserDetailUtils;
import
com.gic.enterprise.web.utils.DomainUtils
;
import
com.gic.enterprise.web.vo.MemberCardVO
;
import
com.gic.enterprise.web.vo.wm.*
;
import
com.gic.goods.pump.api.service.WeiMobGoodsService
;
import
com.gic.marketing.api.dto.coupon.CouponDTO
;
import
com.gic.marketing.api.service.coupon.MemberCouponApiService
;
import
com.gic.member.config.api.enums.OrderPointCalculationPartyEnum
;
import
com.gic.member.config.api.service.MemberCardApiService
;
import
javax.servlet.http.HttpServletResponse
;
import
com.gic.member.config.api.service.OrderPointCalculationPartyApiService
;
import
com.gic.open.api.dto.EnterpriseServeInfoDTO
;
import
com.gic.open.api.service.EnterpriseLicenseApiService
;
import
com.gic.weimob.api.service.WeimobBaseApiService
;
import
com.gic.weimob.api.service.WeimobMemberBaseApiService
;
import
com.gic.weimob.api.service.WeimobMerchantApiService
;
import
com.gic.weimob.api.service.WeimobOrderApiService
;
/**
*
* @ClassName: WmMallStoreController
...
...
@@ -65,19 +67,19 @@ public class WmMallStoreController {
@Autowired
private
MemberCardApiService
memberCardApiService
;
@Autowired
private
WeimobMerchantService
weimobMerchantService
;
private
WeimobMerchant
Api
Service
weimobMerchantService
;
@Autowired
private
MemberCouponApiService
memberCouponApiService
;
@Autowired
private
WeimobMemberService
weimobMemberService
;
private
WeimobMember
BaseApi
Service
weimobMemberService
;
@Autowired
private
WeimobBaseService
weimobBaseService
;
private
WeimobBase
Api
Service
weimobBaseService
;
@Autowired
private
WeiMobGoodsService
weiMobGoodsService
;
@Autowired
private
OrderPointCalculationPartyApiService
orderPointCalculationPartyApiService
;
@Autowired
private
WeimobOrderService
weimobOrderService
;
private
WeimobOrder
Api
Service
weimobOrderService
;
@Autowired
private
EnterpriseLicenseApiService
enterpriseLicenseApiService
;
...
...
gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml
View file @
7e7996f8
...
...
@@ -127,11 +127,11 @@
<dubbo:reference
interface=
"com.gic.data.api.service.MemberDataApiService"
id=
"memberDataApiService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.member.config.api.service.MemberCardApiService"
id=
"memberCardApiService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobStoreSiteService"
id=
"weimobStoreSiteService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobMerchantService"
id=
"weimobMerchantService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobOrderService"
id=
"weimobOrderService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobMemberService"
id=
"weimobMemberService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobBaseService"
id=
"weimobBaseService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobStoreSite
Api
Service"
id=
"weimobStoreSiteService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobMerchant
Api
Service"
id=
"weimobMerchantService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobOrder
Api
Service"
id=
"weimobOrderService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobMember
BaseApi
Service"
id=
"weimobMemberService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.weimob.api.service.WeimobBase
Api
Service"
id=
"weimobBaseService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.marketing.api.service.coupon.MemberCouponApiService"
id=
"memberCouponApiService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.store.service.ClerkApiService"
id=
"clerkApiService"
timeout=
"60000"
/>
...
...
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