Kaynağa Gözat

fix card

release_toaliyun_real
lin 3 yıl önce
ebeveyn
işleme
d9cc8e9f18
4 değiştirilmiş dosya ile 42 ekleme ve 0 silme
  1. +16
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java
  2. +24
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java

+ 16
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java Dosyayı Görüntüle

@@ -6,6 +6,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardSpendVo;
import com.iformall.domain.vo.WxCouponOrderCVo;
import com.iformall.enums.EnumCardInfoStatus; import com.iformall.enums.EnumCardInfoStatus;
import com.iformall.enums.EnumCouponStatus; import com.iformall.enums.EnumCouponStatus;
import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.enums.EnumCreditLockedStatus;
@@ -23,6 +24,8 @@ import com.iformall.service.WxCouponService;
import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantService;
import com.iformall.service.WxOrderService; import com.iformall.service.WxOrderService;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import com.iformall.utils.DateUtils;

import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -34,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -122,6 +126,18 @@ public class WxCardPayController extends BaseController {
logger.error("cardId不能为空"); logger.error("cardId不能为空");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardId不能为空");
} }
String _decodeCouponOrderId = WxCouponOrderCVo.getDecodeExpiredCouponOrderId(cardIdStr);
if (_decodeCouponOrderId.contains(WxCouponOrderCVo.arg)) {
String[] decodeids = _decodeCouponOrderId.split(WxCouponOrderCVo.arg);
cardIdStr = decodeids[0];
String expiredtimeStr = decodeids[1];
Date expiredtime = DateUtils.string2Date(expiredtimeStr).getTime();
if (expiredtime.before(new Date())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"码已失效,请更新二维码后重试");
}
}
Long cUserId = null; Long cUserId = null;
try { try {
cUserId = Long.valueOf(cUserIdStr); cUserId = Long.valueOf(cUserIdStr);


+ 24
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Dosyayı Görüntüle

@@ -358,6 +358,30 @@ public class WxCouponOrderController extends BaseController {
} }
return wxCouponOrderService.cardDetailCUserVo(memberId,getTenantInfo(), couponOrderId); return wxCouponOrderService.cardDetailCUserVo(memberId,getTenantInfo(), couponOrderId);
} }
@ApiOperation(value = "手动核销方式,电子卡获取动态id")
@GetMapping("cardDynamicId")
@ApiImplicitParams({
@ApiImplicitParam(name = "cardId", value = "卡ID", dataType = "string", paramType = "query", required = true),
@ApiImplicitParam(name = "cardTenantId", value = "券tenantID", dataType = "string", paramType = "query", required = false)
})
public ResultData cardDynamicId(String cardId,String cardTenantId) {

if (StringUtils.isBlank(cardId) || cardId.equalsIgnoreCase(Constant.UNDEFINED)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
SysConfig sysConfig = sysConfigService.getByKey(SysConfigConstant.card_vierfy_seconds_key, getTenantInfo());
if (null == sysConfig || StringUtils.isBlank(sysConfig.getConfigItemValue())) {
return new ResultData(ErrorCode.SYS_CONFIG_CARD_VIERFY_SECODES_UNSET);
}
Map retmap = new HashMap();
retmap.put("dynamicId", WxCouponOrderCVo.calcuteExpiredCouponOrderId(cardId,Integer.parseInt(sysConfig.getConfigItemValue())));
retmap.put("expiredSeconds", Integer.parseInt(sysConfig.getConfigItemValue()));
retmap.put("cardTenantId", cardTenantId);
return new ResultData(retmap);
}


@ApiOperation(value = "卡转赠领取") @ApiOperation(value = "卡转赠领取")
@PostMapping("cardAccept") @PostMapping("cardAccept")


+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Dosyayı Görüntüle

@@ -35,6 +35,7 @@ public enum ErrorCode{
* 系统配置 * 系统配置
*/ */
SYS_CONFIG_VIERFY_SECODES_UNSET(1030,"系统设置【券码刷新时间】未配置"), SYS_CONFIG_VIERFY_SECODES_UNSET(1030,"系统设置【券码刷新时间】未配置"),
SYS_CONFIG_CARD_VIERFY_SECODES_UNSET(1030,"系统设置【电子卡码刷新时间】未配置"),
SYS_CONFIG_DEFAULT_MERCHANT_B_USER_UNSET(1031,"系统配置【外部设备核销默认商户员工编号】未配置"), SYS_CONFIG_DEFAULT_MERCHANT_B_USER_UNSET(1031,"系统配置【外部设备核销默认商户员工编号】未配置"),


/** /**


+ 1
- 0
mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java Dosyayı Görüntüle

@@ -3,6 +3,7 @@ package com.iformall.common;
public class SysConfigConstant { public class SysConfigConstant {


public static final String vierfy_seconds_key="vierfySeconds"; public static final String vierfy_seconds_key="vierfySeconds";
public static final String card_vierfy_seconds_key="cardVierfySeconds";
public static final String default_merchant_b_user = "defaultMerchantBUserId"; public static final String default_merchant_b_user = "defaultMerchantBUserId";
public static final String coupon_detail_show_selled = "couponDetailShowSelled"; public static final String coupon_detail_show_selled = "couponDetailShowSelled";
} }

Yükleniyor…
İptal
Kaydet