Просмотр исходного кода

fix alipay

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
e04807f307
2 измененных файлов: 6 добавлений и 93 удалений
  1. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java
  2. +0
    -87
      mallinkCApi/src/main/java/com/iformall/controller/AliPayController.java

+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java Просмотреть файл

@@ -159,15 +159,15 @@ public class AlipayController extends BaseController {
try {
//不能超过10位
String carName = wxMall.getName();
if (carName.length()>7) {
if (carName.length()>10) {
carName = carName.substring(0, 10);
String cardName = wxMall.getName();
if (cardName.length()>7) {
if (cardName.length()>10) {
cardName = cardName.substring(0, 10);
}
}else {
carName = carName +"会员卡";
cardName = cardName +"会员卡";
}
String templateId = aliPayUtil.createSmartDistrictMemberCardModel(wxMall.getAlipayAppAuthToken(), wxMall.getName()+"会员卡", logoId, backgroundId);
String templateId = aliPayUtil.createSmartDistrictMemberCardModel(wxMall.getAlipayAppAuthToken(), cardName, logoId, backgroundId);
if (StringUtils.isBlank(templateId)) {
return new ResultData(Result.ERROR,"模板创建失败,模板Id返回空[createSmartDistrictMemberCardModel]");
}


+ 0
- 87
mallinkCApi/src/main/java/com/iformall/controller/AliPayController.java Просмотреть файл

@@ -1,87 +0,0 @@
package com.iformall.controller;

import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxActivity;
import com.iformall.domain.po.WxMall;
import com.iformall.service.WxMallService;
import com.iformall.service.pay.alipay.AliPayUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;

/**
* @author gongbiao
*/
@RestController
@RequestMapping("/api/alipay")
public class AliPayController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxMallService wxMallService;
@Autowired
private AliPayUtil alipayUtil;

@ApiOperation("获取会员页面")
@GetMapping("getMemberPage")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData getMemberPage(@ModelAttribute WxActivity wxActivity, Integer pageNum, Integer pageSize) {
WxMall wxMall = wxMallService.getByTenantInfo(getTenantInfo());
if (null == wxMall ) {
return new ResultData(Result.ERROR,"wxMall不存在");
}
if (StringUtils.isBlank(wxMall.getAlipayAppAuthToken())) {
return new ResultData(Result.ERROR,"wxMall alipayAppToken不存在");
}
if (StringUtils.isBlank(wxMall.getAlipayMemberTemplateId())) {
return new ResultData(Result.ERROR,"wxMall alipayMemberTemplateId不存在");
}
String url = alipayUtil.getSmartDistrictMemberCardUrl(wxMall.getAlipayAppAuthToken(), wxMall.getAlipayMemberTemplateId(), "memberAuth_"+wxMall.getTenantId());
try {
return new ResultData(URLDecoder.decode(url, "utf-8"));
} catch (UnsupportedEncodingException e) {
logger.error("getMemberPage error url["+url+"]",e);
return new ResultData(Result.ERROR,"url返回失败");
}
}
@ApiOperation("获取商圈智能积分授权授权页面")
@GetMapping("getSmartDistrctPointPage")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData getSmartDistrctPointPage(@ModelAttribute WxActivity wxActivity, Integer pageNum, Integer pageSize) {
WxMall wxMall = wxMallService.getByTenantInfo(getTenantInfo());
if (null == wxMall ) {
return new ResultData(Result.ERROR,"wxMall不存在");
}
if (StringUtils.isBlank(wxMall.getAlipayAppAuthToken())) {
return new ResultData(Result.ERROR,"wxMall alipayAppToken不存在");
}
if (StringUtils.isBlank(wxMall.getAlipayMemberTemplateId())) {
return new ResultData(Result.ERROR,"wxMall alipayMemberTemplateId不存在");
}
String url = alipayUtil.getH5SmartDistrictMallVipPointsUrl(wxMall.getTenantId());
try {
return new ResultData(URLDecoder.decode(url, "utf-8"));
} catch (UnsupportedEncodingException e) {
logger.error("getMemberPage error url["+url+"]",e);
return new ResultData(Result.ERROR,"url返回失败");
}
}
}

Загрузка…
Отмена
Сохранить