businessCircle tran

mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java

@@ -298,7 +298,7 @@ public class WxMerchantController extends BaseController {
     @TenantIgnore
     public ResultData hasMerchantEncode(@ModelAttribute WxMerchant wxMerchant) {
         logger.debug("[" + getIpAddr() + "] WxMerchantController::hasMerchantEncode{}"+wxMerchant.toString());
-        boolean has = wxMerchantService.hasMerchant(wxMerchant);
+        boolean has = wxMerchantService.hasMerchantEncode(wxMerchant);
         return new ResultData(has);
     }
 

mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

@@ -786,7 +786,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
         if(StringUtils.isBlank(wxMerchant.getEncode())){
             return false;
         }else{
-            return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false;
+            return wxMerchantMapper.hasMerchantEncode(wxMerchant) > 0 ? true : false;
         }
     }