|
|
|
@@ -3,6 +3,7 @@ package com.iformall.controller; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.WxCardInfo; |
|
|
|
import com.iformall.domain.po.WxCouponPassword; |
|
|
|
import com.iformall.domain.po.WxMerchantBUser; |
|
|
|
import com.iformall.domain.vo.WxCardSpendVo; |
|
|
|
import com.iformall.domain.vo.WxCouponOrderCVo; |
|
|
|
@@ -10,6 +11,7 @@ import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.pay.WxPayConstant; |
|
|
|
import com.iformall.service.PosBrunService; |
|
|
|
import com.iformall.service.WxCardInfoService; |
|
|
|
import com.iformall.service.WxCouponPasswordService; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
|
|
|
|
@@ -35,7 +37,7 @@ public class WxCardInfoController extends BaseController { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxCardInfoService wxCardInfoService; |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "查询卡信息") |
|
|
|
@GetMapping("detail") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@@ -46,13 +48,22 @@ public class WxCardInfoController extends BaseController { |
|
|
|
} |
|
|
|
String cardIdStr = dynamicId; |
|
|
|
boolean isECard = false; |
|
|
|
WxCardInfo cardInfo = null; |
|
|
|
String _decodeCouponOrderId = WxCouponOrderCVo.getDecodeExpiredCouponOrderId(dynamicId); |
|
|
|
if (_decodeCouponOrderId.contains(WxCouponOrderCVo.arg)) { |
|
|
|
String[] decodeids = _decodeCouponOrderId.split(WxCouponOrderCVo.arg); |
|
|
|
cardIdStr = decodeids[0]; |
|
|
|
isECard = true; |
|
|
|
cardInfo = wxCardInfoService.getById(Long.parseLong(cardIdStr)); |
|
|
|
}else { |
|
|
|
Long couponPasswordId = Long.parseLong(cardIdStr); |
|
|
|
//实体卡 |
|
|
|
WxCardInfo cardQ = new WxCardInfo(); |
|
|
|
cardQ.updateTenantInfo(getTenantInfo()); |
|
|
|
cardQ.setCouponPasswordId(couponPasswordId); |
|
|
|
cardInfo = wxCardInfoService.getByCouponPasswordId(couponPasswordId, getTenantInfo()); |
|
|
|
} |
|
|
|
WxCardInfo cardInfo = wxCardInfoService.getById(Long.parseLong(cardIdStr)); |
|
|
|
|
|
|
|
if (null == cardInfo) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未查询到卡:"+cardIdStr); |
|
|
|
} |
|
|
|
|