Ver a proveniência

fix bug

release_toaliyun_real
xiaohanzi há 5 anos
ascendente
cometimento
7003315a9a
4 ficheiros alterados com 15 adições e 3 eliminações
  1. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java
  2. +6
    -0
      mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  3. +6
    -0
      mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 2
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java Ver ficheiro

@@ -55,7 +55,7 @@ public class WxMerchantController extends BaseController {
public ResultData addAccount(@RequestBody WxMerchant wxMerchant) { public ResultData addAccount(@RequestBody WxMerchant wxMerchant) {
log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::addAccount"); log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::addAccount");
if (!hasPermission()) { if (!hasPermission()) {
return new ResultData(ErrorCode.USER_NO_PERMISSION);
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(),"当前微信绑定的手机号不是商户的联系方式手机号,不能操作");
} }
if (wxMerchant.getId() == null) { if (wxMerchant.getId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空");
@@ -82,7 +82,7 @@ public class WxMerchantController extends BaseController {
public ResultData deleteByReceiverId(@ModelAttribute WxProfitSharingReceiver receiver) { public ResultData deleteByReceiverId(@ModelAttribute WxProfitSharingReceiver receiver) {
log.debug("[" + getIpAddr() + "] WxMerchantController::deleteByReceiverId"); log.debug("[" + getIpAddr() + "] WxMerchantController::deleteByReceiverId");
if (!hasPermission()) { if (!hasPermission()) {
return new ResultData(ErrorCode.USER_NO_PERMISSION);
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(),"当前微信绑定的手机号不是商户的联系方式手机号,不能操作");
} }
if (receiver.getId() == null) { if (receiver.getId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空");


+ 6
- 0
mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Ver ficheiro

@@ -110,6 +110,9 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_msg_validationcode_model".equals(tableName)) { if ("wx_msg_validationcode_model".equals(tableName)) {
return true; return true;
} }
if ("wx_component_verify_ticket".equals(tableName)) {
return true;
}
// wx_profit_sharing_receiver // wx_profit_sharing_receiver
// wx_profit_sharing_result // wx_profit_sharing_result
return false; return false;
@@ -177,6 +180,9 @@ public class TenantInfoImpl implements TenantInfo {
if ("mem_coupon_from_dsp".equals(tableName)) { if ("mem_coupon_from_dsp".equals(tableName)) {
return true; return true;
} }
if ("wx_component_verify_ticket".equals(tableName)) {
return true;
}
return false; return false;
} }




+ 6
- 0
mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Ver ficheiro

@@ -110,6 +110,9 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_msg_validationcode_model".equals(tableName)) { if ("wx_msg_validationcode_model".equals(tableName)) {
return true; return true;
} }
if ("wx_component_verify_ticket".equals(tableName)) {
return true;
}
// wx_profit_sharing_receiver // wx_profit_sharing_receiver
// wx_profit_sharing_result // wx_profit_sharing_result
return false; return false;
@@ -183,6 +186,9 @@ public class TenantInfoImpl implements TenantInfo {
if ("mem_coupon_from_dsp".equals(tableName)) { if ("mem_coupon_from_dsp".equals(tableName)) {
return true; return true;
} }
if ("wx_component_verify_ticket".equals(tableName)) {
return true;
}
return false; return false;
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Ver ficheiro

@@ -693,7 +693,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
try { try {
return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.COUPON_VERIFY, wxOrder,EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY); return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.COUPON_VERIFY, wxOrder,EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY);
} catch (Exception e) { } catch (Exception e) {
logger.error("核销发券: " + e.getMessage());
logger.error("核销发券: " + e.getMessage(),e);
} }
} }
return false; return false;


Carregando…
Cancelar
Guardar