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
3d4f8891
Commit
3d4f8891
authored
Apr 29, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微盟对接积分配置查询接口
parent
8789f5d7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
83 additions
and
18 deletions
+83
-18
WmMallStoreController.java
...c/enterprise/web/controller/wm/WmMallStoreController.java
+49
-18
WmCouponVO.java
...rc/main/java/com/gic/enterprise/web/vo/wm/WmCouponVO.java
+34
-0
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java
View file @
3d4f8891
package
com
.
gic
.
enterprise
.
web
.
controller
.
wm
;
import
java.io.IOException
;
import
java.net.URLEncoder
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -9,18 +8,6 @@ import java.util.Set;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.GlobalVar
;
import
com.gic.commons.web.ResponseThreadLocal
;
import
com.gic.enterprise.web.utils.DomainUtils
;
import
com.gic.enterprise.web.vo.MemberCardVO
;
import
com.gic.enterprise.web.vo.wm.MemberGradeVO
;
import
com.gic.enterprise.web.vo.wm.WmStoreDetailVO
;
import
com.gic.enterprise.web.vo.wm.WmStoreVO
;
import
com.gic.member.config.api.service.MemberCardApiService
;
import
com.gic.weimob.api.service.WeimobMerchantService
;
import
com.gic.weimob.api.service.WeimobStoreSiteService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
...
...
@@ -29,7 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.download.utils.OperationResultUtils
;
import
com.gic.enterprise.constant.MallModeEnum
;
...
...
@@ -39,6 +28,15 @@ import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import
com.gic.enterprise.service.WmStoreApiService
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
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.MemberGradeVO
;
import
com.gic.enterprise.web.vo.wm.WmCouponVO
;
import
com.gic.enterprise.web.vo.wm.WmStoreDetailVO
;
import
com.gic.enterprise.web.vo.wm.WmStoreVO
;
import
com.gic.member.config.api.service.MemberCardApiService
;
import
com.gic.weimob.api.service.WeimobMerchantService
;
import
com.gic.weimob.api.service.WeimobStoreSiteService
;
@RestController
@RequestMapping
(
"/wm-mall-store"
)
...
...
@@ -174,16 +172,20 @@ public class WmMallStoreController {
/**
* 获取微盟卡券列表
* @Title: listWmCoupo
m
* @Title: listWmCoupo
n
* @Description:
* @author guojuxing
* @param wmMa
inAccount
* @param wmMa
llStoreId
* @return com.gic.commons.webapi.reponse.RestResponse
*/
@RequestMapping
(
"/list-wm-coupon"
)
public
RestResponse
listWmCoupom
(
String
wmMainAccount
)
{
//todo getWeimobCouponTemplate
return
RestResponse
.
success
();
public
RestResponse
listWmCoupon
(
Integer
wmMallStoreId
)
{
ServiceResponse
<
WmStoreDTO
>
wmStoreResponse
=
wmStoreApiService
.
getWmStoreByWmMallStoreId
(
wmMallStoreId
);
if
(
wmStoreResponse
.
isSuccess
())
{
return
ResultControllerUtils
.
commonResult
(
weimobMerchantService
.
getWeimobCouponTemplate
(
Long
.
valueOf
(
wmStoreResponse
.
getResult
().
getWmPid
())),
WmCouponVO
.
class
);
}
return
RestResponse
.
failure
(
wmStoreResponse
.
getCode
(),
wmStoreResponse
.
getMessage
());
}
/**
...
...
@@ -230,6 +232,35 @@ public class WmMallStoreController {
return
ResultControllerUtils
.
commonResult
(
memberCardApiService
.
getAll
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
()),
MemberCardVO
.
class
);
}
/**
* 获取积分配置的开关
* @Title: getIntegralConfig
* @Description:
* @author guojuxing
* @param wmMallStoreId
* @return com.gic.commons.webapi.reponse.RestResponse
*/
@RequestMapping
(
"/get-integral-config"
)
public
RestResponse
getIntegralConfig
(
Integer
wmMallStoreId
)
{
//todo 查询已配置的会员卡ID
return
ResultControllerUtils
.
commonResult
(
memberCardApiService
.
isGicCalculateIntegral
(
22L
,
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
()));
}
/**
* 编辑积分配置开关
* @Title: editIntegralConfig
* @Description:
* @author guojuxing
* @param wmMallStoreId
* @param integralRule gic或者erp)
* @return com.gic.commons.webapi.reponse.RestResponse
*/
@RequestMapping
(
"/edit-integral-config"
)
public
RestResponse
editIntegralConfig
(
Integer
wmMallStoreId
,
String
integralRule
)
{
//todo 查询已配置的会员卡ID
return
ResultControllerUtils
.
commonResult
(
memberCardApiService
.
updateIntegralRule
(
22L
,
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
integralRule
));
}
@RequestMapping
(
"/list-wm-store-config"
)
public
RestResponse
listWmStoreConfig
()
{
Map
<
String
,
String
>
result
=
new
HashMap
<>(
16
);
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/wm/WmCouponVO.java
0 → 100644
View file @
3d4f8891
package
com
.
gic
.
enterprise
.
web
.
vo
.
wm
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
java.io.Serializable
;
public
class
WmCouponVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
4623271971142828756L
;
/* 优惠券标题 */
private
String
name
;
/* 优惠券模板ID */
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
cardTemplateId
;
public
String
getName
()
{
return
name
;
}
public
WmCouponVO
setName
(
String
name
)
{
this
.
name
=
name
;
return
this
;
}
public
Long
getCardTemplateId
()
{
return
cardTemplateId
;
}
public
WmCouponVO
setCardTemplateId
(
Long
cardTemplateId
)
{
this
.
cardTemplateId
=
cardTemplateId
;
return
this
;
}
}
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