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
a697e98b
Commit
a697e98b
authored
May 28, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微盟商城回调
parent
6d2492d7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
247 additions
and
5 deletions
+247
-5
WmMallStoreController.java
...c/enterprise/web/controller/wm/WmMallStoreController.java
+49
-5
WeimobOrderErLogVO.java
...java/com/gic/enterprise/web/vo/wm/WeimobOrderErLogVO.java
+197
-0
dubbo-gic-platform-enterprise-web.xml
.../src/main/resources/dubbo-gic-platform-enterprise-web.xml
+1
-0
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java
View file @
a697e98b
...
...
@@ -11,9 +11,9 @@ 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.redis.data.util.RedisUtil
;
import
com.gic.weimob.api.service.WeimobBaseService
;
import
com.gic.weimob.api.service.WeimobMemberService
;
import
com.gic.weimob.api.service.*
;
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
;
...
...
@@ -39,8 +39,6 @@ import com.gic.enterprise.web.vo.wm.*;
import
com.gic.marketing.api.dto.coupon.CouponDTO
;
import
com.gic.marketing.api.service.coupon.MemberCouponApiService
;
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"
)
...
...
@@ -63,6 +61,8 @@ public class WmMallStoreController {
private
WeiMobGoodsService
weiMobGoodsService
;
@Autowired
private
OrderPointCalculationPartyApiService
orderPointCalculationPartyApiService
;
@Autowired
private
WeimobOrderService
weimobOrderService
;
@RequestMapping
(
"/save-wm-store"
)
public
RestResponse
save
(
WmStoreDTO
dto
)
{
...
...
@@ -157,7 +157,7 @@ public class WmMallStoreController {
ServiceResponse
<
String
>
response
=
weimobMerchantService
.
getAuthUrl
();
if
(
response
.
isSuccess
())
{
String
authUrl
=
response
.
getResult
();
String
mainHost
=
DomainUtils
.
getCurrentDomain
()
+
"/wm-mall-store/auth-callback"
;
String
mainHost
=
DomainUtils
.
getCurrentDomain
()
+
"/
gic-enterprise-web/
wm-mall-store/auth-callback"
;
//为了授权回调取用的店铺主键ID
RedisUtil
.
setCache
(
"enterprise:wm:auth:"
+
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
wmMallStoreId
);
...
...
@@ -247,6 +247,50 @@ public class WmMallStoreController {
Long
.
valueOf
(
couponId
),
Long
.
valueOf
(
couponLogId
),
couponCode
));
}
/**
* 获取错误订单日志
* @Title: getWmOrderErrorLog
* @Description:
* @author guojuxing
* @param wmMallStoreId
* @param currentPage
* @param pageSize
* @param searchStr
* @return com.gic.commons.webapi.reponse.RestResponse
*/
@RequestMapping
(
"get-wm-order-error-log"
)
public
RestResponse
getWmOrderErrorLog
(
Integer
wmMallStoreId
,
@RequestParam
(
defaultValue
=
"1"
)
int
currentPage
,
@RequestParam
(
defaultValue
=
"20"
)
int
pageSize
,
String
searchStr
)
{
return
ResultControllerUtils
.
commonPageResult
(
weimobOrderService
.
getErrWmOrderLog
(
wmMallStoreId
,
currentPage
,
pageSize
,
searchStr
),
WeimobOrderErLogVO
.
class
);
}
/**
* 批量处理订单错误日志
* @param errLogIds
* @param type (0--"不处理";1--"重新同步 ")
* @return
*/
@RequestMapping
(
"delete-wm-order-error-log"
)
public
RestResponse
deleteWmOrderErrorLog
(
String
errLogIds
,
Integer
type
)
{
if
(
StringUtils
.
isBlank
(
errLogIds
))
{
return
RestResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"参数为空"
);
}
String
[]
errLogArr
=
errLogIds
.
split
(
","
);
List
<
Long
>
errLogList
=
new
ArrayList
<>(
errLogArr
.
length
);
for
(
String
errLog
:
errLogArr
)
{
if
(
StringUtils
.
isBlank
(
errLog
))
{
continue
;
}
errLogList
.
add
(
Long
.
valueOf
(
errLog
));
}
return
ResultControllerUtils
.
commonResult
(
weimobOrderService
.
dealErrOrderBatch
(
errLogList
,
type
));
}
/**
* 核销卡券
* @param mcuId
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/wm/WeimobOrderErLogVO.java
0 → 100644
View file @
a697e98b
package
com
.
gic
.
enterprise
.
web
.
vo
.
wm
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
java.io.Serializable
;
import
java.util.Date
;
public
class
WeimobOrderErLogVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
5110534109536620583L
;
/**
*
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
orderErLogId
;
/**
*
*/
private
Integer
wmMallStoreId
;
/**
*
*/
private
Integer
enterpriseId
;
/**
*
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
pid
;
/**
*
*/
private
Integer
wmOrderType
;
/**
*
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
wmOrderId
;
/**
*
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
wmRightsId
;
/**
*
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
wid
;
/**
*
*/
private
String
wmOrderMsg
;
/**
*
*/
private
String
errInfo
;
/**
*
*/
private
Date
createTime
;
/**
*
*/
private
Date
updateTime
;
/**
*
*/
private
Integer
status
;
public
Long
getOrderErLogId
()
{
return
orderErLogId
;
}
public
WeimobOrderErLogVO
setOrderErLogId
(
Long
orderErLogId
)
{
this
.
orderErLogId
=
orderErLogId
;
return
this
;
}
public
Integer
getWmMallStoreId
()
{
return
wmMallStoreId
;
}
public
WeimobOrderErLogVO
setWmMallStoreId
(
Integer
wmMallStoreId
)
{
this
.
wmMallStoreId
=
wmMallStoreId
;
return
this
;
}
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
public
WeimobOrderErLogVO
setEnterpriseId
(
Integer
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
return
this
;
}
public
Long
getPid
()
{
return
pid
;
}
public
WeimobOrderErLogVO
setPid
(
Long
pid
)
{
this
.
pid
=
pid
;
return
this
;
}
public
Integer
getWmOrderType
()
{
return
wmOrderType
;
}
public
WeimobOrderErLogVO
setWmOrderType
(
Integer
wmOrderType
)
{
this
.
wmOrderType
=
wmOrderType
;
return
this
;
}
public
Long
getWmOrderId
()
{
return
wmOrderId
;
}
public
WeimobOrderErLogVO
setWmOrderId
(
Long
wmOrderId
)
{
this
.
wmOrderId
=
wmOrderId
;
return
this
;
}
public
Long
getWmRightsId
()
{
return
wmRightsId
;
}
public
WeimobOrderErLogVO
setWmRightsId
(
Long
wmRightsId
)
{
this
.
wmRightsId
=
wmRightsId
;
return
this
;
}
public
Long
getWid
()
{
return
wid
;
}
public
WeimobOrderErLogVO
setWid
(
Long
wid
)
{
this
.
wid
=
wid
;
return
this
;
}
public
String
getWmOrderMsg
()
{
return
wmOrderMsg
;
}
public
WeimobOrderErLogVO
setWmOrderMsg
(
String
wmOrderMsg
)
{
this
.
wmOrderMsg
=
wmOrderMsg
;
return
this
;
}
public
String
getErrInfo
()
{
return
errInfo
;
}
public
WeimobOrderErLogVO
setErrInfo
(
String
errInfo
)
{
this
.
errInfo
=
errInfo
;
return
this
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
WeimobOrderErLogVO
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
return
this
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
WeimobOrderErLogVO
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
return
this
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
WeimobOrderErLogVO
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
return
this
;
}
}
gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml
View file @
a697e98b
...
...
@@ -128,6 +128,7 @@
<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.marketing.api.service.coupon.MemberCouponApiService"
id=
"memberCouponApiService"
timeout=
"6000"
/>
...
...
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