Bläddra i källkod

[分账][修复]:卡消费时,如没有配置商户账号,提示不支持支付方式

release_toaliyun_real
hupeng 7 år sedan
förälder
incheckning
caa737bfdc
3 ändrade filer med 5 tillägg och 5 borttagningar
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java

+ 3
- 3
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Visa fil

@@ -246,13 +246,13 @@ public enum ErrorCode{
PROFIT_SHARING_RECEIVER_DEL_FAILED(12038, "分账账户删除失败"), PROFIT_SHARING_RECEIVER_DEL_FAILED(12038, "分账账户删除失败"),
PROFIT_SHARING_NUM_UP_LIMIT(12039, "分账次数超限"), PROFIT_SHARING_NUM_UP_LIMIT(12039, "分账次数超限"),
PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"), PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"),
PROFIT_SHARING_UNSUPPORTED(12041, "支付方式不支持"),
PROFIT_SHARING_RECEIVER_UNKNOWN(12041, "收款方账户异常"),
/** /**
* 核销 * 核销
*/ */
VERIFY_ERROR(12050, "核销异常"), VERIFY_ERROR(12050, "核销异常"),
MSG_REPEAT_SEND(12061, "短信重复发送"), MSG_REPEAT_SEND(12061, "短信重复发送"),
VERIFY_COUPON_ORDER_MERANT_IS_NULL(12062, "卡券核销商户无权限"),
VERIFY_COUPON_ORDER_MERCHANT_IS_NULL(12062, "卡券核销失败,请查看适用门店"),


/** /**
* 解单 * 解单
@@ -271,7 +271,7 @@ public enum ErrorCode{
* 短信 * 短信
* *
* */ * */
MSG_SERVER_NOT_FIND(12100,"您还未接入短信运营商请联系平台管理员"),
MSG_SERVER_NOT_FIND(12100,"您还未接入短信运营商,请联系平台管理员"),
MSG_TEMPLATE_REPEAT(12101,"您添加的短信模板已存在"), MSG_TEMPLATE_REPEAT(12101,"您添加的短信模板已存在"),
MSG_SIGNATURE_CONTENT_ERROR(12102,"短信签名或内容错误"), MSG_SIGNATURE_CONTENT_ERROR(12102,"短信签名或内容错误"),
MSG_TEMPLATE_CREATE_ERROR(12103,"创建模板失败"), MSG_TEMPLATE_CREATE_ERROR(12103,"创建模板失败"),


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Visa fil

@@ -301,7 +301,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant);
if (!couponMerchantList.stream().anyMatch(cm->cm.getMerchantId().equals(wxMerchantBUser.getMerchantId()))){ if (!couponMerchantList.stream().anyMatch(cm->cm.getMerchantId().equals(wxMerchantBUser.getMerchantId()))){
logger.error("券: coupon-" + wxCoupon.getId() + "核销: couponMerchantId-" + wxMerchantBUser.getMerchantId()); logger.error("券: coupon-" + wxCoupon.getId() + "核销: couponMerchantId-" + wxMerchantBUser.getMerchantId());
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERANT_IS_NULL);
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL);
} }
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Visa fil

@@ -262,7 +262,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode())) if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()))
sharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); sharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode());
if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode())) if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode()))
return new ResultData(ErrorCode.PROFIT_SHARING_UNSUPPORTED);
return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_UNKNOWN);


return finishSharingOrder(sharingOrderDto); return finishSharingOrder(sharingOrderDto);
} }


Laddar…
Avbryt
Spara