Commit 16990677 by zhiwj

Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
parents 15d767f6 ffb1a08d
......@@ -6,6 +6,7 @@ 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;
......@@ -418,6 +419,7 @@ public class WmMallStoreController {
if (!mcuIdResponse.isSuccess()) {
return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
}
LOGGER.info("gic卡券查询参数:{}-{}-{}", enterpriseId, mcuIdResponse.getResult(), cardName);
ServiceResponse<List<CouponDTO>> gicCouponResponse = memberCouponApiService
.listGicCoupon(enterpriseId, mcuIdResponse.getResult(), cardName);
return ResultControllerUtils.commonResult(gicCouponResponse, CouponVO.class);
......@@ -428,6 +430,7 @@ public class WmMallStoreController {
* @param code
*/
@RequestMapping("auth-callback")
@HeaderSignIgnore
public RestResponse authCallBack(HttpServletResponse response, String code, Integer state) throws IOException {
try {
ServiceResponse<Void> authWmResponse = weimobMerchantService.weimobStoreAuth(state, code);
......
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