Przeglądaj źródła

//card

release_toaliyun_real
xhxu 3 lat temu
rodzic
commit
f3a55f03c3
1 zmienionych plików z 2 dodań i 4 usunięć
  1. +2
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java

+ 2
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java Wyświetl plik

@@ -90,7 +90,7 @@ public class WxCardInfoController extends BaseController {
@GetMapping("detail") @GetMapping("detail")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "dynamicId", value = "动态码ID", dataType = "String", paramType = "query", required = true)}) @ApiImplicitParam(name = "dynamicId", value = "动态码ID", dataType = "String", paramType = "query", required = true)})
public ResultData detail(String dynamicId) {
public ResultData detail(String dynamicId,Integer type) {
if (StringUtils.isBlank(dynamicId) || dynamicId.equalsIgnoreCase(Constant.UNDEFINED)) { if (StringUtils.isBlank(dynamicId) || dynamicId.equalsIgnoreCase(Constant.UNDEFINED)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardId不能为空");
} }
@@ -111,9 +111,7 @@ public class WxCardInfoController extends BaseController {
map.put("amount", cardInfo.getAmount()); map.put("amount", cardInfo.getAmount());
map.put("remainAmount", cardInfo.getRemainingAmount()); map.put("remainAmount", cardInfo.getRemainingAmount());
map.put("cardType", cardInfo.getType()); map.put("cardType", cardInfo.getType());
}else if(cardIdStr.contains(WxCouponOrderCVo.arg)){
String[] decodeids = cardIdStr.split(WxCouponOrderCVo.arg);
cardIdStr = decodeids[0];
}else if(type != null && type.intValue() == 0){
isECard = true; isECard = true;
cardInfo = wxCardInfoService.getById(Long.parseLong(cardIdStr)); cardInfo = wxCardInfoService.getById(Long.parseLong(cardIdStr));
if (null == cardInfo) { if (null == cardInfo) {


Ładowanie…
Anuluj
Zapisz